i18n-active_record 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 071f03d4c1cb846851214370883ecf1e2d8205f9
-  data.tar.gz: 3aabc622ff195919dfc1062767d74e77927a1af4
+  metadata.gz: d4702ca87d86eb911ba7bb1a625d3db8c9837120
+  data.tar.gz: 035751e1098ef51b85d91d85edcc4279691386e1
 SHA512:
-  metadata.gz: f1907bf7d94ac2c8a2901056973ac4cddbf036bc4d2b76b4e31d60842409d7a6b4b3f6fb5534bb9b42d803506b9e4f4abc5e4c8914998a218c495198cb421fc1
-  data.tar.gz: 1ec12a7fd71286c3dd408fce0aea98d7bc3f4d01220f69156fc3f6cdaf3660bb9cb9262f8ab7fc0fea4d81011da1a2a3be934d4f9af9e4f99b7cf4b7c672060e
+  metadata.gz: 0ef662d17a2c8d1ae4e02a31b0e55892357835aaaa6bf8deecae803b21d835015b88b5c13c970f64b2310430e4d11cf6ee074ef364dd8ef76b5e199b041eaf62
+  data.tar.gz: a1ea9dc58acb19f24fd1f22ddcc8cbcb86351ac1b6a5c89baae0ac51599cf91a130fd0194621dd8e40a4019537173b44c60c590f6e46c51d5a7dc462749ab62c

data/README.textile

@@ -78,6 +78,12 @@ h2. Usage
 
 You can now use @I18n.t('Your String')@ to lookup translations in the database.
 
+h2. Missing Translations -> 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.
+
 h2. Examples
 
 * http://collectiveidea.com/blog/archives/2016/05/31/beyond-yml-files-dynamic-translations/

data/Rakefile

@@ -34,7 +34,7 @@ namespace :bundle do
   end
 
   task :install_all do
-    [nil, '3', '4', 'master'].each do |ar|
+    [nil, '3', '4', '5', 'master'].each do |ar|
       opt = ar && "AR=#{ar}"
       execute "rake bundle:install #{opt}"
     end

data/lib/i18n/active_record/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module ActiveRecord
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

data/lib/i18n/backend/active_record.rb

@@ -56,15 +56,24 @@ module I18n
           elsif result.first.key == key
             result.first.value
           else
-            chop_range = (key.size + FLATTEN_SEPARATOR.size)..-1
-            result = result.inject({}) do |hash, r|
-              hash[r.key.slice(chop_range)] = r.value
-              hash
+            result = result.inject({}) do |hash, translation|
+              hash.deep_merge build_translation_hash_by_key(key, translation)
             end
             result.deep_symbolize_keys
           end
         end
 
+        def build_translation_hash_by_key(lookup_key, translation)
+          hash = {}
+          chop_range = (lookup_key.size + FLATTEN_SEPARATOR.size)..-1
+          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|

data/test/active_record_test.rb

@@ -76,4 +76,16 @@ class I18nBackendActiveRecordTest < I18n::TestCase
 
     assert I18n::Backend::ActiveRecord.config.cleanup_with_destroy
   end
+
+  test "fetching subtree of translations" do
+    I18n::Backend::ActiveRecord::Translation.delete_all
+    I18n.backend.store_translations(:en, foo: { bar: { fizz: 'buzz', spuz: 'zazz' }, baz: { fizz: 'buzz' } })
+    assert_equal I18n.t(:foo), { bar: { fizz: 'buzz', spuz: 'zazz' }, baz: { fizz: 'buzz' } }
+  end
+
+  test "build_translation_hash_by_key" do
+    translation = I18n::Backend::ActiveRecord::Translation.new(value: 'translation', key: 'foo.bar.fizz.buzz')
+    expected_hash = { 'bar' => { 'fizz' => { 'buzz' => 'translation' } } }
+    assert_equal I18n.backend.send(:build_translation_hash_by_key, 'foo', translation), expected_hash
+  end
 end

data/test/test_helper.rb

@@ -19,7 +19,7 @@ rescue ::ActiveRecord::ConnectionNotEstablished
   when 'postgres'
     ::ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'i18n_unittest', username: ENV['PG_USER'] || 'i18n', password: '', host: 'localhost'
   when 'mysql'
-    ::ActiveRecord::Base.establish_connection adapter: 'mysql', database: 'i18n_unittest', username: 'root', password: '', host: 'localhost'
+    ::ActiveRecord::Base.establish_connection adapter: 'mysql2', database: 'i18n_unittest', username: 'root', password: '', host: 'localhost'
   else
     ::ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-active_record
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.5.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: I18n ActiveRecord backend