globalize 6.3.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34cc31a44c1d8b8a42380056f12b248c294b29f9f36354bf4c036bb9bc7647ee
-  data.tar.gz: ad2174d623ad46091f589fd02b3e8a3ead9dc38152abfcb993eb58adde31d59d
+  metadata.gz: f5fdba3c5ea00eef1837da1b42d82ac9cd09b4ab5ae7ac30c7f52dae27b9f9f1
+  data.tar.gz: 050116cc35980cd4811d50d77b1bd951fd771f166d9bda3fac4e9017915c6392
 SHA512:
-  metadata.gz: 4648278f3dcfa69f1bf221672dc63469b8361e67787af443af114cb52baa86e471d7bc9c520019b14e85f1e7810381b7057871c1e8c16072c411e82cd33fb955
-  data.tar.gz: e759b5efe96786474e32e380109542695398bcbdffcb5bb121e6d2736dc01e4585cc6099b428126d2437524da9cdfa1c2a2e8f7b8ee62d68035c57366ddaf789
+  metadata.gz: 60221a6bc834b88ae87b49ffbbdb91e580d7e62e8bddb550e256abb7ff3e3d8d2e431655ae2412756700e8faf7e626a873191a47f7b09b2246d74077bc5f0f25
+  data.tar.gz: 130ea35e74944c52893b4923a6168922696bc15f8afaf19e10dfae57913fb19ac2ea10130a6da1d9bbad96ba575a0f71f36848d7a41299ece7b0e6256b37deb1

data/Appraisals

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 RAILS_VERSIONS = %w[
-  4.2.11.3
-  5.1.7
-  5.2.5
-  6.0.3.6
-  6.1.3.1
   7.0.1
 ]
 
@@ -13,14 +8,8 @@ RAILS_VERSIONS.each do |version|
   appraise "rails_#{version}" do
     gem 'activemodel', version
     gem 'activerecord', version
-    
-    if version =~ /^4/
-      gem 'sqlite3', '~> 1.3.6', platforms: [:ruby, :rbx]
-    elsif version =~ /^5/
-      gem 'sqlite3', '~> 1.3', '>= 1.3.6', platforms: [:ruby, :rbx]
-    else
-      gem 'sqlite3', '~> 1.4', platforms: [:ruby, :rbx]
-    end
+
+    gem 'sqlite3', '~> 1.4', platforms: [:ruby, :rbx]
 
     if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
       group :postgres, :postgresql do

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 # Globalize Changelog
 
+## 7.0.0 (2024-12-20)
+
+* Enable Rubygems Trusted Publishing
+* Fix ActiveRecord load order issues using `ActiveSupport.on_load(:active_record)` [#816](https://github.com/globalize/globalize/pull/816) by [Rune Philosof](https://github.com/runephilosof-abtion)
+* Allow custom `:dependent` option for translations association [#821](https://github.com/globalize/globalize/pull/821) by [Bruno Carvalho](https://github.com/brunodccarvalho)
+* Don't specify `ignored_columns` unless necessary [#806](https://github.com/globalize/globalize/pull/806) by [Pat Leamon](https://github.com/stiak)
+
 ## 6.3.0 (2023-10-22)
 
-* Support ruby 3.2 rails 7.1 (#810)(https://github.com/globalize/globalize/pull/810) by [Shinichi Maeshima](https://github.com/willnet)
+* Support ruby 3.2 rails 7.1 [#810](https://github.com/globalize/globalize/pull/810) by [Shinichi Maeshima](https://github.com/willnet)
 
 ## 6.2.1 (2022-05-24)
 

data/CONTRIBUTING.md

@@ -4,7 +4,7 @@ Globalize is a community project, and would not be here today if it were not for
 
 ## Bugs
 
-If you find a bug or something is not working as expected, please search through the [github issues](https://github.com/globalize/globalize/issues) and on [stackoverflow](http://stackoverflow.com/questions/tagged/globalize) first. If you cannot find any answers related to your issue, post a new one and we will try to address it as soon as we can. Note that we prioritize Rails 4 issues (`main` branch) over Rails 3 issues (`3-0-stable` branch).
+If you find a bug or something is not working as expected, please search through the [github issues](https://github.com/globalize/globalize/issues) and on [stackoverflow](http://stackoverflow.com/questions/tagged/globalize) first. If you cannot find any answers related to your issue, post a new one and we will try to address it as soon as we can.
 
 If you also have some idea how to fix the bug, then by all means post a pull request (see below).
 
@@ -20,7 +20,7 @@ Have some free time? Help us improve our [code climate score](https://codeclimat
 
 ## Documentation
 
-Globalize needs better documentation. That includes more inline comments explaining clearly what code is doing, as well as reference documentation beyond the [readme](readme.md) -- possibly in the github wiki. Please contact us if you would like to help with documentation.
+Globalize needs better documentation. That includes more inline comments explaining clearly what code is doing, as well as reference documentation beyond the [readme](README.md) -- possibly in the github wiki. Please contact us if you would like to help with documentation.
 
 ## Pull Requests
 
@@ -32,8 +32,6 @@ Have a bug fix, code improvement or proposed feature? Do the following:
 4. Push to the branch: `git push origin my_new_feature`
 5. Submit a pull request.
 
-For pull requests to Rails/ActiveRecord 4 version of Globalize (v3.x), post to the `main` branch. For pull requests to the Rails/ActiveRecord 3.x version of Globalize (3.x), post to the `3-0-stable` branch.
-
 When you submit the pull request, GitHub Actions will run the [test suite](https://github.com/globalize/globalize/actions) against your branch and will highlight any failures. Unless there is a good reason for it, we do not generally accept pull requests that take Globalize from green to red.
 
 ## Testing

data/Gemfile

@@ -7,12 +7,20 @@ if !ENV['CI'] || ENV['DB'] == 'sqlite3'
   gem 'sqlite3', platforms: [:ruby, :rbx]
 end
 
+# have a look at test/support/database.yml which environment variables can be set
 if !ENV['CI'] || ENV['DB'] == 'mysql'
   group :mysql do
     gem 'mysql2', platforms: [:ruby, :rbx]
   end
 end
 
+# Test with different ActiveRecord versions
+# $ AR=7.1.5 bundle update; rake db:reset db:migrate test
+# $ AR=7.2.2 bundle update; rake db:reset db:migrate test
+if ENV['AR']
+  gem 'activerecord', ENV['AR']
+end
+
 if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
   group :postgres, :postgresql do
     gem 'pg', platforms: [:ruby, :rbx]

data/Gemfile.lock

@@ -1,86 +1,91 @@
 PATH
   remote: .
   specs:
-    globalize (6.3.0)
-      activemodel (>= 4.2, < 7.2)
-      activerecord (>= 4.2, < 7.2)
+    globalize (7.0.0)
+      activemodel (>= 7.0, < 8.1)
+      activerecord (>= 7.0, < 8.1)
+      activesupport (>= 7.0, < 8.1)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (8.0.1)
+      activesupport (= 8.0.1)
+    activerecord (8.0.1)
+      activemodel (= 8.0.1)
+      activesupport (= 8.0.1)
       timeout (>= 0.4.0)
-    activesupport (7.1.1)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       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)
+      uri (>= 0.13.1)
     ansi (1.5.0)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
-    builder (3.2.4)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    database_cleaner (2.0.2)
+    database_cleaner (2.1.0)
       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)
-    drb (2.1.1)
-      ruby2_keywords
-    i18n (1.14.1)
+    date (3.4.1)
+    drb (2.2.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
+    logger (1.6.4)
     m (1.6.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    minitest-reporters (1.6.1)
+    method_source (1.1.0)
+    minitest (5.25.4)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mutex_m (0.1.2)
-    mysql2 (0.5.5)
-    pg (1.5.4)
-    pry (0.14.2)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.1.1.1)
+    psych (5.2.2)
+      date
       stringio
-    rack (3.0.8)
-    rake (13.0.6)
-    rdoc (6.5.0)
+    rack (3.1.8)
+    rake (13.2.1)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
-    request_store (1.5.1)
+    request_store (1.7.0)
       rack (>= 1.4)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    sqlite3 (1.6.7-arm64-darwin)
-    stringio (3.0.8)
-    thor (1.3.0)
-    timeout (0.4.0)
+    securerandom (0.4.1)
+    stringio (3.1.2)
+    thor (1.3.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.2)
 
 PLATFORMS
-  arm64-darwin-22
+  ruby
+  x86_64-linux
 
 DEPENDENCIES
   appraisal
@@ -89,12 +94,9 @@ DEPENDENCIES
   m
   minitest
   minitest-reporters
-  mysql2
-  pg
   pry
   rake
   rdoc
-  sqlite3
 
 BUNDLED WITH
-   2.4.17
+   2.5.22

data/README.md

@@ -19,48 +19,38 @@ Globalize is not very actively maintained. Pull Requests are welcome, especially
 
 ## Requirements
 
-* ActiveRecord >= 4.2.0 (see below for installation with ActiveRecord 3.x)
+* ActiveRecord >= 7.0 (see below for installation with older ActiveRecord)
 * I18n
 
 ## Installation
 
-To install the ActiveRecord 4.2.x compatible version of Globalize with its default setup, just use:
+To install the ActiveRecord 7.x compatible version of Globalize with its default setup, just use:
 
 ```ruby
 gem install globalize
 ```
 
-When using bundler put this in your Gemfile:
+When using Bundler, put this in your Gemfile:
 
 ```ruby
-gem 'globalize', '~> 5.3.0'
+gem "globalize", "~> 7.0"
 ```
 
-Please help us by letting us know what works, and what doesn't, when using pre-release code.
-
-Put in your Gemfile
+Please help us by letting us know what works, and what doesn't, when using pre-release code. To use a pre-release, put this in your Gemfile:
 
 ```ruby
-gem 'globalize', git: 'https://github.com/globalize/globalize'
-gem 'activemodel-serializers-xml'
+gem "globalize", git: "https://github.com/globalize/globalize", branch: "main"
 ```
 
-To use the version of globalize for ActiveRecord 4.0 or 4.1, specify:
+## Older ActiveRecord
+* Use Version 6.3 or lower
+
+ActiveRecord 4.2 to 6.1:
 
 ```ruby
-gem 'globalize', '~> 4.0.3'
+gem "globalize", "~> 6.3"
 ```
 
-To use the version of globalize for ActiveRecord 3.1 or 3.2, specify:
-
-````ruby
-gem 'globalize', '~> 3.1.0'
-````
-
-(If you are using ActiveRecord 3.0, use version 3.0: `gem 'globalize', '3.0.4'`.)
-
-The [`3-1-stable` branch](https://github.com/globalize/globalize/tree/3-1-stable) of this repository corresponds to the latest ActiveRecord 3 version of globalize. Note that `globalize3` has been deprecated and you are encouraged to update your Gemfile accordingly.
-
 ## Model translations
 
 Model translations allow you to translate your models' attribute values. E.g.
@@ -84,7 +74,7 @@ post.title # => גלובאלייז2 שולט!
 You can also set translations with mass-assignment by specifying the locale:
 
 ```ruby
-post.attributes = { title: 'גלובאלייז2 שולט!', locale: :he }
+post.attributes = { title: "גלובאלייז2 שולט!", locale: :he }
 ```
 
 In order to make this work, you'll need to add the appropriate translation tables.
@@ -131,7 +121,7 @@ class CreatePosts < ActiveRecord::Migration
     reversible do |dir|
       dir.up do
         Post.create_translation_table! :title => :string,
-          :text => {:type => :text, :null => false, :default => 'abc'}
+          :text => {:type => :text, :null => false, :default => "abc"}
       end
 
       dir.down do
@@ -294,15 +284,15 @@ end
 
 puts post.translations.inspect
 # => [#<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize rocks!", name: "Globalize">,
-      #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>]
+      #<Post::Translation id: 2, post_id: 1, locale: "nl", title: "", name: nil>]
 
 I18n.locale = :en
-post.title # => 'Globalize rocks!'
-post.name  # => 'Globalize'
+post.title # => "Globalize rocks!"
+post.name  # => "Globalize"
 
 I18n.locale = :nl
-post.title # => ''
-post.name  # => 'Globalize'
+post.title # => ""
+post.name  # => "Globalize"
 ```
 
 ```ruby
@@ -312,15 +302,15 @@ end
 
 puts post.translations.inspect
 # => [#<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize rocks!", name: "Globalize">,
-      #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>]
+      #<Post::Translation id: 2, post_id: 1, locale: "nl", title: "", name: nil>]
 
 I18n.locale = :en
-post.title # => 'Globalize rocks!'
-post.name  # => 'Globalize'
+post.title # => "Globalize rocks!"
+post.name  # => "Globalize"
 
 I18n.locale = :nl
-post.title # => 'Globalize rocks!'
-post.name  # => 'Globalize'
+post.title # => "Globalize rocks!"
+post.name  # => "Globalize"
 ```
 
 ## Fallback locales to each other
@@ -335,15 +325,15 @@ end
 Globalize.fallbacks = {:en => [:en, :pl], :pl => [:pl, :en]}
 
 I18n.locale = :en
-en_post = Post.create(:title => 'en_title')
+en_post = Post.create(:title => "en_title")
 
 I18n.locale = :pl
-pl_post = Post.create(:title => 'pl_title')
-en_post.title # => 'en_title'
+pl_post = Post.create(:title => "pl_title")
+en_post.title # => "en_title"
 
 I18n.locale = :en
-en_post.title # => 'en_title'
-pl_post.title # => 'pl_title'
+en_post.title # => "en_title"
+pl_post.title # => "pl_title"
 ```
 
 
@@ -354,19 +344,19 @@ the `with_translations` scope. This will only return records that have a
 translations for the passed in locale.
 
 ```ruby
-Post.with_translations('en')
+Post.with_translations("en")
 # => [
   #<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize rocks!", name: "Globalize">,
-  #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>
+  #<Post::Translation id: 2, post_id: 1, locale: "nl", title: "", name: nil>
 ]
 
 Post.with_translations(I18n.locale)
 # => [
   #<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize rocks!", name: "Globalize">,
-  #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>
+  #<Post::Translation id: 2, post_id: 1, locale: "nl", title: "", name: nil>
 ]
 
-Post.with_translations('de')
+Post.with_translations("de")
 # => []
 ```
 
@@ -401,7 +391,7 @@ post.title
 post.title(:foo => "bar")
 # SomeError: missing interpolation argument :superlative
 
-post.title(:superlative => "rocks")
+post.title(:superlative => 'rocks")
 # #=> "Globalize rocks!"
 ```
 
@@ -413,16 +403,16 @@ One of the possible ways to implement it:
 ```ruby
 # inside translated model
 def cache_key
-  super + '-' + Globalize.locale.to_s
+  [super, Globalize.locale.to_s].join("-")
 end
 ```
 
 ## Thread-safety
 
 Globalize uses [request_store](https://github.com/steveklabnik/request_store) gem to clean up thread-global variable after every request.
-RequestStore includes a Railtie that will configure everything properly for Rails 3+ apps.
+RequestStore includes a Railtie that will configure everything properly.
 
-If you're not using Rails, you may need to consult a RequestStore's [README](https://github.com/steveklabnik/request_store#no-rails-no-problem) to configure it.
+If you're not using Rails, you may need to consult RequestStore's [README](https://github.com/steveklabnik/request_store#no-rails-no-problem) to configure it.
 
 ## Tutorials and articles
 * [Go Global with Rails and I18n](http://www.sitepoint.com/go-global-rails-i18n/) - introductory article about i18n in Rails (Ilya Bodrov)
@@ -430,7 +420,7 @@ If you're not using Rails, you may need to consult a RequestStore's [README](htt
 ## Official Globalize extensions
 
 * [globalize-accessors](https://github.com/globalize/globalize-accessors) - generator of accessor methods for models. *(e.g. title_en, title_cz)*
-* [globalize-versioning](https://github.com/globalize/globalize-versioning) - versioning support for using Globalize with [`paper_trail`](https://github.com/airblade/paper_trail). (compatible with Globalize 3.x and 4.x)
+* [globalize-versioning](https://github.com/globalize/globalize-versioning) - versioning support for using Globalize with [`paper_trail`](https://github.com/airblade/paper_trail).
 
 ## Alternative solutions
 

data/Rakefile

@@ -1,24 +1,27 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
+# frozen_string_literal: true
 
-desc 'Default: run unit tests.'
+require "bundler/gem_helper"
+require "rake"
+require "rake/testtask"
+require "rdoc/task"
+
+desc "Default: run unit tests."
 task :default => :test
 
-desc 'Run all tests.'
+desc "Run all tests."
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
 end
 
-desc 'Generate documentation.'
+desc "Generate documentation."
 Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Globalize'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "Globalize"
+  rdoc.options << "--line-numbers" << "--inline-source"
+  rdoc.rdoc_files.include("README")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 task :load_path do
@@ -28,23 +31,23 @@ task :load_path do
 end
 
 namespace :db do
-  desc 'Create the database'
+  desc "Create the database"
   task :create => :load_path do
-    require 'support/database'
+    require "support/database"
 
     Globalize::Test::Database.create!
   end
 
   desc "Drop the database"
   task :drop => :load_path do
-    require 'support/database'
+    require "support/database"
 
     Globalize::Test::Database.drop!
   end
 
   desc "Set up the database schema"
   task :migrate => :load_path do
-    require 'support/database'
+    require "support/database"
 
     Globalize::Test::Database.migrate!
     # ActiveRecord::Schema.migrate :up
@@ -53,3 +56,5 @@ namespace :db do
   desc "Drop and recreate the database schema"
   task :reset => [:drop, :create]
 end
+
+Bundler::GemHelper.install_tasks(name: "globalize")

data/lib/globalize/active_record/act_macro.rb

@@ -5,7 +5,6 @@ module Globalize
         options = attr_names.extract_options!
         # Bypass setup_translates! if the initial bootstrapping is done already.
         setup_translates!(options) unless translates?
-        check_columns!(attr_names)
 
         # Add any extra translatable attributes.
         attr_names = attr_names.map(&:to_sym)
@@ -41,31 +40,21 @@ module Globalize
         end
 
         begin
-          if Globalize.rails_5? && database_connection_possible?
-            self.ignored_columns += translated_attribute_names.map(&:to_s)
-            reset_column_information
+          if database_connection_possible?
+            translated_attribute_name_strings = translated_attribute_names.map(&:to_s)
+            # Only ignore columns if they exist.  This allows queries to remain as .*
+            # instead of using explicit column names
+            attributes_that_exist = column_names & translated_attribute_name_strings
+            if attributes_that_exist.any?
+              self.ignored_columns += attributes_that_exist
+              reset_column_information
+            end
           end
         rescue ::ActiveRecord::NoDatabaseError
           warn 'Unable to connect to a database. Globalize skipped ignoring columns of translated attributes.'
         end
       end
 
-      def check_columns!(attr_names)
-        # If tables do not exist or Rails version is greater than 5, do not warn about conflicting columns
-        return unless Globalize.rails_42? && database_connection_possible?
-
-        if (overlap = attr_names.map(&:to_s) & column_names).present?
-          ActiveSupport::Deprecation.warn(
-            ["You have defined one or more translated attributes with names that conflict with column(s) on the model table. ",
-             "Globalize does not support this configuration anymore, remove or rename column(s) on the model table.\n",
-             "Model name (table name): #{model_name} (#{table_name})\n",
-             "Attribute name(s): #{overlap.join(', ')}\n"].join
-          )
-        end
-      rescue ::ActiveRecord::NoDatabaseError
-        warn 'Unable to connect to a database. Globalize skipped checking attributes with conflicting column names.'
-      end
-
       def apply_globalize_options(options)
         options[:table_name] ||= "#{table_name.singularize}_translations"
         options[:foreign_key] ||= class_name.foreign_key
@@ -79,7 +68,16 @@ module Globalize
 
       def enable_serializable_attribute(attr_name)
         serializer = self.globalize_serialized_attributes[attr_name]
-        if serializer.present?
+        return unless serializer
+
+        if Globalize.rails_7_1?
+          if serializer.is_a?(Array)
+            # this is only needed for ACTIVE_RECORD_71. Rails 7.2 will only accept KW arguments
+            translation_class.send :serialize, attr_name, serializer[0], **serializer[1]
+          else
+            translation_class.send :serialize, attr_name, **serializer
+          end
+        else
           if defined?(::ActiveRecord::Coders::YAMLColumn) &&
             serializer.is_a?(::ActiveRecord::Coders::YAMLColumn)
             serializer = serializer.object_class
@@ -99,7 +97,7 @@ module Globalize
 
         has_many :translations, :class_name  => translation_class.name,
                                 :foreign_key => options[:foreign_key],
-                                :dependent   => :destroy,
+                                :dependent   => options.fetch(:dependent, :destroy),
                                 :extend      => HasManyExtensions,
                                 :autosave    => options[:autosave],
                                 :inverse_of  => :globalized_model

data/lib/globalize/active_record/adapter_dirty.rb

@@ -41,17 +41,8 @@ module Globalize
         self.dirty = {}
       end
 
-      if Globalize.rails_6?
-        def _reset_attribute name
-          record.send(:clear_attribute_changes, [name])
-        end
-      else
-        def _reset_attribute name
-          original_value = record.changed_attributes[name]
-          record.send(:clear_attribute_changes, [name])
-          record.send("#{name}=", original_value)
-          record.send(:clear_attribute_changes, [name])
-        end
+      def _reset_attribute name
+        record.send(:clear_attribute_changes, [name])
       end
 
       def reset

data/lib/globalize/active_record/class_methods.rb

@@ -3,12 +3,6 @@ module Globalize
     module ClassMethods
       delegate :translated_locales, :set_translations_table_name, :to => :translation_class
 
-      if Globalize.rails_42?
-        def columns_hash
-          super.except(*translated_attribute_names.map(&:to_s))
-        end
-      end
-
       def with_locales(*locales)
         all.merge translation_class.with_locales(*locales)
       end
@@ -120,7 +114,7 @@ module Globalize
       end
 
       def define_translations_accessor(name)
-        attribute(name, ::ActiveRecord::Type::Value.new) if Globalize.rails_5?
+        attribute(name, ::ActiveRecord::Type::Value.new)
         define_translations_reader(name)
         define_translations_writer(name)
       end
@@ -128,7 +122,12 @@ module Globalize
       def database_connection_possible?
         begin
           # Without a connection tentative, the `connected?` function can responds with a false negative
-          ::ActiveRecord::Base.connection
+          if Globalize.rails_7_2?
+            connection = ::ActiveRecord::Base.lease_connection
+            connection.connect!
+          else
+            ::ActiveRecord::Base.connection
+          end
         rescue
           # Ignore connection fail because in docker build hasn't a database connection
           nil