globalize 6.0.0.alpha.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb12d7f3b6c17018cefe1614dfba6b585ba169ef2ca412b58d230ccabf778033
-  data.tar.gz: ac44f2e8a75b53ad116b8674d1f5c3d47a122c9782133e3853359217fb944375
+  metadata.gz: 70e3196446a295412903e65b76e6a1d834904abb732a7692232936fa782f4a9a
+  data.tar.gz: 672eddfec21d2d7205d36bbbe176f646f84511c51a5508056cea828d2d8f2751
 SHA512:
-  metadata.gz: 2f358f026bc47645ae8751cb3b2a3a7660cfbbb64c6c37e2ab2b46a9b548de357ba0e8a8880eb82326ce78c6e7605c31fbf27726d645b33baa62c594bace13b5
-  data.tar.gz: 185fbeea91d8fda53c23232897deba40ad149fbea99c329a32aa8d9bbd7c296c4b9a5a814ced76d39785969d8503011f9316bc600a07de7e82b1a03fe0c3a76a
+  metadata.gz: 90f9f98183c545e5f255dd57b48367f6e7b1bba0bde85962c7613e8957086e16757432b56f84acaea36dcbd222ca07d2b0188278bebea7d065ccdb80a052ff22
+  data.tar.gz: e6a718305ce3fd62835ceed0fefdadf4cb19b2e9499a7955acf19763f655b406b468e951f22e6d15edc147ec22906ec17d3792b66fd5bff8eef3ab17071907a3

data/Appraisals

@@ -1,19 +1,35 @@
 # frozen_string_literal: true
 
 RAILS_VERSIONS = %w[
-  4.2.10
-  5.1.6
-  5.2.1
+  4.2.11.3
+  5.1.7
+  5.2.5
+  6.0.3.6
+  6.1.3.1
+  7.0.0
 ]
 
 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
 
-    platforms :rbx do
-      gem "rubysl", "~> 2.0"
-      gem "rubinius-developer_tools"
+    if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
+      group :postgres, :postgresql do
+        if version =~ /^4/
+          gem 'pg', '< 1.0', platforms: [:ruby, :rbx]
+        else
+          gem 'pg', '~> 1.1', platforms: [:ruby, :rbx]
+        end
+      end
     end
 
     platforms :jruby do

data/CHANGELOG.md

@@ -1,9 +1,19 @@
 # Globalize Changelog
 
-## Unreleased
+## 6.0.1 (2021-06-23)
+
+* Fix errors with Rails 6.1 and Ruby 3.0 [#778](https://github.com/globalize/globalize/pull/778) by [Andrew White](https://github.com/pixeltrix)
+* Track `saved_changes` for Rails 5.1 and above [#780](https://github.com/globalize/globalize/pull/780) by [Peter Postma](https://github.com/ppostma)
+
+## 6.0.0 (2021-01-11)
 
 * Add `create_source_columns` option for migrations. [#715](https://github.com/globalize/globalize/pull/715) by [IlyasValiullov](https://github.com/IlyasValiullov)
-* Autosave is now configurable, but defaults to false. [#736](https://github.com/globalize/globalize/pull/736) by [James Hart](https://github.com/hjhart) 
+* Autosave is now configurable, but defaults to false. [#736](https://github.com/globalize/globalize/pull/736) by [James Hart](https://github.com/hjhart)
+* Fix foreign keys translation. [#769](https://github.com/globalize/globalize/pull/769) by [Sergey Tokarenko](https://github.com/stokarenko)
+
+## 5.3.1 (2021-01-11)
+
+* Fix foreign keys translation. [#773](https://github.com/globalize/globalize/pull/773) by [Sergey Tokarenko](https://github.com/stokarenko)
 
 ## 5.3.0 (2019-05-14)
 

data/Gemfile

@@ -15,6 +15,6 @@ end
 
 if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
   group :postgres, :postgresql do
-    gem 'pg', '< 1.0', platforms: [:ruby, :rbx]
+    gem 'pg', platforms: [:ruby, :rbx]
   end
 end

data/Gemfile.lock

@@ -1,66 +1,96 @@
 PATH
   remote: .
   specs:
-    globalize (5.3.0)
-      activemodel (>= 4.2, < 6.1)
-      activerecord (>= 4.2, < 6.1)
+    globalize (6.0.1)
+      activemodel (>= 4.2, < 7.0)
+      activerecord (>= 4.2, < 7.0)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
+    ast (2.4.2)
     builder (3.2.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    database_cleaner (1.8.2)
-    i18n (1.8.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    m (1.5.1)
+    m (1.6.0)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
-    method_source (0.9.2)
-    minitest (5.14.0)
-    minitest-reporters (1.4.2)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    minitest-reporters (1.4.3)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mysql2 (0.5.3)
-    pg (0.21.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.2.2)
-    rake (13.0.1)
-    rdoc (6.2.1)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    rdoc (6.3.2)
+    regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
-    ruby-progressbar (1.10.1)
+    rexml (3.2.5)
+    rubocop (1.20.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    standard (1.3.0)
+      rubocop (= 1.20.0)
+      rubocop-performance (= 1.11.5)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  arm64-darwin-20
+  arm64-darwin-21
 
 DEPENDENCIES
   appraisal
@@ -70,11 +100,12 @@ DEPENDENCIES
   minitest
   minitest-reporters
   mysql2
-  pg (< 1.0)
+  pg
   pry
   rake
   rdoc
   sqlite3
+  standard
 
 BUNDLED WITH
-   2.1.4
+   2.2.28

data/README.md

@@ -12,6 +12,11 @@ to add model translations to ActiveRecord models.
 
 In other words, a way to translate actual user-generated content, for example; a single blog post with multiple translations.
 
+## Current state of the gem
+
+Globalize is not very actively maintained. Pull Requests are welcome, especially for compatibility with new versions of Rails, but none of the maintainers actively use Globalize anymore. If you need a more actively maintained model translation gem, we recommend checking out [Mobility](https://github.com/shioyama/mobility), a natural successor of Globalize created by Chris Salzberg (one of Globalize maintainers) and inspired by the ideas discussed around Globalize. For a more up-to-date discussion of the current situation, see [issue #753](https://github.com/globalize/globalize/issues/753).
+
+
 ## Requirements
 
 * ActiveRecord >= 4.2.0 (see below for installation with ActiveRecord 3.x)

data/docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3.7'
+services:
+  postgres:
+    image: postgres:11
+    volumes:
+      - ./tmp/postgres:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: ""
+  mysql:
+    image: mysql:8.0
+    volumes:
+      - ./tmp/mysql:/var/lib/mysql
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_USER: "root"
+      MYSQL_PASSWORD: ""
+      MYSQL_ROOT_PASSWORD: ""
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"

data/globalize.gemspec

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'lib/globalize/version'
+
+Gem::Specification.new do |s|
+  s.name         = 'globalize'
+  s.version      = Globalize::Version
+  s.authors      = ['Sven Fuchs', 'Joshua Harvey', 'Clemens Kofler', 'John-Paul Bader', 'Tomasz Stachewicz', 'Philip Arndt', 'Chris Salzberg']
+  s.email        = 'nobody@globalize-rails.org'
+  s.homepage     = 'http://github.com/globalize/globalize'
+  s.summary      = 'Rails I18n de-facto standard library for ActiveRecord model/data translation'
+  s.description  = "#{s.summary}."
+  s.license      = "MIT"
+
+  s.files        = Dir['{lib/**/*,[A-Z]*}']
+  s.platform     = Gem::Platform::RUBY
+  s.require_path = 'lib'
+  s.required_ruby_version = '>= 2.4.6'
+
+  s.add_dependency 'activerecord', '>= 4.2', '< 7.1'
+  s.add_dependency 'activemodel', '>= 4.2', '< 7.1'
+  s.add_dependency 'request_store', '~> 1.0'
+
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'm'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
+
+  s.cert_chain = [File.expand_path('certs/parndt.pem', __dir__)]
+  if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  end
+end

data/issue_template.rb

@@ -0,0 +1,38 @@
+# Activate the gem you are reporting the issue against.
+gem 'activerecord', '4.2.0'
+gem 'globalize', '5.0.1'
+require 'active_record'
+require 'globalize'
+require 'minitest/autorun'
+require 'logger'
+
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+# This connection will do for database-independent bug reports.
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+ActiveRecord::Schema.define do
+  create_table :posts, force: true do |t|
+  end
+
+  create_table :post_translations, force: true do |t|
+    t.references :post
+    t.string     :title
+    t.text       :content
+    t.string     :locale
+  end
+end
+
+class Post < ActiveRecord::Base
+  translates :content, :title
+end
+
+class BugTest < Minitest::Test
+  def test_association_stuff
+    post = Post.create!(title: 'HI')
+
+    assert_equal 'HI', post.title
+  end
+end

data/lib/globalize/active_record/act_macro.rb

@@ -41,7 +41,7 @@ module Globalize
         end
 
         begin
-          if ::ActiveRecord::VERSION::STRING > "5.0" && table_exists? && translation_class.table_exists?
+          if Globalize.rails_5? && table_exists? && translation_class.table_exists?
             self.ignored_columns += translated_attribute_names.map(&:to_s)
             reset_column_information
           end
@@ -52,7 +52,7 @@ module Globalize
 
       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 ::ActiveRecord::VERSION::STRING < "5.0" && table_exists? && translation_class.table_exists?
+        return unless Globalize.rails_42? && table_exists? && translation_class.table_exists?
         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. ",

data/lib/globalize/active_record/adapter_dirty.rb

@@ -41,11 +41,17 @@ module Globalize
         self.dirty = {}
       end
 
-      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])
+      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
       end
 
       def reset
@@ -53,6 +59,30 @@ module Globalize
         super
       end
 
+      def changed_attributes(locale)
+        Hash[changes(locale).map { |name, change| [name, change.first] }]
+      end
+
+      def changed
+        stash.keys.flat_map { |locale| changes(locale).keys }.uniq
+      end
+
+      def changes(locale)
+        stash[locale].keys.inject({}) do |hash, name|
+          next hash unless dirty[name].is_a?(Hash)
+          next hash unless dirty[name].key?(locale)
+
+          new_value = stash[locale][name]
+          old_value = dirty[name][locale]
+
+          unless new_value == old_value
+            hash[name] = [old_value, new_value]
+          end
+
+          hash
+        end
+      end
+
     end
   end
 end

data/lib/globalize/active_record/class_methods.rb

@@ -3,7 +3,7 @@ module Globalize
     module ClassMethods
       delegate :translated_locales, :set_translations_table_name, :to => :translation_class
 
-      if ::ActiveRecord::VERSION::STRING < "5.0.0"
+      if Globalize.rails_42?
         def columns_hash
           super.except(*translated_attribute_names.map(&:to_s))
         end
@@ -120,7 +120,7 @@ module Globalize
       end
 
       def define_translations_accessor(name)
-        attribute(name, ::ActiveRecord::Type::Value.new) if ::ActiveRecord::VERSION::STRING >= "5.0"
+        attribute(name, ::ActiveRecord::Type::Value.new) if Globalize.rails_5?
         define_translations_reader(name)
         define_translations_writer(name)
       end

data/lib/globalize/active_record/instance_methods.rb

@@ -66,7 +66,7 @@ module Globalize
       end
 
       def _read_attribute(attr_name, options = {}, &block)
-        translated_value = read_translated_attribute(attr_name, options, &block)
+        translated_value = read_translated_attribute(attr_name, options)
         translated_value.nil? ? super(attr_name, &block) : translated_value
       end
 
@@ -158,17 +158,34 @@ module Globalize
         Globalize.fallbacks(locale)
       end
 
-      def save(*)
-        result = Globalize.with_locale(translation.locale || I18n.default_locale) do
-          without_fallbacks do
-            super
+      if Globalize.ruby_27?
+        class_eval <<~RUBY, __FILE__, __LINE__ + 1
+          def save(...)
+            result = Globalize.with_locale(translation.locale || I18n.default_locale) do
+              without_fallbacks do
+                super
+              end
+            end
+            if result
+              globalize.clear_dirty
+            end
+
+            result
+          end
+        RUBY
+      else
+        def save(*)
+          result = Globalize.with_locale(translation.locale || I18n.default_locale) do
+            without_fallbacks do
+              super
+            end
+          end
+          if result
+            globalize.clear_dirty
           end
-        end
-        if result
-          globalize.clear_dirty
-        end
 
-        result
+          result
+        end
       end
 
       def column_for_attribute name
@@ -185,6 +202,32 @@ module Globalize
         changed_attributes.present? || translations.any?(&:changed?)
       end
 
+      if Globalize.rails_51?
+        def saved_changes
+          super.tap do |changes|
+            translation = translation_for(::Globalize.locale, false)
+            if translation
+              translation_changes = translation.saved_changes.select { |name| translated?(name) }
+              changes.merge!(translation_changes) if translation_changes.any?
+            end
+          end
+        end
+      end
+
+      if Globalize.rails_6?
+        def changed_attributes
+          super.merge(globalize.changed_attributes(::Globalize.locale))
+        end
+
+        def changes
+          super.merge(globalize.changes(::Globalize.locale))
+        end
+
+        def changed
+          super.concat(globalize.changed).uniq
+        end
+      end
+
       # need to access instance variable directly since changed_attributes
       # is frozen as of Rails 4.2
       def original_changed_attributes
@@ -236,10 +279,7 @@ module Globalize
         return nil unless options[:translated]
         return nil unless translated?(name)
 
-        value = globalize.fetch(options[:locale] || Globalize.locale, name)
-        return nil if value.nil?
-
-        block_given? ? yield(value) : value
+        globalize.fetch(options[:locale] || Globalize.locale, name)
       end
     end
   end

data/lib/globalize/active_record/migration.rb

@@ -89,13 +89,27 @@ module Globalize
           end
         end
 
-        def add_translation_fields
-          connection.change_table(translations_table_name) do |t|
-            fields.each do |name, options|
-              if options.is_a? Hash
-                t.column name, options.delete(:type), options
-              else
-                t.column name, options
+        if Globalize.rails_6?
+          def add_translation_fields
+            connection.change_table(translations_table_name) do |t|
+              fields.each do |name, options|
+                if options.is_a? Hash
+                  t.column name, options.delete(:type), **options
+                else
+                  t.column name, options
+                end
+              end
+            end
+          end
+        else
+          def add_translation_fields
+            connection.change_table(translations_table_name) do |t|
+              fields.each do |name, options|
+                if options.is_a? Hash
+                  t.column name, options.delete(:type), options
+                else
+                  t.column name, options
+                end
               end
             end
           end
@@ -155,6 +169,8 @@ module Globalize
             # Create a hash containing the translated column names and their values.
             translated_attribute_names.inject(fields_to_update={}) do |f, name|
               f.update({name.to_sym => translated_record[name.to_s]})
+              # Remove attributes that will no longer be translated
+              translated_attribute_names.delete(name)
             end
 
             # Now, update the actual model's record with the hash.

data/lib/globalize/active_record/translated_attributes_query.rb

@@ -99,7 +99,7 @@ module Globalize
         end
       end
 
-      if ::ActiveRecord::VERSION::STRING < "5.0.0"
+      if Globalize.rails_42?
         def where_values_hash(*args)
           return super unless respond_to?(:translations_table_name)
           equalities = respond_to?(:with_default_scope) ? with_default_scope.where_values : where_values

data/lib/globalize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Globalize
-  Version = '6.0.0.alpha.1'
+  Version = '6.1.0'
 end

data/lib/globalize.rb

@@ -6,11 +6,21 @@ require 'patches/active_record/relation'
 require 'patches/active_record/serialization'
 require 'patches/active_record/uniqueness_validator'
 require 'patches/active_record/persistence'
+require 'patches/active_support/inflections'
 
 module Globalize
   autoload :ActiveRecord, 'globalize/active_record'
   autoload :Interpolation,   'globalize/interpolation'
 
+  ACTIVE_RECORD_50 = Gem::Version.new('5.0.0')
+  ACTIVE_RECORD_51 = Gem::Version.new('5.1.0')
+  ACTIVE_RECORD_52 = Gem::Version.new('5.2.0')
+  ACTIVE_RECORD_60 = Gem::Version.new('6.0.0')
+  ACTIVE_RECORD_61 = Gem::Version.new('6.1.0')
+
+  CURRENT_RUBY     = Gem::Version.new(RUBY_VERSION)
+  RUBY_VERSION_27  = Gem::Version.new('2.7.0')
+
   class << self
     def locale
       read_locale || I18n.locale
@@ -58,12 +68,32 @@ module Globalize
       RequestStore.store
     end
 
+    def ruby_27?
+      CURRENT_RUBY >= RUBY_VERSION_27
+    end
+
+    def rails_42?
+      ::ActiveRecord.version < ACTIVE_RECORD_50
+    end
+
     def rails_5?
-      ::ActiveRecord.version >= Gem::Version.new('5.1.0')
+      ::ActiveRecord.version >= ACTIVE_RECORD_50
+    end
+
+    def rails_51?
+      ::ActiveRecord.version >= ACTIVE_RECORD_51
     end
 
     def rails_52?
-      ::ActiveRecord.version >= Gem::Version.new('5.2.0')
+      ::ActiveRecord.version >= ACTIVE_RECORD_52
+    end
+
+    def rails_6?
+      ::ActiveRecord.version >= ACTIVE_RECORD_60
+    end
+
+    def rails_61?
+      ::ActiveRecord.version >= ACTIVE_RECORD_61
     end
 
   protected

data/lib/patches/active_record/query_method.rb

@@ -1,3 +1,3 @@
-if ::ActiveRecord::VERSION::STRING < "5.0.0"
+if ::ActiveRecord.version < Gem::Version.new("5.0.0")
   require_relative 'rails4/query_method'
-end
+end

data/lib/patches/active_record/rails6_1/uniqueness_validator.rb

@@ -0,0 +1,45 @@
+module Globalize
+  module Validations
+    module UniquenessValidator
+      def validate_each(record, attribute, value)
+        klass = record.class
+        if klass.translates? && klass.translated?(attribute)
+          finder_class = klass.translation_class
+          relation = build_relation(finder_class, attribute, value).where(locale: Globalize.locale)
+          relation = relation.where.not(klass.reflect_on_association(:translations).foreign_key => record.send(:id)) if record.persisted?
+
+
+          translated_scopes = Array(options[:scope]) & klass.translated_attribute_names
+          untranslated_scopes = Array(options[:scope]) - translated_scopes
+
+          relation = relation.joins(:globalized_model) if untranslated_scopes.present?
+          untranslated_scopes.each do |scope_item|
+            scope_value = record.send(scope_item)
+            reflection = klass.reflect_on_association(scope_item)
+            if reflection
+              scope_value = record.send(reflection.foreign_key)
+              scope_item = reflection.foreign_key
+            end
+            relation = relation.where(find_finder_class_for(record).table_name => { scope_item => scope_value })
+          end
+
+          translated_scopes.each do |scope_item|
+            scope_value = record.send(scope_item)
+            relation = relation.where(scope_item => scope_value)
+          end
+          relation = relation.merge(options[:conditions]) if options[:conditions]
+
+          if relation.exists?
+            error_options = options.except(:case_sensitive, :scope, :conditions)
+            error_options[:value] = value
+            record.errors.add(attribute, :taken, **error_options)
+          end
+        else
+          super(record, attribute, value)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Validations::UniquenessValidator.prepend Globalize::Validations::UniquenessValidator

data/lib/patches/active_record/relation.rb

@@ -1,12 +1,19 @@
-if ::ActiveRecord::VERSION::STRING >= "5.0.0"
+if ::ActiveRecord.version >= Gem::Version.new("5.0.0")
   module Globalize
     module Relation
       def where_values_hash(relation_table_name = table_name)
         return super unless respond_to?(:translations_table_name)
         super.merge(super(translations_table_name))
       end
+
+      if ::ActiveRecord.version >= Gem::Version.new("6.1.3")
+        def scope_for_create
+          return super unless respond_to?(:translations_table_name)
+          super.merge(where_values_hash(translations_table_name))
+        end
+      end
     end
   end
 
   ActiveRecord::Relation.prepend Globalize::Relation
-end
+end

data/lib/patches/active_record/serialization.rb

@@ -1,5 +1,5 @@
-if ::ActiveRecord::VERSION::STRING < "5.1.0"
+if ::ActiveRecord.version < Gem::Version.new("5.1.0")
   require_relative 'rails4/serialization'
 else
   require_relative 'rails5_1/serialization'
-end
+end

data/lib/patches/active_record/uniqueness_validator.rb

@@ -1,7 +1,9 @@
-if ::ActiveRecord::VERSION::STRING < "5.0.0"
+if ::ActiveRecord.version < Gem::Version.new("5.0.0")
   require_relative 'rails4/uniqueness_validator'
-elsif ::ActiveRecord::VERSION::STRING < "5.1.0"
+elsif ::ActiveRecord.version < Gem::Version.new("5.1.0")
   require_relative 'rails5/uniqueness_validator'
-else
+elsif ::ActiveRecord.version < Gem::Version.new("6.1.0")
   require_relative 'rails5_1/uniqueness_validator'
-end
+else
+  require_relative 'rails6_1/uniqueness_validator'
+end

data/lib/patches/active_support/inflections.rb

@@ -0,0 +1,14 @@
+if ::ActiveSupport.version >= Gem::Version.new("7.0.0")
+  module Globalize
+    module Inflections
+      def instance_or_fallback(locale)
+        I18n.respond_to?(:fallbacks) && I18n.fallbacks[locale].each do |k|
+          return @__instance__[k] if @__instance__.key?(k)
+        end
+        instance(locale)
+      end
+    end
+  end
+
+  ActiveSupport::Inflector::Inflections.singleton_class.send :prepend, Globalize::Inflections
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -11,10 +11,36 @@ authors:
 - Tomasz Stachewicz
 - Philip Arndt
 - Chris Salzberg
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
+  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjEwNjIzMDkyNzU2WhcNMjIwNjIzMDky
+  NzU2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQD0CYnD37uLlJ3Urla2EnnUQ8S6s16k
+  AGMpAzpmARo8YwSqtYMJVGyBzUeI7y93Fk9ncswhIFSH/hnh/Ouat/ki9flHlZ+w
+  anv0M+9v3wCLyZSC5BQIWpoduFM/fuvLoDUJDWxL50RjwMS0qo2x2LvfQdHN8gn3
+  JdSIV5WLJKIvlmIl9S3pw0JO5KRUGn1PcBO7C0S0SlbhVjRHtlao1ycWUULsX109
+  hCh39MPGtnZpdCcxheh0TH/UA/jV0/du9/rQdoidkNHkaC24pPfBJ3nS+rAbWaHP
+  WmP+0rjfk/XnGBu/HZpKvlnwQjP3QdK4UMtWl8zewqFMNcIiBRALQugnL/SfrP/4
+  CSlha9LwkiE6ByeY4WGnNjNqpi5J3IzjEkZRAxG7u9gCB3FzTaBTyXZYI6jplYNw
+  TcCJIBHuoPaa+m9brpjb3Uv94nfM97ZP+OmpGYCCAMq4TT7OOV+t8wJc0w8bb0FO
+  ROhmVNTxrBaNcl6MkZn88EMRCsGgoWklOG0CAwEAAaNxMG8wCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGu7pbmeILyHnBmannuaNRfdN8MsMBoGA1Ud
+  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
+  aW8wDQYJKoZIhvcNAQELBQADggGBANlxc4uAnkPC3zbztG7uZfBfn4HSuvv655Pa
+  UaYZ6hNETFrqg78mGs3PkFe2Ru7cVWwckbmH46aq50QoNnx4ClxT03vr03n76Jg1
+  8WWHkf0+rcINFlbtIFcmcFrois5Ow3n7pH+xstDtzoWcbh41WwuZStNhrIYsnjAK
+  /ovz8D5JlboxceOpVLB/0NiqNEWltK+EMQHmX25Sqf/r5o5rAL9zwEKPFp1Y5X+z
+  t2jBjYt2ymr1eMWxux6e+N2uKZL4MblHawxvKlI8UHsIiV9xrc4BwlwlbitcvNIL
+  ZykdSlpTJd0Guy92iYjCJMC09tMRUNxiVBwD3jRGSeW9YAPIZGXIcVlm6srIRDjJ
+  o8wB6oOvHAkRXnntOo/4bBDH+ehmgvhh/O/mI+au6C0M430fv+ooH0w08LEXLx1k
+  e17ZNASZffbQRP09MH2GZ2AOlkildTX6looWRforZEZi+qamognrozd3MI5QHi1W
+  UAZUzHLrrFu7gnkFvLVpxOUf4ItOkA==
+  -----END CERTIFICATE-----
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +51,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -35,7 +61,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +71,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,7 +81,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +222,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- docker-compose.yml
+- globalize.gemspec
+- issue_template.rb
 - lib/globalize.rb
 - lib/globalize/active_record.rb
 - lib/globalize/active_record/act_macro.rb
@@ -220,15 +249,17 @@ files:
 - lib/patches/active_record/rails5/uniqueness_validator.rb
 - lib/patches/active_record/rails5_1/serialization.rb
 - lib/patches/active_record/rails5_1/uniqueness_validator.rb
+- lib/patches/active_record/rails6_1/uniqueness_validator.rb
 - lib/patches/active_record/relation.rb
 - lib/patches/active_record/serialization.rb
 - lib/patches/active_record/uniqueness_validator.rb
 - lib/patches/active_record/xml_attribute_serializer.rb
+- lib/patches/active_support/inflections.rb
 homepage: http://github.com/globalize/globalize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,12 +270,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []