globalize 5.3.1 → 7.0.0

data/lib/globalize/active_record/adapter_dirty.rb

@@ -42,9 +42,6 @@ module Globalize
       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])
       end
 
@@ -53,6 +50,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,12 +3,6 @@ module Globalize
     module ClassMethods
       delegate :translated_locales, :set_translations_table_name, :to => :translation_class
 
-      if ::ActiveRecord::VERSION::STRING < "5.0.0"
-        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,10 +114,29 @@ 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)
         define_translations_reader(name)
         define_translations_writer(name)
       end
+
+      def database_connection_possible?
+        begin
+          # Without a connection tentative, the `connected?` function can responds with a false negative
+          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
+        end
+
+        ::ActiveRecord::Base.connected? &&
+          table_exists? &&
+          translation_class.table_exists?
+      end
     end
   end
 end

data/lib/globalize/active_record/instance_methods.rb

@@ -17,24 +17,9 @@ module Globalize
         with_given_locale(attributes) { super(attributes.except("locale"), *options) }
       end
 
-      if Globalize.rails_52?
-
-        # In Rails 5.2 we need to override *_assign_attributes* as it's called earlier
-        # in the stack (before *assign_attributes*)
-        # See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/attribute_assignment.rb#L11
-        def _assign_attributes(new_attributes)
-          attributes = new_attributes.stringify_keys
-          with_given_locale(attributes) { super(attributes.except("locale")) }
-        end
-
-      else
-
-        def assign_attributes(new_attributes, *options)
-          super unless new_attributes.respond_to?(:stringify_keys) && new_attributes.present?
-          attributes = new_attributes.stringify_keys
-          with_given_locale(attributes) { super(attributes.except("locale"), *options) }
-        end
-
+      def _assign_attributes(new_attributes)
+        attributes = new_attributes.stringify_keys
+        with_given_locale(attributes) { super(attributes.except("locale")) }
       end
 
       def write_attribute(name, value, *args, &block)
@@ -158,18 +143,20 @@ module Globalize
         Globalize.fallbacks(locale)
       end
 
-      def save(*)
-        result = Globalize.with_locale(translation.locale || I18n.default_locale) do
-          without_fallbacks do
-            super
+      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
-        end
-        if result
-          globalize.clear_dirty
-        end
 
-        result
-      end
+          result
+        end
+      RUBY
 
       def column_for_attribute name
         return super if translated_attribute_names.exclude?(name)
@@ -185,8 +172,29 @@ module Globalize
         changed_attributes.present? || translations.any?(&:changed?)
       end
 
-      # need to access instance variable directly since changed_attributes
-      # is frozen as of Rails 4.2
+      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
+
+      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
+
+      # need to access instance variable directly since changed_attributes is frozen
       def original_changed_attributes
         @changed_attributes
       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
@@ -92,7 +93,7 @@ module Globalize
           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
+                t.column name, options.delete(:type), **options
               else
                 t.column name, options
               end
@@ -148,14 +149,14 @@ 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|
             # 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,23 +99,6 @@ module Globalize
         end
       end
 
-      if ::ActiveRecord::VERSION::STRING < "5.0.0"
-        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
-          equalities = equalities.grep(Arel::Nodes::Equality).find_all { |node|
-            node.left.relation.name == translations_table_name
-          }
-
-          binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
-
-          super.merge(Hash[equalities.map { |where|
-            name = where.left.name
-            [name, binds.fetch(name.to_s) { right = where.right; right.is_a?(Arel::Nodes::Casted) ? right.val : right }]
-          }])
-        end
-      end
-
       def join_translations(relation = self)
         if relation.joins_values.include?(:translations)
           relation

data/lib/globalize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Globalize
-  Version = '5.3.1'
+  Version = "7.0.0"
 end

data/lib/globalize.rb

@@ -1,16 +1,20 @@
 require 'request_store'
 require 'active_record'
 require 'patches/active_record/xml_attribute_serializer'
-require 'patches/active_record/query_method'
 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_7 = Gem::Version.new('7.0.0')
+  ACTIVE_RECORD_71 = Gem::Version.new('7.1.0')
+  ACTIVE_RECORD_72 = Gem::Version.new('7.2.0')
+
   class << self
     def locale
       read_locale || I18n.locale
@@ -58,12 +62,16 @@ module Globalize
       RequestStore.store
     end
 
-    def rails_5?
-      ::ActiveRecord.version >= Gem::Version.new('5.1.0')
+    def rails_7?
+      ::ActiveRecord.version >= ACTIVE_RECORD_7
+    end
+
+    def rails_7_1?
+      ::ActiveRecord.version >= ACTIVE_RECORD_71
     end
 
-    def rails_52?
-      ::ActiveRecord.version >= Gem::Version.new('5.2.0')
+    def rails_7_2?
+      ::ActiveRecord.version >= ACTIVE_RECORD_72
     end
 
   protected
@@ -92,7 +100,9 @@ module Globalize
   end
 end
 
-ActiveRecord::Base.class_attribute :globalize_serialized_attributes, instance_writer: false
-ActiveRecord::Base.globalize_serialized_attributes = {}
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.class_attribute :globalize_serialized_attributes, instance_writer: false
+  ActiveRecord::Base.globalize_serialized_attributes = {}
 
-ActiveRecord::Base.extend(Globalize::ActiveRecord::ActMacro)
+  ActiveRecord::Base.extend(Globalize::ActiveRecord::ActMacro)
+end

data/lib/patches/active_record/{rails5_1 → rails6_1}/serialization.rb

@@ -1,8 +1,8 @@
 module Globalize
   module AttributeMethods
     module Serialization
-      def serialize(attr_name, class_name_or_coder = Object)
-        super(attr_name, class_name_or_coder)
+      def serialize(attr_name, class_name_or_coder = Object, **options)
+        super(attr_name, class_name_or_coder, **options)
 
         coder = if class_name_or_coder == ::JSON
                   ::ActiveRecord::Coders::JSON

data/lib/patches/active_record/{rails5_1 → rails6_1}/uniqueness_validator.rb

@@ -32,7 +32,7 @@ module Globalize
           if relation.exists?
             error_options = options.except(:case_sensitive, :scope, :conditions)
             error_options[:value] = value
-            record.errors.add(attribute, :taken, error_options)
+            record.errors.add(attribute, :taken, **error_options)
           end
         else
           super(record, attribute, value)

data/lib/patches/active_record/rails7_1/serialization.rb

@@ -0,0 +1,28 @@
+module Globalize
+  module AttributeMethods
+    module Serialization
+      def serialize(attr_name, class_name_or_coder = nil, **options)
+        self.globalize_serialized_attributes = globalize_serialized_attributes.dup
+
+        if class_name_or_coder.nil?
+          self.globalize_serialized_attributes[attr_name] = options
+
+          super(attr_name, **options)
+        elsif class_name_or_coder.is_a?(Hash)
+          self.globalize_serialized_attributes[attr_name] = class_name_or_coder
+
+          # https://github.com/rails/rails/blob/7-2-stable/activerecord/lib/active_record/attribute_methods/serialization.rb#L183
+          super(attr_name, **class_name_or_coder)
+        else
+          self.globalize_serialized_attributes[attr_name] = [class_name_or_coder, options]
+
+          # this is only needed for ACTIVE_RECORD_71. class_name_or_coder will be removed with Rails 7.2
+          # https://github.com/rails/rails/blob/7-1-stable/activerecord/lib/active_record/attribute_methods/serialization.rb#L183
+          super(attr_name, class_name_or_coder, **options)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::AttributeMethods::Serialization::ClassMethods.send(:prepend, Globalize::AttributeMethods::Serialization)

data/lib/patches/active_record/rails7_2/serialization.rb

@@ -0,0 +1,15 @@
+module Globalize
+  module AttributeMethods
+    module Serialization
+      def serialize(attr_name, **options)
+        self.globalize_serialized_attributes = globalize_serialized_attributes.dup
+        self.globalize_serialized_attributes[attr_name] = options
+
+        # https://github.com/rails/rails/blob/7-2-stable/activerecord/lib/active_record/attribute_methods/serialization.rb#L183
+        super(attr_name, **options)
+      end
+    end
+  end
+end
+
+ActiveRecord::AttributeMethods::Serialization::ClassMethods.send(:prepend, Globalize::AttributeMethods::Serialization)

data/lib/patches/active_record/relation.rb

@@ -1,12 +1,15 @@
-if ::ActiveRecord::VERSION::STRING >= "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
+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
+
+    def scope_for_create
+      return super unless respond_to?(:translations_table_name)
+      super.merge(where_values_hash(translations_table_name))
     end
   end
+end
 
-  ActiveRecord::Relation.prepend Globalize::Relation
-end
+ActiveRecord::Relation.prepend Globalize::Relation

data/lib/patches/active_record/serialization.rb

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

data/lib/patches/active_record/uniqueness_validator.rb

@@ -1,7 +1 @@
-if ::ActiveRecord::VERSION::STRING < "5.0.0"
-  require_relative 'rails4/uniqueness_validator'
-elsif ::ActiveRecord::VERSION::STRING < "5.1.0"
-  require_relative 'rails5/uniqueness_validator'
-else
-  require_relative 'rails5_1/uniqueness_validator'
-end
+require_relative 'rails6_1/uniqueness_validator'

data/lib/patches/active_support/inflections.rb

@@ -0,0 +1,12 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -11,51 +11,71 @@ authors:
 - Tomasz Stachewicz
 - Philip Arndt
 - Chris Salzberg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -182,20 +202,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,12 +212,10 @@ 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
@@ -229,22 +233,20 @@ files:
 - lib/i18n/missing_translations_log_handler.rb
 - lib/i18n/missing_translations_raise_handler.rb
 - lib/patches/active_record/persistence.rb
-- lib/patches/active_record/query_method.rb
-- lib/patches/active_record/rails4/query_method.rb
-- lib/patches/active_record/rails4/serialization.rb
-- lib/patches/active_record/rails4/uniqueness_validator.rb
-- 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/serialization.rb
+- lib/patches/active_record/rails6_1/uniqueness_validator.rb
+- lib/patches/active_record/rails7_1/serialization.rb
+- lib/patches/active_record/rails7_2/serialization.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
@@ -252,15 +254,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.6
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []

data/docker-compose.yml

@@ -1,22 +0,0 @@
-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

@@ -1,32 +0,0 @@
-require File.expand_path('../lib/globalize/version', __FILE__)
-
-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.rubyforge_project = '[none]'
-  s.required_ruby_version = '>= 2.4.6'
-
-  s.add_dependency 'activerecord', '>= 4.2', '< 6.1'
-  s.add_dependency 'activemodel', '>= 4.2', '< 6.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.add_development_dependency 'sqlite3'
-end