i18n-active_record 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 934e01acf036e3a1c8eb23f5f8f96c55e84d462a31a10183c12389e8466e233d
-  data.tar.gz: a0c8301e9e0c5eaac6badf2dfdeca19b581296eaa0e0a15464a13fbc6796087f
+  metadata.gz: 696d09fb79116c47ec3924b359f31ba4c632d68a075d6da1af591dcb0412548f
+  data.tar.gz: eff1a17efd57a2f09546e80aa0d1269b07751f8615b65377c891d89186407d45
 SHA512:
-  metadata.gz: 0702e26d0b3a600ff2d28db7473e9a34311f18a099a0009ec6bccec5382d5c4bcc9042b33653a214c377c332db0d902adb64103e05a98c1371d6d19ccb3c0297
-  data.tar.gz: f2dd449433f4b88763c5952831feff25956c727aa4ff086c2ae130709bfd968ef36f61bf7b2af9065681ac7132e7e7c3a05c13b268e5c1c3e282285cd1787c6b
+  metadata.gz: 8dc72a6d40f4ce0da1d98f5ade7bc26f660766aa72814771f359b9c6c8e943a4c51acfce8f612794cd3ede72c3ad9808e9442524c951fded1c2ec2457be0201f
+  data.tar.gz: cc0fcb1c5121cefa325f52c4edbae8308a095d896cd6a8e3917d5c0144c1460f4f7795a4de6be9f25f399e678b4ce9fa2e95472e0cd651ee08aeead47e30ab03

data/README.md

@@ -115,7 +115,7 @@ The `interpolations` field is otherwise unused since the "value" in `Translation
 
 ## Examples
 
-* http://collectiveidea.com/blog/archives/2016/05/31/beyond-yml-files-dynamic-translations/
+* http://collectiveidea.com/blog/archives/2016/05/31/beyond-yml-files-dynamic-translations/ ([use `before_action`](https://github.com/svenfuchs/i18n-active_record/issues/138) for Rails 5.1+)
 
 ## Contributing
 

data/lib/i18n/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module ActiveRecord
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/i18n/backend/active_record/translation.rb

@@ -53,8 +53,14 @@ module I18n
 
         self.table_name = 'translations'
 
-        serialize :value
-        serialize :interpolations, Array
+        if ::ActiveRecord.version >= Gem::Version.new('7.1.0.alpha')
+          serialize :value, coder: YAML
+          serialize :interpolations, coder: YAML, type: Array
+        else
+          serialize :value
+          serialize :interpolations, Array
+        end
+
         after_commit :invalidate_translations_cache
 
         class << self
@@ -79,7 +85,7 @@ module I18n
             Translation.select('DISTINCT locale').to_a.map { |t| t.locale.to_sym }
           end
 
-          def to_hash
+          def to_h
             Translation.all.each.with_object({}) do |t, memo|
               locale_hash = (memo[t.locale.to_sym] ||= {})
               keys = t.key.split('.')

data/lib/i18n/backend/active_record.rb

@@ -64,7 +64,7 @@ module I18n
         end
 
         def init_translations
-          @translations = Translation.to_hash
+          @translations = Translation.to_h
         end
 
         def translations(do_init: false)

data/test/active_record_test.rb

@@ -123,7 +123,7 @@ class I18nBackendActiveRecordTest < I18n::TestCase
       I18n.t('.') # Fixes test flakiness by loading available locales
       I18n::Backend::ActiveRecord::Translation.destroy_all
 
-      assert_equal 'translation missing: en.no key', I18n.t('.')
+      assert_match(/[Tt]ranslation missing: en\.no key/, I18n.t('.'))
     end
 
     test 'intially unitinitialized' do

data/test/test_helper.rb

@@ -10,35 +10,35 @@ require 'i18n/tests'
 
 begin
   require 'active_record'
-  ::ActiveRecord::Base.connection
+  ActiveRecord::Base.connection
 rescue LoadError => e
   puts "can't use ActiveRecord backend because: #{e.message}"
-rescue ::ActiveRecord::ConnectionNotEstablished
+rescue ActiveRecord::ConnectionNotEstablished
   require 'i18n/backend/active_record'
 
-  case ENV['DB']
+  case ENV.fetch('DB', nil)
   when 'postgres'
-    ::ActiveRecord::Base.establish_connection(
+    ActiveRecord::Base.establish_connection(
       adapter: 'postgresql',
       database: 'i18n_unittest',
-      username: ENV['PG_USER'] || 'postgres',
-      password: ENV['PG_PASSWORD'] || 'postgres',
+      username: ENV.fetch('PG_USER', 'postgres'),
+      password: ENV.fetch('PG_PASSWORD', 'postgres'),
       host: 'localhost'
     )
   when 'mysql'
-    ::ActiveRecord::Base.establish_connection(
+    ActiveRecord::Base.establish_connection(
       adapter: 'mysql2',
       database: 'i18n_unittest',
-      username: ENV['MYSQL_USER'] || 'root',
-      password: ENV['MYSQL_PASSWORD'] || '',
+      username: ENV.fetch('MYSQL_USER', 'root'),
+      password: ENV.fetch('MYSQL_PASSWORD', ''),
       host: '127.0.0.1'
     )
   else
-    ::ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+    ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
   end
 
-  ::ActiveRecord::Migration.verbose = false
-  ::ActiveRecord::Schema.define(version: 1) do
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Schema.define(version: 1) do
     create_table :translations, force: true do |t|
       t.string :locale
       t.string :key
@@ -48,6 +48,12 @@ rescue ::ActiveRecord::ConnectionNotEstablished
     end
     add_index :translations, %i[locale key], unique: true
   end
+
+  if ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes=)
+    ActiveRecord::Base.yaml_column_permitted_classes = [Symbol]
+  elsif ActiveRecord.respond_to?(:yaml_column_permitted_classes=)
+    ActiveRecord.yaml_column_permitted_classes = [Symbol]
+  end
 end
 
 TEST_CASE = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-active_record
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -150,7 +150,8 @@ files:
 homepage: http://github.com/svenfuchs/i18n-active_record
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: I18n ActiveRecord backend