i18n-tasks 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0268bd9f81bcf59f191082abc4d7659858b01307
-  data.tar.gz: 0feb0bd995b09220bb7ae0843a3cc67c01cfd938
+  metadata.gz: 6c261d8b23e8817ba86c745be24cb3fa56c96443
+  data.tar.gz: 2228dcb943e500a2c901bcdb3b0a9fa292de6ef7
 SHA512:
-  metadata.gz: 3514ce68ee51f2b90028fbb87cd5b1e249cc66ebe41f9b746e65d39e87b00b2a372099f8e3d2abf9f28e829d0e8cb8d6fc68f64c6ac6c25f029aa307d8b37c5e
-  data.tar.gz: 339eec064e4f2fa5b52182113aafe7f819ef2c5d1917901556a0f3d228e85ef661afb640876677b653fdfb1327adc0539ab447e3d2b8c41f8c0fe3327e148d8a
+  metadata.gz: 361d00affbc2d10ca407b86b40c6c46a28b79d9bfaf0102ff4cce08b82b9fdd11aee1c45a43ab0de60b7208094eacdff97ec7cacab1742bdc41f05ee620e435a
+  data.tar.gz: e38f00ef20108497b456c8a8039d33d9593bde583543fe6773a90a206662a6d1b7a441861c33e138ef092dd453a1c25870a80ad76486e1aafec1485093246717

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.5.3
+
+* Fix Google translate regression
+* More robust config output
+
 ## 0.5.2
 
 * Ignore lines during search with `config.search.ignore_lines`. Ignores comments by default.

data/README.md

@@ -18,7 +18,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.5.2'
+gem 'i18n-tasks', '~> 0.5.3'
 ```
 
 
@@ -331,13 +331,11 @@ describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
 
   it 'does not have missing keys' do
-    count = i18n.missing_keys.leaves.count
-    fail "There are #{count} missing i18n keys! Run 'i18n-tasks missing' for more details." unless count.zero?
+    expect(i18n.missing_keys).to be_empty
   end
 
   it 'does not have unused keys' do
-    count = i18n.unused_keys.leaves.count
-    fail "There are #{count} unused i18n keys! Run 'i18n-tasks unused' for more details." unless count.zero?
+    expect(i18n.unused_keys).to be_empty
   end
 end
 ```

data/lib/i18n/tasks/configuration.rb

@@ -106,14 +106,23 @@ module I18n::Tasks::Configuration
   end
 
   def config_for_inspect
-    # hide empty sections, stringify keys
-    Hash[config_sections.reject { |k, v| v.nil? || v.empty? }.map { |k, v|
-      [k.to_s, v.respond_to?(:deep_stringify_keys) ? v.deep_stringify_keys.to_hash : v] }].tap do |h|
-      h.each do |_k, v|
-        if v.is_a?(Hash) && v.key?('config')
-          v.merge! v.delete('config')
-        end
+    to_hash_from_indifferent(config_sections.deep_stringify_keys.reject { |k, v| v.blank? }).tap do |sections|
+      sections.each do |_k, section|
+        section.merge! section.delete('config') if Hash === section && section.key?('config')
       end
     end
   end
+
+  private
+
+  def to_hash_from_indifferent(v)
+    case v
+      when Hash
+        v.to_hash
+      when Array
+        v.map { |e| to_hash_from_indifferent e }
+      else
+        v
+    end
+  end
 end

data/lib/i18n/tasks/data/tree/node.rb

@@ -46,7 +46,8 @@ module I18n::Tasks::Data::Tree
 
     def each(&block)
       return to_enum(:each) { 1 } unless block
-      [self].each(&block)
+      block.yield(self)
+      self
     end
 
     include Enumerable

data/lib/i18n/tasks/fill_tasks.rb

@@ -20,7 +20,7 @@ module I18n::Tasks
         keys   = missing_tree(locale, from).key_names.map(&:to_s)
         values = google_translate(keys.zip(keys.map(&t_proc(from))), to: locale, from: from).map(&:last)
 
-        data[locale] = Data::Tree::Node.new(
+        data[locale] = data[locale].merge! Data::Tree::Node.new(
             key: locale,
             children: Data::Tree::Siblings.from_flat_pairs(keys.zip(values))
         ).to_siblings

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module I18n
   module Tasks
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 end

data/spec/google_translate_spec.rb

@@ -40,13 +40,21 @@ describe 'Google Translation' do
           in_test_app_dir do
             task.data[:en] = build_tree('en' => {
                 'common' => {
+                    'a' => 'λ',
                     'hello' => text_test[1],
                     'hello_html' => html_test[1]
                 }
             })
+            task.data[:es] = build_tree('es' =>{
+                'common' => {
+                    'a' => 'λ',
+                }
+            })
+
             cmd.translate_missing
             expect(task.t('common.hello', 'es')).to eq(text_test[2])
             expect(task.t('common.hello_html', 'es')).to eq(html_test[2])
+            expect(task.t('common.a', 'es')).to eq('λ')
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - glebm