Support Rails 7.2

reverbdotcom · Sep 17, 2024 · ddc7e40 · ddc7e40
1 parent fb5ca3d
commit ddc7e40
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ spec/dummy/config/cloudinary.yml
 bin/
 
 .rspec
+.idea/
diff --git a/Gemfile b/Gemfile
@@ -17,14 +17,15 @@ group :assets do
 end
 
 group :mongoid do
-  gem 'mongoid'
+  gem 'mongoid', git: 'https://github.com/mongodb/mongoid.git', branch: 'master'
 end
 
 group :test do
   # headless chrome without selenium
   # Using a ref until a new gem version is available due to this issue: https://github.com/twalpole/apparition/issues/81
   # Same version used in reverb core
   gem "apparition", git: 'https://github.com/twalpole/apparition', ref: 'ca86be4d54af835d531dbcd2b86e7b2c77f85f34'
+  gem 'factory_bot_rails', git: 'https://github.com/RajRoR/factory_bot_rails.git', branch: 'main'
 end
 
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,22 @@
+GIT
+  remote: https://github.com/RajRoR/factory_bot_rails.git
+  revision: 987ebd203b285fc20b918ab5c164e4507564a628
+  branch: main
+  specs:
+    factory_bot_rails (6.5.0)
+      factory_bot (~> 6.5)
+      railties (>= 5.0.0)
+
+GIT
+  remote: https://github.com/mongodb/mongoid.git
+  revision: a79e90cb67b8a5865e99a1c6d7cb11e0d7591e7c
+  branch: master
+  specs:
+    mongoid (9.0.1)
+      activemodel (>= 5.1, < 7.3, != 7.0.0)
+      concurrent-ruby (>= 1.0.5, < 2.0)
+      mongo (>= 2.18.0, < 3.0.0)
+
 GIT
   remote: https://github.com/twalpole/apparition
   revision: ca86be4d54af835d531dbcd2b86e7b2c77f85f34
@@ -10,93 +29,89 @@ GIT
 PATH
   remote: .
   specs:
-    attachinary (1.3.0.15)
+    attachinary (1.3.0.16)
       cloudinary
-      rails (= 7.1.3.4)
+      rails (= 7.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-    activesupport (7.1.3.4)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aws_cf_signer (0.1.3)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    bson (4.15.0)
+    bson (5.0.1)
     builder (3.2.4)
     capybara (3.40.0)
       addressable
@@ -118,12 +133,12 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -133,11 +148,8 @@ GEM
     drb (2.2.1)
     erubi (1.12.0)
     execjs (2.8.1)
-    factory_girl (4.9.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.9.0)
-      factory_girl (~> 4.9.0)
-      railties (>= 3.0.0)
+    factory_bot (6.5.0)
+      activesupport (>= 5.0.0)
     ffi (1.15.5)
     formatador (1.1.0)
     globalid (1.2.1)
@@ -159,7 +171,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
     irb (1.13.1)
@@ -174,6 +186,7 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -191,16 +204,11 @@ GEM
     mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.23.1)
-    mongo (2.18.2)
-      bson (>= 4.14.1, < 5.0.0)
-    mongoid (9.0.0)
-      activemodel (>= 5.1, < 7.2, != 7.0.0)
-      concurrent-ruby (>= 1.0.5, < 2.0)
-      mongo (>= 2.18.0, < 3.0.0)
-    mutex_m (0.2.0)
+    minitest (5.25.1)
+    mongo (2.20.1)
+      bson (>= 4.14.1, < 6.0.0)
     nenv (0.3.0)
-    net-imap (0.4.11)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
@@ -232,31 +240,31 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.3.4)
-      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
+      railties (= 7.2.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -287,25 +295,26 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.0.1)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
+    securerandom (0.3.1)
     shellany (0.0.1)
     simple_form (5.3.1)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sqlite3 (1.5.4)
       mini_portile2 (~> 2.8.0)
@@ -314,6 +323,7 @@ GEM
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    useragent (0.16.10)
     valid_attribute (2.0.0)
     webrick (1.8.1)
     websocket-driver (0.7.6)
@@ -333,11 +343,11 @@ DEPENDENCIES
   cloudinary (= 1.29.0)
   coffee-rails
   database_cleaner
-  factory_girl_rails
+  factory_bot_rails!
   guard-rspec
   jquery-rails
   launchy
-  mongoid
+  mongoid!
   rb-fsevent (~> 0.9.1)
   rspec-rails
   simple_form

diff --git a/attachinary.gemspec b/attachinary.gemspec
@@ -24,14 +24,13 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails', '7.1.3.4'
+  s.add_dependency 'rails', '7.2.1'
   s.add_dependency 'cloudinary'
 
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'valid_attribute'
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'factory_girl_rails'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'rb-fsevent', '~> 0.9.1'

diff --git a/db/migrate/20120612112526_create_attachinary_tables.rb b/db/migrate/20120612112526_create_attachinary_tables.rb
@@ -1,4 +1,4 @@
-class CreateAttachinaryTables < ActiveRecord::Migration
+class CreateAttachinaryTables < ActiveRecord::Migration[7.2]
   def change
     create_table :attachinary_files do |t|
       t.references :attachinariable, polymorphic: true

diff --git a/lib/attachinary/version.rb b/lib/attachinary/version.rb
@@ -1,3 +1,3 @@
 module Attachinary
-  VERSION = "1.3.0.15".freeze
+  VERSION = "1.3.0.16".freeze
 end
diff --git a/spec/dummy/db/migrate/20120608091037_create_tables.rb b/spec/dummy/db/migrate/20120608091037_create_tables.rb
@@ -1,4 +1,4 @@
-class CreateTables < ActiveRecord::Migration[6.1]
+class CreateTables < ActiveRecord::Migration[7.2]
   def change
     create_table :attachinary_files do |t|
       t.references :attachinariable, polymorphic: true

diff --git a/spec/dummy/db/migrate/20120608104143_create_notes.rb b/spec/dummy/db/migrate/20120608104143_create_notes.rb
@@ -1,4 +1,4 @@
-class CreateNotes < ActiveRecord::Migration[6.1]
+class CreateNotes < ActiveRecord::Migration[7.2]
   def change
     create_table :notes do |t|
       t.text :body
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ spec/dummy/config/cloudinary.yml
		bin/

		.rspec
		.idea/