i18n-active_record 0.4.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aeed8d25f893fefde754e0836bdc6338529b6313a5809d4312fb7fd30087f3a
-  data.tar.gz: e924f6936a5f956f6c62c095374b76d1c84e504d65bdf07f4463d2659cb7c50d
+  metadata.gz: 934e01acf036e3a1c8eb23f5f8f96c55e84d462a31a10183c12389e8466e233d
+  data.tar.gz: a0c8301e9e0c5eaac6badf2dfdeca19b581296eaa0e0a15464a13fbc6796087f
 SHA512:
-  metadata.gz: 100bd6c09aa1307292e2f751d45b601e47837e58d708bf881b9e0ba6d02e1ec1d8911d5fa4c3d4f0d6d9409e5997d90772e23e1fdbf86e0e4ed6b1af48101988
-  data.tar.gz: 29bd66389ac95bf5afa7f97f89e9676b6bb83be6abaa02876e7577dff6c1a83b7f91fbe70f6166841e5924b403e9449c071338076ef8f3c5d1189bd8f3e9f29a
+  metadata.gz: 0702e26d0b3a600ff2d28db7473e9a34311f18a099a0009ec6bccec5382d5c4bcc9042b33653a214c377c332db0d902adb64103e05a98c1371d6d19ccb3c0297
+  data.tar.gz: f2dd449433f4b88763c5952831feff25956c727aa4ff086c2ae130709bfd968ef36f61bf7b2af9065681ac7132e7e7c3a05c13b268e5c1c3e282285cd1787c6b

data/README.md

@@ -0,0 +1,140 @@
+# I18n::Backend::ActiveRecord [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop) [![Tests Status](https://github.com/svenfuchs/i18n-active_record/actions/workflows/test.yml/badge.svg)](https://github.com/svenfuchs/i18n-active_record/actions) [![Linter Status](https://github.com/svenfuchs/i18n-active_record/actions/workflows/linter.yml/badge.svg)](https://github.com/svenfuchs/i18n-active_record/actions)
+
+This repository contains the I18n ActiveRecord backend and support code that has been extracted from the `I18n` gem: http://github.com/svenfuchs/i18n.
+It is fully compatible with Rails 4, 5 and 6.
+
+## Installation
+
+For Bundler put the following in your Gemfile:
+
+```ruby
+gem 'i18n-active_record', require: 'i18n/active_record'
+```
+
+After updating your bundle, run the installer
+
+    $ rails g i18n:active_record:install
+
+It creates a migration:
+
+```ruby
+class CreateTranslations < ActiveRecord::Migration
+  def change
+    create_table :translations do |t|
+      t.string :locale
+      t.string :key
+      t.text :value
+      t.text :interpolations
+      t.boolean :is_proc, default: false
+
+      t.timestamps
+    end
+  end
+end
+```
+
+To specify table name use:
+
+    $ rails g i18n:active_record:install MyTranslation
+
+With the translation model you will be able to manage your translation, and add new translations or languages through
+it.
+
+By default the installer creates a new file in `config/initializers` named `i18n_active_record.rb` with the following content.
+
+```ruby
+require 'i18n/backend/active_record'
+
+Translation = I18n::Backend::ActiveRecord::Translation
+
+if Translation.table_exists?
+  I18n.backend = I18n::Backend::ActiveRecord.new
+
+  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
+  I18n::Backend::Simple.send(:include, I18n::Backend::Memoize)
+  I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+
+  I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
+end
+```
+
+To perform a simpler installation use:
+
+    $ rails g i18n:active_record:install --simple
+
+It generates:
+
+```ruby
+require 'i18n/backend/active_record'
+I18n.backend = I18n::Backend::ActiveRecord.new
+```
+
+You may also configure whether the ActiveRecord backend should use `destroy` or `delete` when cleaning up internally.
+
+```ruby
+I18n::Backend::ActiveRecord.configure do |config|
+  config.cleanup_with_destroy = true # defaults to false
+end
+```
+
+To configure the ActiveRecord backend to cache translations(might be useful in production) use:
+
+```ruby
+I18n::Backend::ActiveRecord.configure do |config|
+  config.cache_translations = true # defaults to false
+end
+```
+
+## Usage
+
+You can now use `I18n.t('Your String')` to lookup translations in the database.
+
+## Missing Translations
+
+### Usage
+
+In order to make the `I18n::Backend::ActiveRecord::Missing` module working correctly pluralization rules should be configured properly.
+The `i18n.plural.keys` translation key should be present in any of the backends.
+See https://github.com/svenfuchs/i18n-active_record/blob/master/lib/i18n/backend/active_record/missing.rb for more information.
+
+```yaml
+en:
+  i18n:
+    plural:
+      keys:
+        - :zero
+        - :one
+        - :other
+```
+
+### Interpolations
+
+The `interpolations` field in the `translations` table is used by `I18n::Backend::ActiveRecord::Missing` to store the interpolations seen the first time this Translation was requested.  This will help translators understand what interpolations to expect, and thus to include when providing the translations.
+
+The `interpolations` field is otherwise unused since the "value" in `Translation#value` is actually used for interpolation during actual translations.
+
+## Examples
+
+* http://collectiveidea.com/blog/archives/2016/05/31/beyond-yml-files-dynamic-translations/
+
+## Contributing
+
+### Test suite
+
+The test suite can be run with:
+
+    bundle exec rake
+
+By default it runs the tests for SQLite database, to specify a database the `DB` env variable can be used:
+
+    DB=postgres bundle exec rake
+    DB=mysql bundle exec rake
+
+To run tests for a specific rails version see [Appraisal](https://github.com/thoughtbot/appraisal):
+
+    bundle exec appraisal rails-4 rake test
+
+## Maintainers
+
+* Sven Fuchs
+* Tim Masliuchenko

data/Rakefile

@@ -1,61 +1,12 @@
-require 'rake'
+# frozen_string_literal: true
+
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 
-def execute(command)
-  puts command
-  system command
-end
-
-def bundle_options
-  opt = ''
-  opt +=  "--gemfile #{ENV['BUNDLE_GEMFILE']}" if ENV['BUNDLE_GEMFILE']
-end
-
-def each_database(&block)
-  ['sqlite', 'postgres', 'mysql'].each &block
-end
-
-namespace :bundle do
-  task :env do
-    ar = ENV['AR'].to_s
-
-    next if ar.empty?
-
-    gemfile = "gemfiles/Gemfile.rails_#{ar}"
-    raise "Cannot find gemfile at #{gemfile}" unless File.exist?(gemfile)
-
-    ENV['BUNDLE_GEMFILE'] = gemfile
-    puts "Using gemfile: #{gemfile}"
-  end
-
-  task install: :env do
-    execute "bundle install #{bundle_options}"
-  end
-
-  task :install_all do
-    [nil, '3', '4', '5', '6', 'master'].each do |ar|
-      opt = ar && "AR=#{ar}"
-      execute "rake bundle:install #{opt}"
-    end
-  end
-end
-
-task :test do
-  each_database { |db| execute "rake #{db}:test" }
-end
-
-Rake::TestTask.new :_test do |t|
+Rake::TestTask.new :test do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
-each_database do |db|
-  namespace db do
-    task(:env) { ENV['DB'] = db }
-    task test: ['env', 'bundle:env', '_test']
-  end
-end
-
 task default: :test

data/lib/generators/i18n/active_record/install_generator.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails/generators/active_record'
 
 module I18n
   module ActiveRecord
     module Generators
       class  InstallGenerator < ::ActiveRecord::Generators::Base
-        desc "Installs i18n-active_record and generates the necessary migrations"
+        desc 'Installs i18n-active_record and generates the necessary migrations'
 
         argument :name, type: :string, default: 'Translation'
 

data/lib/generators/i18n/active_record/templates/advanced_initializer.rb.erb

@@ -13,5 +13,6 @@ if Translation.table_exists?
 end
 
 I18n::Backend::ActiveRecord.configure do |config|
+  # config.cache_translations = true # defaults to false
   # config.cleanup_with_destroy = true # defaults to false
 end

data/lib/generators/i18n/active_record/templates/migration.rb.erb

@@ -1,17 +1,13 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
-  def self.up
-    create_table :<%= name.tableize %> do |t|
+  def change
+    create_table :<%= table_name %> do |t|
       t.string :locale
       t.string :key
-      t.text   :value
-      t.text   :interpolations
-      t.boolean :is_proc, :default => false
+      t.text :value
+      t.text :interpolations
+      t.boolean :is_proc, default: false
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :<%= name.tableize %>
-  end
 end

data/lib/generators/i18n/active_record/templates/simple_initializer.rb.erb

@@ -2,5 +2,6 @@ require 'i18n/backend/active_record'
 I18n.backend = I18n::Backend::ActiveRecord.new
 
 I18n::Backend::ActiveRecord.configure do |config|
+  # config.cache_translations = true # defaults to false
   # config.cleanup_with_destroy = true # defaults to false
 end

data/lib/i18n/active_record/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module I18n
   module ActiveRecord
-    VERSION = '0.4.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/i18n/active_record.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'i18n'

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

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module I18n
   module Backend
     class ActiveRecord
       class Configuration
-        attr_accessor :cleanup_with_destroy
+        attr_accessor :cleanup_with_destroy, :cache_translations
 
         def initialize
           @cleanup_with_destroy = false
+          @cache_translations = false
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #  This extension stores translation stub records for missing translations to
 #  the database.
 #
@@ -36,27 +38,28 @@ module I18n
         include Flatten
 
         def store_default_translations(locale, key, options = {})
-          count, scope, default, separator = options.values_at(:count, :scope, :default, :separator)
+          count, scope, _, separator = options.values_at(:count, :scope, :default, :separator)
           separator ||= I18n.default_separator
           key = normalize_flat_keys(locale, key, scope, separator)
 
-          unless ActiveRecord::Translation.locale(locale).lookup(key).exists?
-            interpolations = options.keys - I18n::RESERVED_KEYS
-            keys = count ? I18n.t('i18n.plural.keys', :locale => locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
-            keys.each { |key| store_default_translation(locale, key, interpolations) }
-          end
+          return if ActiveRecord::Translation.locale(locale).lookup(key).exists?
+
+          interpolations = options.keys - I18n::RESERVED_KEYS
+          keys = count ? I18n.t('i18n.plural.keys', locale: locale).map { |k| [key, k].join(FLATTEN_SEPARATOR) } : [key]
+          keys.each { |k| store_default_translation(locale, k, interpolations) }
         end
 
         def store_default_translation(locale, key, interpolations)
-          translation = ActiveRecord::Translation.new :locale => locale.to_s, :key => key
+          translation = ActiveRecord::Translation.new locale: locale.to_s, key: key
           translation.interpolations = interpolations
           translation.save
         end
 
         def translate(locale, key, options = {})
           result = catch(:exception) { super }
+
           if result.is_a?(I18n::MissingTranslation)
-            self.store_default_translations(locale, key, options)
+            store_default_translations(locale, key, options)
             throw(:exception, result)
           else
             result

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This module is intended to be mixed into the ActiveRecord backend to allow
 # storing Ruby Procs as translation values in the database.
 #
@@ -21,13 +23,13 @@ module I18n
   module Backend
     class ActiveRecord
       module StoreProcs
-        def value=(v)
-          case v
+        def value=(val)
+          case val
           when Proc
-            write_attribute(:value, v.to_ruby)
+            write_attribute(:value, val.to_ruby)
             write_attribute(:is_proc, true)
           else
-            write_attribute(:value, v)
+            write_attribute(:value, val)
           end
         end
 
@@ -36,4 +38,3 @@ module I18n
     end
   end
 end
-

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 
 module I18n
@@ -53,19 +55,20 @@ module I18n
 
         serialize :value
         serialize :interpolations, Array
+        after_commit :invalidate_translations_cache
 
         class << self
           def locale(locale)
-            where(:locale => locale.to_s)
+            where(locale: locale.to_s)
           end
 
           def lookup(keys, *separator)
             column_name = connection.quote_column_name('key')
-            keys = Array(keys).map! { |key| key.to_s }
+            keys = Array(keys).map!(&:to_s)
 
             unless separator.empty?
-              warn "[DEPRECATION] Giving a separator to Translation.lookup is deprecated. " <<
-                "You can change the internal separator by overwriting FLATTEN_SEPARATOR."
+              warn '[DEPRECATION] Giving a separator to Translation.lookup is deprecated. ' \
+                   'You can change the internal separator by overwriting FLATTEN_SEPARATOR.'
             end
 
             namespace = "#{keys.last}#{I18n::Backend::Flatten::FLATTEN_SEPARATOR}%"
@@ -83,14 +86,14 @@ module I18n
               keys.each.with_index.inject(locale_hash) do |iterator, (key_part, index)|
                 key = key_part.to_sym
                 iterator[key] = keys[index + 1] ? (iterator[key] || {}) : t.value
-                iterator[key]
+                iterator[key] # rubocop:disable Lint/UnmodifiedReduceAccumulator
               end
             end
           end
         end
 
         def interpolates?(key)
-          self.interpolations.include?(key) if self.interpolations
+          interpolations&.include?(key)
         end
 
         def value
@@ -107,14 +110,19 @@ module I18n
         end
 
         def value=(value)
-          if value === false
+          case value
+          when false
             value = FALSY_CHAR
-          elsif value === true
+          when true
             value = TRUTHY_CHAR
           end
 
           write_attribute(:value, value)
         end
+
+        def invalidate_translations_cache
+          I18n.backend.reload! if I18n::Backend::ActiveRecord.config.cache_translations
+        end
       end
     end
   end

data/lib/i18n/backend/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n/backend/base'
 require 'i18n/backend/active_record/translation'
 
@@ -19,34 +21,41 @@ module I18n
         end
       end
 
+      def initialize
+        reload!
+      end
+
       module Implementation
-        include Base, Flatten
+        include Base
+        include Flatten
 
         def available_locales
-          begin
-            Translation.available_locales
-          rescue ::ActiveRecord::StatementInvalid
-            []
-          end
+          Translation.available_locales
+        rescue ::ActiveRecord::StatementInvalid
+          []
         end
 
         def store_translations(locale, data, options = {})
           escape = options.fetch(:escape, true)
+
           flatten_translations(locale, data, escape, false).each do |key, value|
             translation = Translation.locale(locale).lookup(expand_keys(key))
 
-            if ActiveRecord.config.cleanup_with_destroy
+            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)
+            Translation.create(locale: locale.to_s, key: key.to_s, value: value)
           end
+
+          reload! if self.class.config.cache_translations
         end
 
         def reload!
           @translations = nil
+
           self
         end
 
@@ -63,15 +72,17 @@ module I18n
           @translations ||= {}
         end
 
-      protected
+        protected
 
         def lookup(locale, key, scope = [], options = {})
           key = normalize_flat_keys(locale, key, scope, options[:separator])
-          if key.first == '.'
-            key = key[1..-1]
-          end
-          if key.last == '.'
-            key = key[0..-2]
+          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)
+
+            return translations.dig(*keys)
           end
 
           result = if key == ''
@@ -94,23 +105,25 @@ module I18n
 
         def build_translation_hash_by_key(lookup_key, translation)
           hash = {}
-          if lookup_key == ''
-            chop_range = 0..-1
+
+          chop_range = if lookup_key == ''
+            0..-1
           else
-            chop_range = (lookup_key.size + FLATTEN_SEPARATOR.size)..-1
+            (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
 
         # 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, key|
-            keys << [keys.last, key].compact.join(FLATTEN_SEPARATOR)
+          key.to_s.split(FLATTEN_SEPARATOR).inject([]) do |keys, k|
+            keys << [keys.last, k].compact.join(FLATTEN_SEPARATOR)
           end
         end
       end