From e28f6b73ab7f2e59605ebd800e921a6146fc49ae Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 10 Dec 2022 11:54:08 -0500 Subject: Updated to Rails 7.0.3 --- Gemfile.lock | 244 +++++++++++++---------- app/assets/config/pokeviewer_manifest.js | 1 + app/controllers/pokeviewer/pokemon_controller.rb | 2 +- app/views/pokeviewer/pokemon/embed.html.haml | 2 +- bin/rails | 14 +- pokeviewer.gemspec | 3 +- 6 files changed, 155 insertions(+), 111 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 86d0140..56562fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH haml jquery-rails normalize-rails - rails (~> 5.2.0) + rails (~> 7.0.3) sassc-rails sequenced victor @@ -16,50 +16,73 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2) - actionpack (= 5.2.2) + actioncable (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) + actionmailbox (7.0.4) + actionpack (= 7.0.4) + activejob (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4) + actionpack (= 7.0.4) + actionview (= 7.0.4) + activejob (= 7.0.4) + activesupport (= 7.0.4) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (5.2.2) - actionview (= 5.2.2) - activesupport (= 5.2.2) - rack (~> 2.0) + actionpack (7.0.4) + actionview (= 7.0.4) + activesupport (= 7.0.4) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.2) - activesupport (= 5.2.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4) + actionpack (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4) + activesupport (= 7.0.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2) - activesupport (= 5.2.2) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4) + activesupport (= 7.0.4) globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) - arel (>= 9.0) + activemodel (7.0.4) + activesupport (= 7.0.4) + activerecord (7.0.4) + activemodel (= 7.0.4) + activesupport (= 7.0.4) activerecord-diff (2.0.0) - activestorage (5.2.2) - actionpack (= 5.2.2) - activerecord (= 5.2.2) - marcel (~> 0.3.1) - activesupport (5.2.2) + activestorage (7.0.4) + actionpack (= 7.0.4) + activejob (= 7.0.4) + activerecord (= 7.0.4) + activesupport (= 7.0.4) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (9.0.0) - builder (3.2.3) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + builder (3.2.4) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -67,98 +90,116 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.4) - crass (1.0.4) - enumerize (2.2.2) + concurrent-ruby (1.1.10) + crass (1.0.6) + date (3.3.1) + enumerize (2.5.0) activesupport (>= 3.2) - erubi (1.8.0) - execjs (2.7.0) - ffi (1.9.25) - globalid (0.4.2) - activesupport (>= 4.2.0) - haml (5.0.4) - temple (>= 0.8.0) + erubi (1.11.0) + execjs (2.8.1) + ffi (1.15.5) + globalid (1.0.0) + activesupport (>= 5.0) + haml (6.1.1) + temple (>= 0.8.2) + thor tilt - i18n (1.5.2) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jquery-rails (4.3.3) + jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - loofah (2.2.3) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.0) 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) - nio4r (2.3.1) - nokogiri (1.10.1) - mini_portile2 (~> 2.4.0) - normalize-rails (4.1.1) - rack (2.0.6) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.2) - actioncable (= 5.2.2) - actionmailer (= 5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) - activemodel (= 5.2.2) - activerecord (= 5.2.2) - activestorage (= 5.2.2) - activesupport (= 5.2.2) - bundler (>= 1.3.0) - railties (= 5.2.2) - sprockets-rails (>= 2.0.0) + net-imap + net-pop + net-smtp + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) + mini_portile2 (2.8.0) + minitest (5.16.3) + net-imap (0.3.2) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nio4r (2.5.8) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + normalize-rails (8.0.1) + racc (1.6.1) + rack (2.2.4) + rack-test (2.0.2) + rack (>= 1.3) + rails (7.0.4) + actioncable (= 7.0.4) + actionmailbox (= 7.0.4) + actionmailer (= 7.0.4) + actionpack (= 7.0.4) + actiontext (= 7.0.4) + actionview (= 7.0.4) + activejob (= 7.0.4) + activemodel (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) + bundler (>= 1.15.0) + railties (= 7.0.4) 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.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) + rails-html-sanitizer (1.4.3) + loofah (~> 2.3) + railties (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rake (12.3.2) - sassc (2.0.0) - ffi (~> 1.9.6) - rake - sassc-rails (2.1.0) + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rake (13.0.6) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) sprockets-rails tilt - sequenced (3.1.1) + sequenced (4.0.0) activerecord (>= 3.0) activesupport (>= 3.0) - sprockets (3.7.2) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - temple (0.8.0) - thor (0.20.3) - thread_safe (0.3.6) - tilt (2.0.9) - tzinfo (1.2.5) - thread_safe (~> 0.1) - victor (0.2.4) - websocket-driver (0.7.0) + sqlite3 (1.5.4) + mini_portile2 (~> 2.8.0) + temple (0.9.1) + thor (1.2.1) + tilt (2.0.11) + timeout (0.3.1) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) + victor (0.3.4) + webrick (1.7.0) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.5) + zeitwerk (2.6.6) PLATFORMS ruby @@ -166,6 +207,7 @@ PLATFORMS DEPENDENCIES pokeviewer! sqlite3 + webrick (~> 1.7) BUNDLED WITH 1.16.2 diff --git a/app/assets/config/pokeviewer_manifest.js b/app/assets/config/pokeviewer_manifest.js index 3b3efbb..8bd7006 100644 --- a/app/assets/config/pokeviewer_manifest.js +++ b/app/assets/config/pokeviewer_manifest.js @@ -1,2 +1,3 @@ //= link_directory ../javascripts/pokeviewer .js //= link_directory ../stylesheets/pokeviewer .css +//= link_tree ../images/pokeviewer diff --git a/app/controllers/pokeviewer/pokemon_controller.rb b/app/controllers/pokeviewer/pokemon_controller.rb index 2c38e56..d0bf432 100644 --- a/app/controllers/pokeviewer/pokemon_controller.rb +++ b/app/controllers/pokeviewer/pokemon_controller.rb @@ -5,7 +5,7 @@ module Pokeviewer before_action :load_pokemon, only: [:show, :embed] def index - pokemon = Pokemon.order("trainer_id IS NULL DESC"). + pokemon = Pokemon.order(Arel.sql("trainer_id IS NULL DESC")). order(trainer_id: :asc). order(box: :asc). order(slot: :asc). diff --git a/app/views/pokeviewer/pokemon/embed.html.haml b/app/views/pokeviewer/pokemon/embed.html.haml index f4848de..3c82052 100644 --- a/app/views/pokeviewer/pokemon/embed.html.haml +++ b/app/views/pokeviewer/pokemon/embed.html.haml @@ -12,4 +12,4 @@ %li.ptabe-button.ptabe-moves= link_to "Moves", "\#", data: {tab: "moves"} %li.ptabe-button.ptabe-contest= link_to "Contest", "\#", data: {tab: "contest"} %li.ptabe-button.ptabe-ribbons= link_to "Ribbons", "\#", data: {tab: "ribbons"} - = render @pokemon + = render @revision diff --git a/bin/rails b/bin/rails index 73a6f70..056c65f 100755 --- a/bin/rails +++ b/bin/rails @@ -2,13 +2,13 @@ # This command will automatically be run when you run "rails" with Rails gems # installed from the root of your application. -ENGINE_ROOT = File.expand_path('../..', __FILE__) -ENGINE_PATH = File.expand_path('../../lib/pokeviewer/engine', __FILE__) -APP_PATH = File.expand_path('../../test/dummy/config/application', __FILE__) +ENGINE_ROOT = File.expand_path("..", __dir__) +ENGINE_PATH = File.expand_path("../lib/pokeviewer/engine", __dir__) +APP_PATH = File.expand_path("../test/dummy/config/application", __dir__) # Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) +require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"]) -require 'rails/all' -require 'rails/engine/commands' +require "rails/all" +require "rails/engine/commands" diff --git a/pokeviewer.gemspec b/pokeviewer.gemspec index 375d399..64f0a20 100644 --- a/pokeviewer.gemspec +++ b/pokeviewer.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] - s.add_dependency "rails", "~> 5.2.0" + s.add_dependency "rails", "~> 7.0.3" s.add_dependency "enumerize" s.add_dependency "sequenced" s.add_dependency "activerecord-diff" @@ -28,4 +28,5 @@ Gem::Specification.new do |s| s.add_dependency 'victor' s.add_development_dependency "sqlite3" + s.add_development_dependency 'webrick', '~> 1.7' end -- cgit 1.4.1