valeev dz 3 completed

Author: ruvaleev

.DS_Store

@@ -0,0 +1,53 @@
+exit
+Dir[File.join('.', 'app', '*', '*.rb')].each { |file| require file }
+City.last
+ReloadJson.new.call('fixtures/medium.json')
+Rake.application.run
+require 'rake'
+ReloadJson.new.call('fixtures/medium.json')
+require_relative 'config/boot'
+require_relative '../config/boot'
+q
+ReloadJson.new.call('fixtures/medium.json')
+require_relative 'config/application'
+Dir[File.join('.', 'app', '*', '*.rb')].each { |file| require file }
+q
+ReloadJson.new.call('fixtures/medium.json')
+RubyProf.measure_mode = RubyProf::WALL_TIME
+q
+ReloadJson.new.call('fixtures/medium.json')
+RubyProf.measure_mode = RubyProf::WALL_TIME
+q
+Service.import(@services, validate: true)
+City.import(@cities, validate: true, on_duplicate_key_ignore:  true, recursive: true)
+City.import(@cities, validate: true, recursive: true)
+bus.trips
+Bus.import(@buses, validate: true, recursive: true)
+bus.trips
+bus = @buses.first
+bus = @buses.trips
+city.from_trips
+city.to_trips
+city.trips_to
+city = City.last
+city = Coty.last
+Trip.all
+service.buses
+service.bus
+service = @services.last
+1+1
+@buses
+@cities
+city = @cities.first
+@cities.reload
+City.import(@cities, validate: true, on_duplicate_key_update:  {conflict_target: [:name], columns: [:name]}, recursive: true)
+c
+Trip.last
+Service.import(@services, validate: true, on_duplicate_key_update:  {conflict_target: [:name], columns: [:name]})
+Bus.import(@buses, validate: true, on_duplicate_key_update: {conflict_target: [:number], columns: [:model]}, recursive: true)
+City.import(@cities, validate: true, on_duplicate_key_update:  {conflict_target: [:name], columns: [:name]}, recursive: true)
+n
+json = JSON.parse(File.read(file_name))
+file_name = 'fixtures/medium.json'
+file_name
+json

.byebug_history

@@ -2,3 +2,4 @@
 /tmp
 /log
 /public
+/config/newrelic.yml

.gitignore

@@ -0,0 +1,2 @@
+Style/Documentation:
+  Enabled: false

.rubocop.yml

@@ -10,6 +10,12 @@ gem 'bootsnap', '>= 1.1.0', require: false
 gem 'newrelic_rpm'
 gem 'pghero'
 gem 'badger-rails'
+gem 'rack-mini-profiler', require: false
+gem 'memory_profiler'
+gem 'flamegraph'
+gem 'stackprof'
+gem 'strong_migrations'
+gem 'activerecord-import'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -20,9 +26,14 @@ group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'meta_request'
+  gem 'bullet'
+  gem 'ruby-prof'
 end
 
 group :test do
+  gem 'rspec'
+  gem 'database_cleaner-active_record'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile

@@ -1,43 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activerecord-import (1.0.4)
+      activerecord (>= 3.2)
+    activestorage (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -47,85 +49,116 @@ GEM
     arel (9.0.0)
     badger-rails (1.0.4)
       capistrano
-    bindex (0.6.0)
-    bootsnap (1.4.2)
+    bindex (0.8.1)
+    bootsnap (1.4.5)
       msgpack (~> 1.0)
-    builder (3.2.3)
-    byebug (11.0.1)
+    builder (3.2.4)
+    bullet (6.1.0)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
+    byebug (11.1.1)
     capistrano (3.12.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    ffi (1.10.0)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    database_cleaner (1.8.3)
+    database_cleaner-active_record (1.8.0)
+      activerecord
+      database_cleaner (~> 1.8.0)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    ffi (1.12.2)
+    flamegraph (0.9.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    memory_profiler (0.9.14)
+    meta_request (0.7.2)
+      rack-contrib (>= 1.1, < 3)
+      railties (>= 3.0.0, < 7)
     method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    msgpack (1.2.9)
+    minitest (5.14.0)
+    msgpack (1.3.3)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
     newrelic_rpm (6.8.0.360)
-    nio4r (2.3.1)
-    nokogiri (1.10.2)
+    nio4r (2.5.2)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    pg (1.1.4)
+    pg (1.2.2)
     pghero (2.4.1)
       activerecord (>= 5)
-    puma (3.12.1)
-    rack (2.0.6)
+    puma (3.12.2)
+    rack (2.2.2)
+    rack-contrib (2.1.0)
+      rack (~> 2.0)
+    rack-mini-profiler (1.1.6)
+      rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.4.1)
+      actioncable (= 5.2.4.1)
+      actionmailer (= 5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      activestorage (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    ruby-prof (1.2.0)
     ruby_dep (1.5.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -135,32 +168,47 @@ GEM
     sshkit (1.20.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    thor (0.20.3)
+    stackprof (0.2.15)
+    strong_migrations (0.6.2)
+      activerecord (>= 5)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    uniform_notifier (1.13.0)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-import
   badger-rails
   bootsnap (>= 1.1.0)
+  bullet
   byebug
+  database_cleaner-active_record
+  flamegraph
   listen (>= 3.0.5, < 3.2)
+  memory_profiler
+  meta_request
   newrelic_rpm
   pg (>= 0.18, < 2.0)
   pghero
   puma (~> 3.11)
+  rack-mini-profiler
   rails (~> 5.2.3)
+  rspec
+  ruby-prof
+  stackprof
+  strong_migrations
   tzinfo-data
   web-console (>= 3.3.0)
 

Gemfile.lock

@@ -2,6 +2,6 @@ class TripsController < ApplicationController
   def index
     @from = City.find_by_name!(params[:from])
     @to = City.find_by_name!(params[:to])
-    @trips = Trip.where(from: @from, to: @to).order(:start_time)
+    @trips = Trip.includes(bus: [:services]).where(from: @from, to: @to).order(:start_time)
   end
 end

app/controllers/trips_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

app/models/application_record.rb

@@ -14,6 +14,8 @@ class Bus < ApplicationRecord
 
   has_many :trips
   has_and_belongs_to_many :services, join_table: :buses_services
+  # has_many :buses_services
+  # has_many :services, through: :buses_services
 
   validates :number, presence: true, uniqueness: true
   validates :model, inclusion: { in: MODELS }

app/models/bus.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class BusesServices < ApplicationRecord
+  belongs_to :bus
+  belongs_to :service
+end