globalize 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7501e626a9b5bfd187c9db3d0b5a809351308d7783c606a486cb9dab2a7d1649
-  data.tar.gz: f3661b320279e118f396356680dceaa12d322495d823978a1b89d9628ec712de
+  metadata.gz: 232c58a035dbc34d1e513c552d3d0a52a7b349c414fb8c8126c74bfa94831e5e
+  data.tar.gz: d25bd58906d809849ba3ef3ed393e80c599bab47e2115c25ff9f75e11d1a4c7c
 SHA512:
-  metadata.gz: 525c265c86c7ed85a78dea1c721c20f98db1b74cf23bb49453e5677c3ee4605e18fe708d1e1f77723b784f5d98f717181f154c7cd664fe54236756711149881a
-  data.tar.gz: 25e5300ccf2279af73d7e8df8c2ffd5f23a616a3d1fbb3c6289dff82182277b4e045a7ca1443643b44f78f9d0ac2cb5a188ebe9a7e455dd2cbb700d0dc857939
+  metadata.gz: 5c8d6cb1111dddd8f36e3baf3ec053a4db7f1b76b302694a631e41dcb849506d351dd5c5562e513e864912a129b030ae5cf6a0c6378460e534812a65651a60ea
+  data.tar.gz: 43bafaeac8081685600f7201fb88ae5d2c4195ac0c5d40595d78d846deb578f6255c42c55a8b68aafc18dc76a32c0ac370330ecfc1ae3bc6a0379415edb65309

data/Appraisals

@@ -3,9 +3,9 @@
 RAILS_VERSIONS = %w[
   4.2.11.3
   5.1.7
-  5.2.4.4
-  6.0.3.4
-  6.1.0
+  5.2.5
+  6.0.3.6
+  6.1.3.1
 ]
 
 RAILS_VERSIONS.each do |version|
@@ -31,11 +31,6 @@ RAILS_VERSIONS.each do |version|
       end
     end
 
-    platforms :rbx do
-      gem "rubysl", "~> 2.0"
-      gem "rubinius-developer_tools"
-    end
-
     platforms :jruby do
       if !ENV['CI'] || ENV['DB'] == 'sqlite3'
         gem 'activerecord-jdbcsqlite3-adapter', '~> 1'

data/CHANGELOG.md

@@ -1,11 +1,20 @@
 # 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)
 * 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)

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/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,20 +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 >= Gem::Version.new('6.0.0')
+      ::ActiveRecord.version >= ACTIVE_RECORD_60
     end
 
     def rails_61?
-      ::ActiveRecord.version >= Gem::Version.new('6.1.0')
+      ::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. ",

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

@@ -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,18 @@ 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))

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

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'
+  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: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -17,30 +17,30 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
-  /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
+  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-01-11 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -248,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
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation