i18n-active_record 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 402118f9fb5b5b88dec6745249ded8e131b509c3bb4b8b35e5857182c85e6ca8
-  data.tar.gz: f120411a8ffc00c065ef50eda91d32515e23f51d6e4125184513c5a34496edb5
+  metadata.gz: 696d09fb79116c47ec3924b359f31ba4c632d68a075d6da1af591dcb0412548f
+  data.tar.gz: eff1a17efd57a2f09546e80aa0d1269b07751f8615b65377c891d89186407d45
 SHA512:
-  metadata.gz: f36d522e0792d4c5460fe9d7b3af69d2fa27817f2f2ecd58eb18ecdcea13012e542bfe4022d2e27c18f454107e63c1406450c3d709830caeb1c33f1a0b2997b3
-  data.tar.gz: 7ee1bec18a25efbad1fbec55e89b061b050cfdf2fc51c2453f6dee559ad71bf60ab8c5d8397900c4d87be82dff59f830e494c427c42214d60469c047d06c08fc
+  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.0.1'
+    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

@@ -11,9 +11,6 @@ module I18n
       autoload :Translation,   'i18n/backend/active_record/translation'
       autoload :Configuration, 'i18n/backend/active_record/configuration'
 
-      include Base
-      include Flatten
-
       class << self
         def configure
           yield(config) if block_given?
@@ -24,109 +21,114 @@ module I18n
         end
       end
 
-      def initialize(*args)
-        super
-
+      def initialize
         reload!
       end
 
-      def available_locales
-        Translation.available_locales
-      rescue ::ActiveRecord::StatementInvalid
-        []
-      end
+      module Implementation
+        include Base
+        include Flatten
 
-      def store_translations(locale, data, options = {})
-        escape = options.fetch(:escape, true)
+        def available_locales
+          Translation.available_locales
+        rescue ::ActiveRecord::StatementInvalid
+          []
+        end
 
-        flatten_translations(locale, data, escape, false).each do |key, value|
-          translation = Translation.locale(locale).lookup(expand_keys(key))
+        def store_translations(locale, data, options = {})
+          escape = options.fetch(:escape, true)
 
-          if self.class.config.cleanup_with_destroy
-            translation.destroy_all
-          else
-            translation.delete_all
+          flatten_translations(locale, data, escape, false).each do |key, value|
+            translation = Translation.locale(locale).lookup(expand_keys(key))
+
+            if self.class.config.cleanup_with_destroy
+              translation.destroy_all
+            else
+              translation.delete_all
+            end
+
+            Translation.create(locale: locale.to_s, key: key.to_s, value: value)
           end
 
-          Translation.create(locale: locale.to_s, key: key.to_s, value: value)
+          reload! if self.class.config.cache_translations
         end
 
-        reload! if self.class.config.cache_translations
-      end
-
-      def reload!
-        @translations = nil
+        def reload!
+          @translations = nil
 
-        self
-      end
+          self
+        end
 
-      def initialized?
-        !@translations.nil?
-      end
+        def initialized?
+          !@translations.nil?
+        end
 
-      def init_translations
-        @translations = Translation.to_hash
-      end
+        def init_translations
+          @translations = Translation.to_h
+        end
 
-      def translations(do_init: false)
-        init_translations if do_init || !initialized?
-        @translations ||= {}
-      end
+        def translations(do_init: false)
+          init_translations if do_init || !initialized?
+          @translations ||= {}
+        end
 
-      protected
+        protected
 
-      def lookup(locale, key, scope = [], options = {})
-        key = normalize_flat_keys(locale, key, scope, options[:separator])
-        key = key[1..-1] if key.first == '.'
-        key = key[0..-2] if key.last == '.'
+        def lookup(locale, key, scope = [], options = {})
+          key = normalize_flat_keys(locale, key, scope, options[:separator])
+          key = key[1..-1] if key.first == '.'
+          key = key[0..-2] if key.last == '.'
 
-        if self.class.config.cache_translations
-          keys = ([locale] + key.split(I18n::Backend::Flatten::FLATTEN_SEPARATOR)).map(&:to_sym)
+          if self.class.config.cache_translations
+            keys = ([locale] + key.split(I18n::Backend::Flatten::FLATTEN_SEPARATOR)).map(&:to_sym)
 
-          return translations.dig(*keys)
-        end
+            return translations.dig(*keys)
+          end
 
-        result = if key == ''
-          Translation.locale(locale).all
-        else
-          Translation.locale(locale).lookup(key)
-        end
+          result = if key == ''
+            Translation.locale(locale).all
+          else
+            Translation.locale(locale).lookup(key)
+          end
 
-        if result.empty?
-          nil
-        elsif result.first.key == key
-          result.first.value
-        else
-          result = result.inject({}) do |hash, translation|
-            hash.deep_merge build_translation_hash_by_key(key, translation)
+          if result.empty?
+            nil
+          elsif result.first.key == key
+            result.first.value
+          else
+            result = result.inject({}) do |hash, translation|
+              hash.deep_merge build_translation_hash_by_key(key, translation)
+            end
+            result.deep_symbolize_keys
           end
-          result.deep_symbolize_keys
         end
-      end
 
-      def build_translation_hash_by_key(lookup_key, translation)
-        hash = {}
+        def build_translation_hash_by_key(lookup_key, translation)
+          hash = {}
 
-        chop_range = if lookup_key == ''
-          0..-1
-        else
-          (lookup_key.size + FLATTEN_SEPARATOR.size)..-1
-        end
-        translation_nested_keys = translation.key.slice(chop_range).split(FLATTEN_SEPARATOR)
-        translation_nested_keys.each.with_index.inject(hash) do |iterator, (key, index)|
-          iterator[key] = translation_nested_keys[index + 1] ?  {} : translation.value
-          iterator[key]
-        end
+          chop_range = if lookup_key == ''
+            0..-1
+          else
+            (lookup_key.size + FLATTEN_SEPARATOR.size)..-1
+          end
+          translation_nested_keys = translation.key.slice(chop_range).split(FLATTEN_SEPARATOR)
+          translation_nested_keys.each.with_index.inject(hash) do |iterator, (key, index)|
+            iterator[key] = translation_nested_keys[index + 1] ?  {} : translation.value
+            iterator[key]
+          end
 
-        hash
-      end
+          hash
+        end
 
-      # For a key :'foo.bar.baz' return ['foo', 'foo.bar', 'foo.bar.baz']
-      def expand_keys(key)
-        key.to_s.split(FLATTEN_SEPARATOR).inject([]) do |keys, k|
-          keys << [keys.last, k].compact.join(FLATTEN_SEPARATOR)
+        # For a key :'foo.bar.baz' return ['foo', 'foo.bar', 'foo.bar.baz']
+        def expand_keys(key)
+          key.to_s.split(FLATTEN_SEPARATOR).inject([]) do |keys, k|
+            keys << [keys.last, k].compact.join(FLATTEN_SEPARATOR)
+          end
         end
       end
+
+      include Implementation
     end
   end
 end

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.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 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