From e9cf37457f3e84ec108390df680a5a3ed42810fb Mon Sep 17 00:00:00 2001 From: elenachekhina Date: Tue, 11 Feb 2025 19:56:52 +0400 Subject: [PATCH 1/3] delete extra files --- Gemfile | 3 - Gemfile.lock | 194 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 129 insertions(+), 68 deletions(-) diff --git a/Gemfile b/Gemfile index e20b1260..b22f79bc 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,5 @@ group :development do gem 'listen', '>= 3.0.5', '< 3.2' end -group :test do -end - # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock index fccf6f5f..17d5fb9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,34 +27,56 @@ GEM activejob (5.2.3) activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) - marcel (~> 0.3.1) - activesupport (5.2.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (9.0.0) - bindex (0.6.0) - bootsnap (1.4.2) - msgpack (~> 1.0) - builder (3.2.3) - byebug (11.0.1) - concurrent-ruby (1.1.5) - crass (1.0.4) - erubi (1.8.0) - ffi (1.10.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.6.0) + activemodel (8.0.1) + activesupport (= 8.0.1) + activerecord (8.0.1) + activemodel (= 8.0.1) + activesupport (= 8.0.1) + timeout (>= 0.4.0) + activestorage (8.0.1) + actionpack (= 8.0.1) + activejob (= 8.0.1) + activerecord (= 8.0.1) + activesupport (= 8.0.1) + marcel (~> 1.0) + activesupport (8.0.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + bindex (0.8.1) + bootsnap (1.18.4) + msgpack (~> 1.2) + builder (3.3.0) + byebug (11.1.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + crass (1.0.6) + date (3.4.1) + drb (2.2.1) + erubi (1.13.1) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -65,37 +87,74 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.3) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - msgpack (1.2.9) - nio4r (2.3.1) - nokogiri (1.10.2) - mini_portile2 (~> 2.4.0) - pg (1.1.4) - puma (3.12.1) - rack (2.0.6) - 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) - bundler (>= 1.3.0) - railties (= 5.2.3) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + net-imap + net-pop + net-smtp + marcel (1.0.4) + mini_mime (1.1.5) + minitest (5.25.4) + msgpack (1.8.0) + net-imap (0.5.6) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.1) + net-protocol + nio4r (2.7.4) + nokogiri (1.18.2-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-musl) + racc (~> 1.4) + pg (1.5.9) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) + psych (5.2.3) + date + stringio + puma (6.6.0) + nio4r (~> 2.0) + racc (1.8.1) + rack (3.1.9) + rack-session (2.1.0) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) + rack (>= 1.3) + rackup (2.2.1) + rack (>= 3) + rails (8.0.1) + actioncable (= 8.0.1) + actionmailbox (= 8.0.1) + actionmailer (= 8.0.1) + actionpack (= 8.0.1) + actiontext (= 8.0.1) + actionview (= 8.0.1) + activejob (= 8.0.1) + activemodel (= 8.0.1) + activerecord (= 8.0.1) + activestorage (= 8.0.1) + activesupport (= 8.0.1) + bundler (>= 1.15.0) + railties (= 8.0.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) @@ -109,8 +168,12 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - ruby_dep (1.5.0) - sprockets (3.7.2) + rdoc (6.12.0) + psych (>= 4.0.0) + reline (0.6.0) + io-console (~> 0.5) + securerandom (0.4.1) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -136,10 +199,11 @@ PLATFORMS DEPENDENCIES bootsnap (>= 1.1.0) byebug - listen (>= 3.0.5, < 3.2) - pg (>= 0.18, < 2.0) - puma (~> 3.11) - rails (~> 5.2.3) + listen (~> 3.9.0) + pg (~> 1.1) + puma (>= 5.0) + rails (~> 8.0.1) + sprockets-rails tzinfo-data web-console (>= 3.3.0) From 95dbdab02e2fcc6f86a29efec82036754ce751a9 Mon Sep 17 00:00:00 2001 From: Alexey Vasilyev Date: Wed, 12 Feb 2025 00:08:16 +0300 Subject: [PATCH 2/3] Update to rails 8 --- .ruby-version | 2 +- Gemfile | 25 ++-- Gemfile.lock | 176 ++++++++++++------------- Readme.md | 2 +- app/views/layouts/application.html.erb | 7 +- config/environments/development.rb | 4 +- config/initializers/assets.rb | 8 +- config/routes.rb | 1 - 8 files changed, 106 insertions(+), 119 deletions(-) diff --git a/.ruby-version b/.ruby-version index ec1cf33c..47b322c9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.3 +3.4.1 diff --git a/Gemfile b/Gemfile index b22f79bc..34074dfd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,23 +1,14 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.6.3' - -gem 'rails', '~> 5.2.3' -gem 'pg', '>= 0.18', '< 2.0' -gem 'puma', '~> 3.11' -gem 'bootsnap', '>= 1.1.0', require: false - -group :development, :test do - # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] -end - -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' -end +ruby file: '.ruby-version' + +gem 'rails', '~> 8.0.1' +gem 'pg' +gem 'puma' +gem 'listen' +gem 'bootsnap' +gem 'rack-mini-profiler' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock index 17d5fb9b..a9ddd818 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,31 +1,51 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (8.0.1) + actionpack (= 8.0.1) + activesupport (= 8.0.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) - 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) + zeitwerk (~> 2.6) + actionmailbox (8.0.1) + actionpack (= 8.0.1) + activejob (= 8.0.1) + activerecord (= 8.0.1) + activestorage (= 8.0.1) + activesupport (= 8.0.1) + mail (>= 2.8.0) + actionmailer (8.0.1) + actionpack (= 8.0.1) + actionview (= 8.0.1) + activejob (= 8.0.1) + activesupport (= 8.0.1) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (8.0.1) + actionview (= 8.0.1) + activesupport (= 8.0.1) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) 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) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (8.0.1) + actionpack (= 8.0.1) + activerecord (= 8.0.1) + activestorage (= 8.0.1) + activesupport (= 8.0.1) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (8.0.1) + activesupport (= 8.0.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) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (8.0.1) + activesupport (= 8.0.1) globalid (>= 0.3.6) activemodel (8.0.1) activesupport (= 8.0.1) @@ -55,37 +75,33 @@ GEM base64 (0.2.0) benchmark (0.4.0) bigdecimal (3.1.9) - bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) builder (3.3.0) - byebug (11.1.3) concurrent-ruby (1.3.5) connection_pool (2.5.0) crass (1.0.6) date (3.4.1) drb (2.2.1) erubi (1.13.1) - ffi (1.17.1-aarch64-linux-gnu) - ffi (1.17.1-aarch64-linux-musl) - ffi (1.17.1-arm-linux-gnu) - ffi (1.17.1-arm-linux-musl) ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86_64-darwin) - ffi (1.17.1-x86_64-linux-gnu) - ffi (1.17.1-x86_64-linux-musl) globalid (1.2.1) activesupport (>= 6.1) i18n (1.14.7) 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) + io-console (0.8.0) + irb (1.15.1) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.5) + loofah (2.24.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -104,22 +120,8 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.2-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.2-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.18.2-arm-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.2-arm-linux-musl) - racc (~> 1.4) nokogiri (1.18.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.2-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.18.2-x86_64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.2-x86_64-linux-musl) - racc (~> 1.4) pg (1.5.9) pp (0.6.2) prettyprint @@ -131,6 +133,8 @@ GEM nio4r (~> 2.0) racc (1.8.1) rack (3.1.9) + rack-mini-profiler (3.3.1) + rack (>= 1.2.0) rack-session (2.1.0) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -156,59 +160,53 @@ GEM activesupport (>= 5.0.0) minitest 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) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rake (12.3.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (8.0.1) + actionpack (= 8.0.1) + activesupport (= 8.0.1) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) rdoc (6.12.0) psych (>= 4.0.0) reline (0.6.0) io-console (~> 0.5) securerandom (0.4.1) - sprockets (4.2.1) + stringio (3.1.2) + thor (1.3.2) + timeout (0.4.3) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - web-console (3.7.0) - actionview (>= 5.0) - activemodel (>= 5.0) - bindex (>= 0.4.0) - railties (>= 5.0) - websocket-driver (0.7.0) + uri (1.0.2) + useragent (0.16.11) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.5) + zeitwerk (2.7.1) PLATFORMS - ruby + arm64-darwin-24 DEPENDENCIES - bootsnap (>= 1.1.0) - byebug - listen (~> 3.9.0) - pg (~> 1.1) - puma (>= 5.0) + bootsnap + listen + pg + puma + rack-mini-profiler rails (~> 8.0.1) - sprockets-rails tzinfo-data - web-console (>= 3.3.0) RUBY VERSION - ruby 2.6.3p62 + ruby 3.4.1p0 BUNDLED WITH - 2.0.2 + 2.6.2 diff --git a/Readme.md b/Readme.md index 20b4eda3..fc5370bd 100644 --- a/Readme.md +++ b/Readme.md @@ -3,7 +3,7 @@ В этом задании вам предлагается оптимизировать учебное `rails`-приложение. Для запуска потребуется: -- `ruby 2.6.3` +- `ruby 3.3+` (любые `3.3.*`, `3.4.*` должны работать; можно задать в файле `.ruby-version`) - `postgres` Запуск и использование: diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e64170ee..870123ae 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,12 +1,7 @@ - Task4 - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all' %> - <%= javascript_include_tag 'application' %> + Task 3 diff --git a/config/environments/development.rb b/config/environments/development.rb index 1311e3e4..bc3f8142 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -47,10 +47,10 @@ # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large # number of complex assets. - config.assets.debug = true + # config.assets.debug = true # Suppress logger output for asset requests. - config.assets.quiet = true + # config.assets.quiet = true # Raises error for missing translations # config.action_view.raise_on_missing_translations = true diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 4b828e80..49a8c192 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -1,14 +1,18 @@ # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' +# Rails.application.config.assets.version = '1.0' # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path # Add Yarn node_modules folder to the asset load path. -Rails.application.config.assets.paths << Rails.root.join('node_modules') +# Rails.application.config.assets.paths << Rails.root.join('node_modules') # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. # Rails.application.config.assets.precompile += %w( admin.js admin.css ) + +# Rails.application.config.assets.paths << Rails.root.join('app', 'assets', 'javascripts') +# Rails.application.config.assets.paths << Rails.root.join('app', 'assets', 'stylesheets') +# Rails.application.config.assets.precompile += %w( application.js application.css ) diff --git a/config/routes.rb b/config/routes.rb index a2da6a7b..0bbefa7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get "/" => "statistics#index" get "автобусы/:from/:to" => "trips#index" end From ec6e98527a42e822999662cb963a772a40034f39 Mon Sep 17 00:00:00 2001 From: Alexey Vasilyev Date: Wed, 12 Feb 2025 00:17:23 +0300 Subject: [PATCH 3/3] Update readme --- Readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index fc5370bd..23864b3e 100644 --- a/Readme.md +++ b/Readme.md @@ -33,7 +33,7 @@ `rake reload_json[fixtures/large.json]` Для импорта этого объёма данных -- вам может помочь гем https://github.com/zdennis/activerecord-import +- вам может помочь batch-import - избегайте создания лишних транзакций - профилируйте скрипт импорта изученными инструментами и оптимизируйте его! @@ -44,6 +44,7 @@ Попробуйте воспользоваться - [ ] `rack-mini-profiler` +- [ ] `pghero` - [ ] `rails panel` - [ ] `bullet` - [ ] `explain` запросов