globalize 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232c58a035dbc34d1e513c552d3d0a52a7b349c414fb8c8126c74bfa94831e5e
-  data.tar.gz: d25bd58906d809849ba3ef3ed393e80c599bab47e2115c25ff9f75e11d1a4c7c
+  metadata.gz: 70e3196446a295412903e65b76e6a1d834904abb732a7692232936fa782f4a9a
+  data.tar.gz: 672eddfec21d2d7205d36bbbe176f646f84511c51a5508056cea828d2d8f2751
 SHA512:
-  metadata.gz: 5c8d6cb1111dddd8f36e3baf3ec053a4db7f1b76b302694a631e41dcb849506d351dd5c5562e513e864912a129b030ae5cf6a0c6378460e534812a65651a60ea
-  data.tar.gz: 43bafaeac8081685600f7201fb88ae5d2c4195ac0c5d40595d78d846deb578f6255c42c55a8b68aafc18dc76a32c0ac370330ecfc1ae3bc6a0379415edb65309
+  metadata.gz: 90f9f98183c545e5f255dd57b48367f6e7b1bba0bde85962c7613e8957086e16757432b56f84acaea36dcbd222ca07d2b0188278bebea7d065ccdb80a052ff22
+  data.tar.gz: e6a718305ce3fd62835ceed0fefdadf4cb19b2e9499a7955acf19763f655b406b468e951f22e6d15edc147ec22906ec17d3792b66fd5bff8eef3ab17071907a3

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/Gemfile.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: .
+  specs:
+    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.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 (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ansi (1.5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    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.6.0)
+      method_source (>= 0.6.7)
+      rake (>= 0.9.2.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)
+    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)
+    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)
+    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
+  arm64-darwin-20
+  arm64-darwin-21
+
+DEPENDENCIES
+  appraisal
+  database_cleaner
+  globalize!
+  m
+  minitest
+  minitest-reporters
+  mysql2
+  pg
+  pry
+  rake
+  rdoc
+  sqlite3
+  standard
+
+BUNDLED WITH
+   2.2.28

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/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.1.0'
 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_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.1.0
 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-02-25 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
@@ -253,6 +254,7 @@ files:
 - 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 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation