globalize 6.0.1 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232c58a035dbc34d1e513c552d3d0a52a7b349c414fb8c8126c74bfa94831e5e
-  data.tar.gz: d25bd58906d809849ba3ef3ed393e80c599bab47e2115c25ff9f75e11d1a4c7c
+  metadata.gz: dea2f69ccf135fbe06acbc84c800b55e86c91ec4af79d7bfee2f633f707e2dce
+  data.tar.gz: '08fb1fece6efe2c8ef6c3269a6db1d816374e680facedf771ab3bad361a01fa6'
 SHA512:
-  metadata.gz: 5c8d6cb1111dddd8f36e3baf3ec053a4db7f1b76b302694a631e41dcb849506d351dd5c5562e513e864912a129b030ae5cf6a0c6378460e534812a65651a60ea
-  data.tar.gz: 43bafaeac8081685600f7201fb88ae5d2c4195ac0c5d40595d78d846deb578f6255c42c55a8b68aafc18dc76a32c0ac370330ecfc1ae3bc6a0379415edb65309
+  metadata.gz: ae62da6d81f0a0deecf81985717bcc565d4a6b105483dcf0234f842c0954e3c66dc9f277be67f6119b35766cbcfdbb5cc2eb881c5be8562c650ff972484e4290
+  data.tar.gz: 82e457b56e752a61748cb2f6684f96daa6387915addad2414749fd90504ad3e42e426c002f4c14bc78a440c62927e61dfddef46d489b1c627f75d1d5616826f9

data/Appraisals

@@ -6,6 +6,7 @@ RAILS_VERSIONS = %w[
   5.2.5
   6.0.3.6
   6.1.3.1
+  7.0.0
 ]
 
 RAILS_VERSIONS.each do |version|
@@ -13,12 +14,12 @@ RAILS_VERSIONS.each do |version|
     gem 'activemodel', version
     gem 'activerecord', version
     
-    if version =~ /^6/
-      gem 'sqlite3', '~> 1.4', platforms: [:ruby, :rbx]
+    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 version =~ /^4/
-      gem 'sqlite3', '~> 1.3.6', platforms: [:ruby, :rbx]
+    else
+      gem 'sqlite3', '~> 1.4', platforms: [:ruby, :rbx]
     end
 
     if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Globalize Changelog
 
+## 6.2.1 (2022-05-24)
+
+*  Changed serialize method in Rails 6.1.0+ [#798](https://github.com/globalize/globalize/pull/798) by [Alex](https://github.com/oivoodoo)
+
+## 6.2.0 (2022-05-24)
+
+* Fix asset precompile in docker build workflow [#799](https://github.com/globalize/globalize/pull/799) by [Diefferson Koderer Môro](https://github.com/djpremier)
+
+## 6.1.0 (2022-02-25)
+
+* Patch ActiveSupport in Rails 7.0.0+ [#792](https://github.com/globalize/globalize/pull/792) by [Daniel Chan](https://github.com/mynameisdaniel) and [Artis Raugulis](https://github.com/artisr)
+
 ## 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)

data/CONTRIBUTING.md

@@ -4,7 +4,7 @@ Globalize is a community project, and would not be here today if it were not for
 
 ## Bugs
 
-If you find a bug or something is not working as expected, please search through the [github issues](https://github.com/globalize/globalize/issues) and on [stackoverflow](http://stackoverflow.com/questions/tagged/globalize) first. If you cannot find any answers related to your issue, post a new one and we will try to address it as soon as we can. Note that we prioritize Rails 4 issues (`master` branch) over Rails 3 issues (`3-0-stable` branch).
+If you find a bug or something is not working as expected, please search through the [github issues](https://github.com/globalize/globalize/issues) and on [stackoverflow](http://stackoverflow.com/questions/tagged/globalize) first. If you cannot find any answers related to your issue, post a new one and we will try to address it as soon as we can. Note that we prioritize Rails 4 issues (`main` branch) over Rails 3 issues (`3-0-stable` branch).
 
 If you also have some idea how to fix the bug, then by all means post a pull request (see below).
 
@@ -12,11 +12,11 @@ If you also have some idea how to fix the bug, then by all means post a pull req
 
 Have an idea for a new feature? Great! Keep in mind though that we are trying to cut down on non-core functionality in the Globalize core and push it to separate extensions, such as [globalize-accessors](https://github.com/globalize/globalize-accessors). If you are proposing something like this, we would prefer you to create a separate repository and gem for it.
 
-If however your feature would improve the core functionality of Globalize, please do submit a PR, preferably to the `master` branch.
+If however your feature would improve the core functionality of Globalize, please do submit a PR, preferably to the `main` branch.
 
 ## Refactoring
 
-Have some free time? Help us improve our [code climate score](https://codeclimate.com/github/globalize/globalize) by refactoring the codebase. If the tests still pass and the changes seem reasonable, we will happily merge them. As elsewhere, priority always goes to the Rails/AR 4 series (`master` branch).
+Have some free time? Help us improve our [code climate score](https://codeclimate.com/github/globalize/globalize) by refactoring the codebase. If the tests still pass and the changes seem reasonable, we will happily merge them. As elsewhere, priority always goes to the Rails/AR 4 series (`main` branch).
 
 ## Documentation
 
@@ -32,7 +32,7 @@ Have a bug fix, code improvement or proposed feature? Do the following:
 4. Push to the branch: `git push origin my_new_feature`
 5. Submit a pull request.
 
-For pull requests to Rails/ActiveRecord 4 version of Globalize (v3.x), post to the `master` branch. For pull requests to the Rails/ActiveRecord 3.x version of Globalize (3.x), post to the `3-0-stable` branch.
+For pull requests to Rails/ActiveRecord 4 version of Globalize (v3.x), post to the `main` branch. For pull requests to the Rails/ActiveRecord 3.x version of Globalize (3.x), post to the `3-0-stable` branch.
 
 When you submit the pull request, GitHub Actions will run the [test suite](https://github.com/globalize/globalize/actions) against your branch and will highlight any failures. Unless there is a good reason for it, we do not generally accept pull requests that take Globalize from green to red.
 

data/Gemfile.lock

@@ -0,0 +1,86 @@
+PATH
+  remote: .
+  specs:
+    globalize (6.2.1)
+      activemodel (>= 4.2, < 7.1)
+      activerecord (>= 4.2, < 7.1)
+      request_store (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ansi (1.5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    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.10.0)
+      concurrent-ruby (~> 1.0)
+    m (1.6.0)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.2)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    minitest-reporters (1.5.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mysql2 (0.5.4)
+    pg (1.3.5)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (4.0.4)
+      stringio
+    rack (2.2.3)
+    rake (13.0.6)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
+    request_store (1.5.1)
+      rack (>= 1.4)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.2)
+    stringio (3.0.2)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-21
+
+DEPENDENCIES
+  appraisal
+  database_cleaner
+  globalize!
+  m
+  minitest
+  minitest-reporters
+  mysql2
+  pg
+  pry
+  rake
+  rdoc
+  sqlite3
+
+BUNDLED WITH
+   2.3.13

data/globalize.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   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 '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'

data/lib/globalize/active_record/act_macro.rb

@@ -41,7 +41,7 @@ module Globalize
         end
 
         begin
-          if Globalize.rails_5? && table_exists? && translation_class.table_exists?
+          if Globalize.rails_5? && database_connection_possible?
             self.ignored_columns += translated_attribute_names.map(&:to_s)
             reset_column_information
           end
@@ -52,7 +52,8 @@ 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 Globalize.rails_42? && table_exists? && translation_class.table_exists?
+        return unless Globalize.rails_42? && database_connection_possible?
+
         if (overlap = attr_names.map(&:to_s) & column_names).present?
           ActiveSupport::Deprecation.warn(
             ["You have defined one or more translated attributes with names that conflict with column(s) on the model table. ",

data/lib/globalize/active_record/class_methods.rb

@@ -124,6 +124,20 @@ module Globalize
         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
+          ::ActiveRecord::Base.connection
+        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

@@ -21,7 +21,7 @@ module Globalize
 
         # 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
+        # See https://github.com/rails/rails/blob/5-2-stable/activerecord/lib/active_record/attribute_assignment.rb#L12
         def _assign_attributes(new_attributes)
           attributes = new_attributes.stringify_keys
           with_given_locale(attributes) { super(attributes.except("locale")) }

data/lib/globalize/active_record/migration.rb

@@ -169,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Globalize
-  Version = '6.0.1'
+  Version = '6.2.1'
 end

data/lib/globalize.rb

@@ -6,6 +6,7 @@ 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'

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

@@ -0,0 +1,22 @@
+module Globalize
+  module AttributeMethods
+    module Serialization
+      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
+                elsif [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
+                  class_name_or_coder
+                else
+                  ::ActiveRecord::Coders::YAMLColumn.new(attr_name, class_name_or_coder)
+                end
+
+        self.globalize_serialized_attributes = globalize_serialized_attributes.dup
+        self.globalize_serialized_attributes[attr_name] = coder
+      end
+    end
+  end
+end
+
+ActiveRecord::AttributeMethods::Serialization::ClassMethods.send(:prepend, Globalize::AttributeMethods::Serialization)

data/lib/patches/active_record/serialization.rb

@@ -1,5 +1,7 @@
 if ::ActiveRecord.version < Gem::Version.new("5.1.0")
   require_relative 'rails4/serialization'
-else
+elsif ::ActiveRecord.version < Gem::Version.new("6.1.0")
   require_relative 'rails5_1/serialization'
+else
+  require_relative 'rails6_1/serialization'
 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.1
+  version: 6.2.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -40,7 +40,7 @@ cert_chain:
   e17ZNASZffbQRP09MH2GZ2AOlkildTX6looWRforZEZi+qamognrozd3MI5QHi1W
   UAZUzHLrrFu7gnkFvLVpxOUf4ItOkA==
   -----END CERTIFICATE-----
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -51,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
@@ -61,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
@@ -71,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
@@ -81,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
@@ -218,6 +218,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -248,11 +249,13 @@ 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/serialization.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
@@ -272,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation