globalize 5.2.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d470a9030a9901a83b9d3c48080661b10000a20049f598eece0b41727d66dc
-  data.tar.gz: b1ea4e1d1c0210271fede3bf8d7903ac658ace1af1742bf29980139efc555673
+  metadata.gz: 232c58a035dbc34d1e513c552d3d0a52a7b349c414fb8c8126c74bfa94831e5e
+  data.tar.gz: d25bd58906d809849ba3ef3ed393e80c599bab47e2115c25ff9f75e11d1a4c7c
 SHA512:
-  metadata.gz: 70eaedf3edada661ab9495f31ec46544cc950ba4c6ff667c9d6e1bf699cd770de02ffab2783ba29735c39d35d6b92c9ab2b0f8061185a3e1f3469354f82e560a
-  data.tar.gz: 1b255c9f3164165e76650a4b0fbbfbc989f87ec524a9c4bb1e70ea8fd54b3f16811a9c5a42cfe8f38df0d47ca00fd2632a95f0918c58bdb2e24b5c313b5d2508
+  metadata.gz: 5c8d6cb1111dddd8f36e3baf3ec053a4db7f1b76b302694a631e41dcb849506d351dd5c5562e513e864912a129b030ae5cf6a0c6378460e534812a65651a60ea
+  data.tar.gz: 43bafaeac8081685600f7201fb88ae5d2c4195ac0c5d40595d78d846deb578f6255c42c55a8b68aafc18dc76a32c0ac370330ecfc1ae3bc6a0379415edb65309

data/Appraisals

@@ -1,31 +1,46 @@
 # 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
 ]
 
 RAILS_VERSIONS.each do |version|
   appraise "rails_#{version}" do
     gem 'activemodel', version
     gem 'activerecord', version
+    
+    if version =~ /^6/
+      gem 'sqlite3', '~> 1.4', platforms: [:ruby, :rbx]
+    elsif version =~ /^5/
+      gem 'sqlite3', '~> 1.3', '>= 1.3.6', platforms: [:ruby, :rbx]
+    else version =~ /^4/
+      gem 'sqlite3', '~> 1.3.6', 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
-      if !ENV['TRAVIS'] || ENV['DB'] == 'sqlite3'
+      if !ENV['CI'] || ENV['DB'] == 'sqlite3'
         gem 'activerecord-jdbcsqlite3-adapter', '~> 1'
       end
 
-      if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+      if !ENV['CI'] || ENV['DB'] == 'mysql'
         gem 'activerecord-jdbcmysql-adapter', '~> 1'
       end
 
-      if !ENV['TRAVIS'] || %w(postgres postgresql).include?(ENV['DB'])
+      if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
         gem 'activerecord-jdbcpostgresql-adapter', '~> 1'
       end
     end

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Globalize Changelog
 
+## 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)
+* 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)
+
+* Prevent 'SystemStackError: stack level too deep' error on attribute reset. [#722](https://github.com/globalize/globalize/pull/722) by [Reinier de Lange](https://github.com/moiristo)
+* Pass the `:limit` option for the FK column. [#721](https://github.com/globalize/globalize/pull/721) by [Denis Demchenko](https://github.com/lancedikson)
+* Add support for Rails 6.0. [#718](https://github.com/globalize/globalize/pull/718) by [Chrıs Seelus](https://github.com/cseelus)
+* FIX: stop registering the attr for Rails 4.2. [#711](https://github.com/globalize/globalize/pull/711) by [Adam Fernung](https://github.com/akfernun)
+
+## 5.2.0 (2018-11-02)
+
+* Add support for translated attributes to other QueryMethods and Calculations [#707](https://github.com/globalize/globalize/pull/707) by [kreintjes](https://github.com/kreintjes)
+* Fix `read_attribute` for Rails changes. [#709](https://github.com/globalize/globalize/pull/709) by [ota42y](https://github.com/ota42y) and [nabuchi](https://github.com/nabuchi)
+* Support array as an argument of order. [#675](https://github.com/globalize/globalize/pull/675) by [Maicol Bentancor](https://github.com/MaicolBen)
+* `_reset_attribute` bugfix. [#674](https://github.com/globalize/globalize/pull/674) by [ota42y](https://github.com/ota42y)
+* Add support for Rails 5.2 [#678](https://github.com/globalize/globalize/pull/678) by [kevin-jj](https://github.com/kevin-jj)
+* Fix: wrong number of arguments for ActiveRecord 'attribute' method [#671](https://github.com/globalize/globalize/pull/671) by [Evgeny Danilov](https://github.com/jmelkor)
+* Resolve deprecation warning: attribute is not an attribute known to Active Record. [#629](https://github.com/globalize/globalize/pull/629) by [Michael Rüffer](https://github.com/itschn)
+
 ## 5.1.0 (2018-01-15)
 
 * Replaced `after_` callbacks with `before_` callbacks and set `autosave: true` by default. [#341](https://github.com/globalize/globalize/pull/341) by [Andrew Volozhanin](https://github.com/scarfacedeb)

data/CONTRIBUTING.md

@@ -34,7 +34,7 @@ Have a bug fix, code improvement or proposed feature? Do the following:
 
 For pull requests to Rails/ActiveRecord 4 version of Globalize (v3.x), post to the `master` 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, Travis CI will run the [test suite](https://travis-ci.org/globalize/globalize) 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.
+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

@@ -1,3 +1,20 @@
 source 'https://rubygems.org'
 
 gemspec
+
+# Database Configuration
+if !ENV['CI'] || ENV['DB'] == 'sqlite3'
+  gem 'sqlite3', platforms: [:ruby, :rbx]
+end
+
+if !ENV['CI'] || ENV['DB'] == 'mysql'
+  group :mysql do
+    gem 'mysql2', platforms: [:ruby, :rbx]
+  end
+end
+
+if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
+  group :postgres, :postgresql do
+    gem 'pg', platforms: [:ruby, :rbx]
+  end
+end

data/README.md

@@ -1,6 +1,6 @@
 ![Globalize](http://globalize.github.io/globalize/images/globalize.png)
 
-[![Build Status](https://travis-ci.org/globalize/globalize.svg?branch=master)](https://travis-ci.org/globalize/globalize) [![Code Climate](https://codeclimate.com/github/globalize/globalize.svg)](https://codeclimate.com/github/globalize/globalize)
+[![Build Status](https://github.com/globalize/globalize/workflows/CI/badge.svg)](https://github.com/globalize/globalize/actions) [![Code Climate](https://codeclimate.com/github/globalize/globalize.svg)](https://codeclimate.com/github/globalize/globalize)
 [![Open Source Helpers](https://www.codetriage.com/globalize/globalize/badges/users.svg)](https://www.codetriage.com/globalize/globalize)
 
 You can chat with us using Gitter:
@@ -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)
@@ -28,7 +33,7 @@ gem install globalize
 When using bundler put this in your Gemfile:
 
 ```ruby
-gem 'globalize', '~> 5.1.0'
+gem 'globalize', '~> 5.3.0'
 ```
 
 Please help us by letting us know what works, and what doesn't, when using pre-release code.
@@ -271,6 +276,9 @@ You can enable them by adding the next line to `config/application.rb` (or only
 `config/environments/production.rb` if you only want them in production)
 
 ```ruby
+# For version 1.1.0 and above of the `i18n` gem:
+config.i18n.fallbacks = [I18n.default_locale]
+# Below version 1.1.0 of the `i18n` gem:
 config.i18n.fallbacks = true
 ```
 

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.0'
+  s.add_dependency 'activemodel', '>= 4.2', '< 7.0'
+  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.rb

@@ -11,6 +11,15 @@ 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 +67,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/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. ",
@@ -68,6 +68,7 @@ module Globalize
       def apply_globalize_options(options)
         options[:table_name] ||= "#{table_name.singularize}_translations"
         options[:foreign_key] ||= class_name.foreign_key
+        options[:autosave] ||= false
 
         class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
         self.translated_attribute_names = []
@@ -99,7 +100,7 @@ module Globalize
                                 :foreign_key => options[:foreign_key],
                                 :dependent   => :destroy,
                                 :extend      => HasManyExtensions,
-                                :autosave    => false,
+                                :autosave    => options[:autosave],
                                 :inverse_of  => :globalized_model
 
         after_create :save_translations!

data/lib/globalize/active_record/adapter_dirty.rb

@@ -41,9 +41,17 @@ module Globalize
         self.dirty = {}
       end
 
-      def _reset_attribute name
-        record.send("#{name}=", record.changed_attributes[name])
-        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
@@ -51,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
@@ -98,7 +98,6 @@ module Globalize
       end
 
       def define_translated_attr_accessor(name)
-        attribute(name, ::ActiveRecord::Type::Value.new)
         define_translated_attr_reader(name)
         define_translated_attr_writer(name)
       end
@@ -121,6 +120,7 @@ module Globalize
       end
 
       def define_translations_accessor(name)
+        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

@@ -62,6 +62,7 @@ module Globalize
         end
 
         def drop_translation_table!(options = {})
+          add_missing_columns if options[:create_source_columns]
           move_data_to_model_table if options[:migrate_data]
           drop_translations_index
           drop_translation_table
@@ -78,19 +79,37 @@ module Globalize
 
         def create_translation_table
           connection.create_table(translations_table_name) do |t|
-            t.references table_name.sub(/^#{table_name_prefix}/, '').singularize, :null => false, :index => false, :type => column_type(model.primary_key).to_sym
+            t.references table_name.sub(/^#{table_name_prefix}/, '').singularize,
+                         :null => false,
+                         :index => false,
+                         :type => column_type(model.primary_key).try(:to_sym),
+                         :limit => model.columns.detect { |c| c.name == model.primary_key }.try(:limit)
             t.string :locale, :null => false
             t.timestamps :null => false
           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
@@ -144,8 +163,6 @@ module Globalize
         end
 
         def move_data_to_model_table
-          add_missing_columns
-
           # Find all of the translated attributes for all records in the model.
           all_translated_attributes = model.all.collect{|m| m.attributes}
           all_translated_attributes.each do |translated_record|

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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Globalize
-  Version = '5.2.0'
+  Version = '6.0.1'
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -11,10 +11,36 @@ authors:
 - Tomasz Stachewicz
 - Philip Arndt
 - Chris Salzberg
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2018-11-02 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: 2021-06-23 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: '5.3'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -35,7 +61,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +71,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,7 +81,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -182,20 +208,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Rails I18n de-facto standard library for ActiveRecord model/data translation.
 email: nobody@globalize-rails.org
 executables: []
@@ -206,10 +218,12 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - 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
@@ -234,6 +248,7 @@ 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
@@ -242,7 +257,7 @@ homepage: http://github.com/globalize/globalize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -250,16 +265,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []

data/Gemfile.lock

@@ -1,86 +0,0 @@
-PATH
-  remote: .
-  specs:
-    globalize (5.2.0)
-      activemodel (>= 4.2, < 5.3)
-      activerecord (>= 4.2, < 5.3)
-      request_store (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activesupport (5.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ansi (1.5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    database_cleaner (1.6.2)
-    ffi (1.9.18-java)
-    i18n (1.1.1)
-      concurrent-ruby (~> 1.0)
-    m (1.5.1)
-      method_source (>= 0.6.7)
-      rake (>= 0.9.2.2)
-    method_source (0.9.0)
-    minitest (5.11.1)
-    minitest-reporters (1.1.19)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry (0.11.3-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-      spoon (~> 0.0)
-    rack (2.0.5)
-    rake (12.3.0)
-    rdoc (6.0.1)
-    request_store (1.4.1)
-      rack (>= 1.4)
-    ruby-progressbar (1.9.0)
-    spoon (0.0.6)
-      ffi
-    sqlite3 (1.3.13)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  appraisal
-  database_cleaner
-  globalize!
-  m
-  minitest
-  minitest-reporters
-  pry
-  rake
-  rdoc
-  sqlite3
-
-BUNDLED WITH
-   1.17.1