Updated to Rails 7.0.3

author: Star Rauchenberger <fefferburbia@gmail.com> 2022-12-10 11:54:08 -0500
committer: Star Rauchenberger <fefferburbia@gmail.com> 2022-12-10 11:54:08 -0500
commit: e28f6b73ab7f2e59605ebd800e921a6146fc49ae (patch)
tree: 087d61ffbfde35123c3ec0c88302a81fbfef742b
parent: 32d4d3c1fc54721c3c99a15415cf698475237984 (diff)
download: pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.tar.gz
pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.tar.bz2
pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.zip
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)
+    actioncable (7.0.4)
-      actionpack (= 5.2.2)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
+    actionmailbox (7.0.4)
-      actionpack (= 5.2.2)
+      actionpack (= 7.0.4)
-      actionview (= 5.2.2)
+      activejob (= 7.0.4)
-      activejob (= 5.2.2)
+      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)
+    actionpack (7.0.4)
-      actionview (= 5.2.2)
+      actionview (= 7.0.4)
-      activesupport (= 5.2.2)
+      activesupport (= 7.0.4)
-      rack (~> 2.0)
+      rack (~> 2.0, >= 2.2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (5.2.2)
+    actiontext (7.0.4)
-      activesupport (= 5.2.2)
+      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)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (5.2.2)
+    activejob (7.0.4)
-      activesupport (= 5.2.2)
+      activesupport (= 7.0.4)
      globalid (>= 0.3.6)
-    activemodel (5.2.2)
+    activemodel (7.0.4)
-      activesupport (= 5.2.2)
+      activesupport (= 7.0.4)
-    activerecord (5.2.2)
+    activerecord (7.0.4)
-      activemodel (= 5.2.2)
+      activemodel (= 7.0.4)
-      activesupport (= 5.2.2)
+      activesupport (= 7.0.4)
-      arel (>= 9.0)
    activerecord-diff (2.0.0)
-    activestorage (5.2.2)
+    activestorage (7.0.4)
-      actionpack (= 5.2.2)
+      actionpack (= 7.0.4)
-      activerecord (= 5.2.2)
+      activejob (= 7.0.4)
-      marcel (~> 0.3.1)
+      activerecord (= 7.0.4)
-    activesupport (5.2.2)
+      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)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-    arel (9.0.0)
+    builder (3.2.4)
-    builder (3.2.3)
    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)
+    concurrent-ruby (1.1.10)
-    crass (1.0.4)
+    crass (1.0.6)
-    enumerize (2.2.2)
+    date (3.3.1)
+    enumerize (2.5.0)
      activesupport (>= 3.2)
-    erubi (1.8.0)
+    erubi (1.11.0)
-    execjs (2.7.0)
+    execjs (2.8.1)
-    ffi (1.9.25)
+    ffi (1.15.5)
-    globalid (0.4.2)
+    globalid (1.0.0)
-      activesupport (>= 4.2.0)
+      activesupport (>= 5.0)
-    haml (5.0.4)
+    haml (6.1.1)
-      temple (>= 0.8.0)
+      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)
+      net-imap
-      mimemagic (~> 0.3.2)
+      net-pop
-    method_source (0.9.2)
+      net-smtp
-    mimemagic (0.3.3)
+    marcel (1.0.2)
-    mini_mime (1.0.1)
+    method_source (1.0.0)
-    mini_portile2 (2.4.0)
+    mini_mime (1.1.2)
-    minitest (5.11.3)
+    mini_portile2 (2.8.0)
-    nio4r (2.3.1)
+    minitest (5.16.3)
-    nokogiri (1.10.1)
+    net-imap (0.3.2)
-      mini_portile2 (~> 2.4.0)
+      date
-    normalize-rails (4.1.1)
+      net-protocol
-    rack (2.0.6)
+    net-pop (0.1.2)
-    rack-test (1.1.0)
+      net-protocol
-      rack (>= 1.0, < 3)
+    net-protocol (0.2.1)
-    rails (5.2.2)
+      timeout
-      actioncable (= 5.2.2)
+    net-smtp (0.3.3)
-      actionmailer (= 5.2.2)
+      net-protocol
-      actionpack (= 5.2.2)
+    nio4r (2.5.8)
-      actionview (= 5.2.2)
+    nokogiri (1.13.10)
-      activejob (= 5.2.2)
+      mini_portile2 (~> 2.8.0)
-      activemodel (= 5.2.2)
+      racc (~> 1.4)
-      activerecord (= 5.2.2)
+    normalize-rails (8.0.1)
-      activestorage (= 5.2.2)
+    racc (1.6.1)
-      activesupport (= 5.2.2)
+    rack (2.2.4)
-      bundler (>= 1.3.0)
+    rack-test (2.0.2)
-      railties (= 5.2.2)
+      rack (>= 1.3)
-      sprockets-rails (>= 2.0.0)
+    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)
+    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.2, >= 2.2.2)
+      loofah (~> 2.3)
-    railties (5.2.2)
+    railties (7.0.4)
-      actionpack (= 5.2.2)
+      actionpack (= 7.0.4)
-      activesupport (= 5.2.2)
+      activesupport (= 7.0.4)
      method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
-      thor (>= 0.19.0, < 2.0)
+      thor (~> 1.0)
-    rake (12.3.2)
+      zeitwerk (~> 2.5)
-    sassc (2.0.0)
+    rake (13.0.6)
-      ffi (~> 1.9.6)
+    sassc (2.4.0)
-      rake
+      ffi (~> 1.9)
-    sassc-rails (2.1.0)
+    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)
+    sprockets-rails (3.4.2)
-      actionpack (>= 4.0)
+      actionpack (>= 5.2)
-      activesupport (>= 4.0)
+      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.5.4)
-    temple (0.8.0)
+      mini_portile2 (~> 2.8.0)
-    thor (0.20.3)
+    temple (0.9.1)
-    thread_safe (0.3.6)
+    thor (1.2.1)
-    tilt (2.0.9)
+    tilt (2.0.11)
-    tzinfo (1.2.5)
+    timeout (0.3.1)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.5)
-    victor (0.2.4)
+      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.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_ROOT = File.expand_path("..", __dir__)
-ENGINE_PATH = File.expand_path('../../lib/pokeviewer/engine', __FILE__)
+ENGINE_PATH = File.expand_path("../lib/pokeviewer/engine", __dir__)
-APP_PATH = File.expand_path('../../test/dummy/config/application', __FILE__)
+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__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-require 'rails/all'
+require "rails/all"
-require 'rails/engine/commands'
+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
author	Star Rauchenberger <fefferburbia@gmail.com>	2022-12-10 11:54:08 -0500
committer	Star Rauchenberger <fefferburbia@gmail.com>	2022-12-10 11:54:08 -0500
commit	e28f6b73ab7f2e59605ebd800e921a6146fc49ae (patch)
tree	087d61ffbfde35123c3ec0c88302a81fbfef742b
parent	32d4d3c1fc54721c3c99a15415cf698475237984 (diff)
download	pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.tar.gz pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.tar.bz2 pokeviewer-e28f6b73ab7f2e59605ebd800e921a6146fc49ae.zip

diff --git a/Gemfile.lock b/Gemfile.lock index 86d0140..56562fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock
@@ -8,7 +8,7 @@ PATH
8	haml	8	haml
9	jquery-rails	9	jquery-rails
10	normalize-rails	10	normalize-rails
11	rails (~> 5.2.0)	11	rails (~> 7.0.3)
12	sassc-rails	12	sassc-rails
13	sequenced	13	sequenced
14	victor	14	victor
@@ -16,50 +16,73 @@ PATH
16	GEM	16	GEM
17	remote: https://rubygems.org/	17	remote: https://rubygems.org/
18	specs:	18	specs:
19	actioncable (5.2.2)	19	actioncable (7.0.4)
20	actionpack (= 5.2.2)	20	actionpack (= 7.0.4)
		21	activesupport (= 7.0.4)
21	nio4r (~> 2.0)	22	nio4r (~> 2.0)
22	websocket-driver (>= 0.6.1)	23	websocket-driver (>= 0.6.1)
23	actionmailer (5.2.2)	24	actionmailbox (7.0.4)
24	actionpack (= 5.2.2)	25	actionpack (= 7.0.4)
25	actionview (= 5.2.2)	26	activejob (= 7.0.4)
26	activejob (= 5.2.2)	27	activerecord (= 7.0.4)
		28	activestorage (= 7.0.4)
		29	activesupport (= 7.0.4)
		30	mail (>= 2.7.1)
		31	net-imap
		32	net-pop
		33	net-smtp
		34	actionmailer (7.0.4)
		35	actionpack (= 7.0.4)
		36	actionview (= 7.0.4)
		37	activejob (= 7.0.4)
		38	activesupport (= 7.0.4)
27	mail (~> 2.5, >= 2.5.4)	39	mail (~> 2.5, >= 2.5.4)
		40	net-imap
		41	net-pop
		42	net-smtp
28	rails-dom-testing (~> 2.0)	43	rails-dom-testing (~> 2.0)
29	actionpack (5.2.2)	44	actionpack (7.0.4)
30	actionview (= 5.2.2)	45	actionview (= 7.0.4)
31	activesupport (= 5.2.2)	46	activesupport (= 7.0.4)
32	rack (~> 2.0)	47	rack (~> 2.0, >= 2.2.0)
33	rack-test (>= 0.6.3)	48	rack-test (>= 0.6.3)
34	rails-dom-testing (~> 2.0)	49	rails-dom-testing (~> 2.0)
35	rails-html-sanitizer (~> 1.0, >= 1.0.2)	50	rails-html-sanitizer (~> 1.0, >= 1.2.0)
36	actionview (5.2.2)	51	actiontext (7.0.4)
37	activesupport (= 5.2.2)	52	actionpack (= 7.0.4)
		53	activerecord (= 7.0.4)
		54	activestorage (= 7.0.4)
		55	activesupport (= 7.0.4)
		56	globalid (>= 0.6.0)
		57	nokogiri (>= 1.8.5)
		58	actionview (7.0.4)
		59	activesupport (= 7.0.4)
38	builder (~> 3.1)	60	builder (~> 3.1)
39	erubi (~> 1.4)	61	erubi (~> 1.4)
40	rails-dom-testing (~> 2.0)	62	rails-dom-testing (~> 2.0)
41	rails-html-sanitizer (~> 1.0, >= 1.0.3)	63	rails-html-sanitizer (~> 1.1, >= 1.2.0)
42	activejob (5.2.2)	64	activejob (7.0.4)
43	activesupport (= 5.2.2)	65	activesupport (= 7.0.4)
44	globalid (>= 0.3.6)	66	globalid (>= 0.3.6)
45	activemodel (5.2.2)	67	activemodel (7.0.4)
46	activesupport (= 5.2.2)	68	activesupport (= 7.0.4)
47	activerecord (5.2.2)	69	activerecord (7.0.4)
48	activemodel (= 5.2.2)	70	activemodel (= 7.0.4)
49	activesupport (= 5.2.2)	71	activesupport (= 7.0.4)
50	arel (>= 9.0)
51	activerecord-diff (2.0.0)	72	activerecord-diff (2.0.0)
52	activestorage (5.2.2)	73	activestorage (7.0.4)
53	actionpack (= 5.2.2)	74	actionpack (= 7.0.4)
54	activerecord (= 5.2.2)	75	activejob (= 7.0.4)
55	marcel (~> 0.3.1)	76	activerecord (= 7.0.4)
56	activesupport (5.2.2)	77	activesupport (= 7.0.4)
		78	marcel (~> 1.0)
		79	mini_mime (>= 1.1.0)
		80	activesupport (7.0.4)
57	concurrent-ruby (~> 1.0, >= 1.0.2)	81	concurrent-ruby (~> 1.0, >= 1.0.2)
58	i18n (>= 0.7, < 2)	82	i18n (>= 1.6, < 2)
59	minitest (~> 5.1)	83	minitest (>= 5.1)
60	tzinfo (~> 1.1)	84	tzinfo (~> 2.0)
61	arel (9.0.0)	85	builder (3.2.4)
62	builder (3.2.3)
63	coffee-rails (4.2.2)	86	coffee-rails (4.2.2)
64	coffee-script (>= 2.2.0)	87	coffee-script (>= 2.2.0)
65	railties (>= 4.0.0)	88	railties (>= 4.0.0)
@@ -67,98 +90,116 @@ GEM
67	coffee-script-source	90	coffee-script-source
68	execjs	91	execjs
69	coffee-script-source (1.12.2)	92	coffee-script-source (1.12.2)
70	concurrent-ruby (1.1.4)	93	concurrent-ruby (1.1.10)
71	crass (1.0.4)	94	crass (1.0.6)
72	enumerize (2.2.2)	95	date (3.3.1)
		96	enumerize (2.5.0)
73	activesupport (>= 3.2)	97	activesupport (>= 3.2)
74	erubi (1.8.0)	98	erubi (1.11.0)
75	execjs (2.7.0)	99	execjs (2.8.1)
76	ffi (1.9.25)	100	ffi (1.15.5)
77	globalid (0.4.2)	101	globalid (1.0.0)
78	activesupport (>= 4.2.0)	102	activesupport (>= 5.0)
79	haml (5.0.4)	103	haml (6.1.1)
80	temple (>= 0.8.0)	104	temple (>= 0.8.2)
		105	thor
81	tilt	106	tilt
82	i18n (1.5.2)	107	i18n (1.12.0)
83	concurrent-ruby (~> 1.0)	108	concurrent-ruby (~> 1.0)
84	jquery-rails (4.3.3)	109	jquery-rails (4.5.1)
85	rails-dom-testing (>= 1, < 3)	110	rails-dom-testing (>= 1, < 3)
86	railties (>= 4.2.0)	111	railties (>= 4.2.0)
87	thor (>= 0.14, < 2.0)	112	thor (>= 0.14, < 2.0)
88	loofah (2.2.3)	113	loofah (2.19.0)
89	crass (~> 1.0.2)	114	crass (~> 1.0.2)
90	nokogiri (>= 1.5.9)	115	nokogiri (>= 1.5.9)
91	mail (2.7.1)	116	mail (2.8.0)
92	mini_mime (>= 0.1.1)	117	mini_mime (>= 0.1.1)
93	marcel (0.3.3)	118	net-imap
94	mimemagic (~> 0.3.2)	119	net-pop
95	method_source (0.9.2)	120	net-smtp
96	mimemagic (0.3.3)	121	marcel (1.0.2)
97	mini_mime (1.0.1)	122	method_source (1.0.0)
98	mini_portile2 (2.4.0)	123	mini_mime (1.1.2)
99	minitest (5.11.3)	124	mini_portile2 (2.8.0)
100	nio4r (2.3.1)	125	minitest (5.16.3)
101	nokogiri (1.10.1)	126	net-imap (0.3.2)
102	mini_portile2 (~> 2.4.0)	127	date
103	normalize-rails (4.1.1)	128	net-protocol
104	rack (2.0.6)	129	net-pop (0.1.2)
105	rack-test (1.1.0)	130	net-protocol
106	rack (>= 1.0, < 3)	131	net-protocol (0.2.1)
107	rails (5.2.2)	132	timeout
108	actioncable (= 5.2.2)	133	net-smtp (0.3.3)
109	actionmailer (= 5.2.2)	134	net-protocol
110	actionpack (= 5.2.2)	135	nio4r (2.5.8)
111	actionview (= 5.2.2)	136	nokogiri (1.13.10)
112	activejob (= 5.2.2)	137	mini_portile2 (~> 2.8.0)
113	activemodel (= 5.2.2)	138	racc (~> 1.4)
114	activerecord (= 5.2.2)	139	normalize-rails (8.0.1)
115	activestorage (= 5.2.2)	140	racc (1.6.1)
116	activesupport (= 5.2.2)	141	rack (2.2.4)
117	bundler (>= 1.3.0)	142	rack-test (2.0.2)
118	railties (= 5.2.2)	143	rack (>= 1.3)
119	sprockets-rails (>= 2.0.0)	144	rails (7.0.4)
		145	actioncable (= 7.0.4)
		146	actionmailbox (= 7.0.4)
		147	actionmailer (= 7.0.4)
		148	actionpack (= 7.0.4)
		149	actiontext (= 7.0.4)
		150	actionview (= 7.0.4)
		151	activejob (= 7.0.4)
		152	activemodel (= 7.0.4)
		153	activerecord (= 7.0.4)
		154	activestorage (= 7.0.4)
		155	activesupport (= 7.0.4)
		156	bundler (>= 1.15.0)
		157	railties (= 7.0.4)
120	rails-dom-testing (2.0.3)	158	rails-dom-testing (2.0.3)
121	activesupport (>= 4.2.0)	159	activesupport (>= 4.2.0)
122	nokogiri (>= 1.6)	160	nokogiri (>= 1.6)
123	rails-html-sanitizer (1.0.4)	161	rails-html-sanitizer (1.4.3)
124	loofah (~> 2.2, >= 2.2.2)	162	loofah (~> 2.3)
125	railties (5.2.2)	163	railties (7.0.4)
126	actionpack (= 5.2.2)	164	actionpack (= 7.0.4)
127	activesupport (= 5.2.2)	165	activesupport (= 7.0.4)
128	method_source	166	method_source
129	rake (>= 0.8.7)	167	rake (>= 12.2)
130	thor (>= 0.19.0, < 2.0)	168	thor (~> 1.0)
131	rake (12.3.2)	169	zeitwerk (~> 2.5)
132	sassc (2.0.0)	170	rake (13.0.6)
133	ffi (~> 1.9.6)	171	sassc (2.4.0)
134	rake	172	ffi (~> 1.9)
135	sassc-rails (2.1.0)	173	sassc-rails (2.1.2)
136	railties (>= 4.0.0)	174	railties (>= 4.0.0)
137	sassc (>= 2.0)	175	sassc (>= 2.0)
138	sprockets (> 3.0)	176	sprockets (> 3.0)
139	sprockets-rails	177	sprockets-rails
140	tilt	178	tilt
141	sequenced (3.1.1)	179	sequenced (4.0.0)
142	activerecord (>= 3.0)	180	activerecord (>= 3.0)
143	activesupport (>= 3.0)	181	activesupport (>= 3.0)
144	sprockets (3.7.2)	182	sprockets (4.1.1)
145	concurrent-ruby (~> 1.0)	183	concurrent-ruby (~> 1.0)
146	rack (> 1, < 3)	184	rack (> 1, < 3)
147	sprockets-rails (3.2.1)	185	sprockets-rails (3.4.2)
148	actionpack (>= 4.0)	186	actionpack (>= 5.2)
149	activesupport (>= 4.0)	187	activesupport (>= 5.2)
150	sprockets (>= 3.0.0)	188	sprockets (>= 3.0.0)
151	sqlite3 (1.3.13)	189	sqlite3 (1.5.4)
152	temple (0.8.0)	190	mini_portile2 (~> 2.8.0)
153	thor (0.20.3)	191	temple (0.9.1)
154	thread_safe (0.3.6)	192	thor (1.2.1)
155	tilt (2.0.9)	193	tilt (2.0.11)
156	tzinfo (1.2.5)	194	timeout (0.3.1)
157	thread_safe (~> 0.1)	195	tzinfo (2.0.5)
158	victor (0.2.4)	196	concurrent-ruby (~> 1.0)
159	websocket-driver (0.7.0)	197	victor (0.3.4)
		198	webrick (1.7.0)
		199	websocket-driver (0.7.5)
160	websocket-extensions (>= 0.1.0)	200	websocket-extensions (>= 0.1.0)
161	websocket-extensions (0.1.3)	201	websocket-extensions (0.1.5)
		202	zeitwerk (2.6.6)
162		203
163	PLATFORMS	204	PLATFORMS
164	ruby	205	ruby
@@ -166,6 +207,7 @@ PLATFORMS
166	DEPENDENCIES	207	DEPENDENCIES
167	pokeviewer!	208	pokeviewer!
168	sqlite3	209	sqlite3
		210	webrick (~> 1.7)
169		211
170	BUNDLED WITH	212	BUNDLED WITH
171	1.16.2	213	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 @@
1	//= link_directory ../javascripts/pokeviewer .js	1	//= link_directory ../javascripts/pokeviewer .js
2	//= link_directory ../stylesheets/pokeviewer .css	2	//= link_directory ../stylesheets/pokeviewer .css
		3	//= 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
5	before_action :load_pokemon, only: [:show, :embed]	5	before_action :load_pokemon, only: [:show, :embed]
6		6
7	def index	7	def index
8	pokemon = Pokemon.order("trainer_id IS NULL DESC").	8	pokemon = Pokemon.order(Arel.sql("trainer_id IS NULL DESC")).
9	order(trainer_id: :asc).	9	order(trainer_id: :asc).
10	order(box: :asc).	10	order(box: :asc).
11	order(slot: :asc).	11	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 @@
12	%li.ptabe-button.ptabe-moves= link_to "Moves", "\#", data: {tab: "moves"}	12	%li.ptabe-button.ptabe-moves= link_to "Moves", "\#", data: {tab: "moves"}
13	%li.ptabe-button.ptabe-contest= link_to "Contest", "\#", data: {tab: "contest"}	13	%li.ptabe-button.ptabe-contest= link_to "Contest", "\#", data: {tab: "contest"}
14	%li.ptabe-button.ptabe-ribbons= link_to "Ribbons", "\#", data: {tab: "ribbons"}	14	%li.ptabe-button.ptabe-ribbons= link_to "Ribbons", "\#", data: {tab: "ribbons"}
15	= render @pokemon	15	= render @revision


diff --git a/bin/rails b/bin/rails index 73a6f70..056c65f 100755 --- a/bin/rails +++ b/bin/rails
@@ -2,13 +2,13 @@
2	# This command will automatically be run when you run "rails" with Rails gems	2	# This command will automatically be run when you run "rails" with Rails gems
3	# installed from the root of your application.	3	# installed from the root of your application.
4		4
5	ENGINE_ROOT = File.expand_path('../..', __FILE__)	5	ENGINE_ROOT = File.expand_path("..", __dir__)
6	ENGINE_PATH = File.expand_path('../../lib/pokeviewer/engine', __FILE__)	6	ENGINE_PATH = File.expand_path("../lib/pokeviewer/engine", __dir__)
7	APP_PATH = File.expand_path('../../test/dummy/config/application', __FILE__)	7	APP_PATH = File.expand_path("../test/dummy/config/application", __dir__)
8		8
9	# Set up gems listed in the Gemfile.	9	# Set up gems listed in the Gemfile.
10	ENV['BUNDLE_GEMFILE'] \|\|= File.expand_path('../../Gemfile', __FILE__)	10	ENV["BUNDLE_GEMFILE"] \|\|= File.expand_path("../Gemfile", __dir__)
11	require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])	11	require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
12		12
13	require 'rails/all'	13	require "rails/all"
14	require 'rails/engine/commands'	14	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\|
16		16
17	s.files = Dir["{app,config,db,lib}/*/", "MIT-LICENSE", "Rakefile", "README.md"]	17	s.files = Dir["{app,config,db,lib}/*/", "MIT-LICENSE", "Rakefile", "README.md"]
18		18
19	s.add_dependency "rails", "~> 5.2.0"	19	s.add_dependency "rails", "~> 7.0.3"
20	s.add_dependency "enumerize"	20	s.add_dependency "enumerize"
21	s.add_dependency "sequenced"	21	s.add_dependency "sequenced"
22	s.add_dependency "activerecord-diff"	22	s.add_dependency "activerecord-diff"
@@ -28,4 +28,5 @@ Gem::Specification.new do \|s\|
28	s.add_dependency 'victor'	28	s.add_dependency 'victor'
29		29
30	s.add_development_dependency "sqlite3"	30	s.add_development_dependency "sqlite3"
		31	s.add_development_dependency 'webrick', '~> 1.7'
31	end	32	end