i18n-tasks 0.3.11 → 0.4.0.beta1

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

@@ -0,0 +1,81 @@
+module I18n::Tasks::Data::Tree
+  # Any Enumerable that yields nodes can mix in this module
+  module Traversal
+
+    def nodes(&block)
+      walk_depth_first(&block)
+    end
+
+    def leaves(&visitor)
+      return to_enum(:leaves) unless visitor
+      nodes do |node|
+        visitor.yield(node) if node.leaf?
+      end
+    end
+
+    # @param root include root in full key
+    def keys(root: true, &visitor)
+      return to_enum(:keys, root: root) unless visitor
+      leaves { |node| visitor.yield(node.full_key(root: root), node) }
+    end
+
+    def levels(&block)
+      return to_enum(:levels) unless block
+      nodes    = to_nodes
+      non_null = nodes.reject(&:null?)
+      unless non_null.empty?
+        block.yield non_null
+        Nodes.new(nodes.children).levels(&block)
+      end
+    end
+
+    def walk_breadth_first(&visitor)
+      return to_enum(:walk_breadth_first) unless visitor
+      levels do |nodes|
+        nodes.each { |node| visitor.yield(node) unless node.null? }
+      end
+    end
+
+    def walk_depth_first(&visitor)
+      return to_enum(:walk_depth_first) unless visitor
+      each { |node|
+        visitor.yield node unless node.null?
+        node.children.each do |child|
+          child.walk_depth_first(&visitor)
+        end if node.children?
+      }
+    end
+
+    #-- modify / derive
+
+    # @return Siblings
+    def select_nodes(&block)
+      result = Node.new(children: [])
+      each do |node|
+        if block.yield(node)
+          result.append!(
+              node.derive(
+                  parent:   result  ,
+                  children: (node.children.select_nodes(&block) if node.children)
+              )
+          )
+        end
+      end
+      result.children
+    end
+
+    # @return Siblings
+    def select_keys(root: true, &block)
+      ok = {}
+      keys(root: root) do |full_key, node|
+        if block.yield(full_key, node)
+          node.walk_to_root { |p|
+            break if ok[p]
+            ok[p] = true
+          }
+        end
+      end
+      select_nodes { |node| ok[node] }
+    end
+  end
+end

data/lib/i18n/tasks/file_structure.rb

@@ -0,0 +1,18 @@
+module I18n::Tasks::FileStructure
+  def identify(routes = data.config.read)
+
+  end
+
+
+  class NonLeafVisitor
+    def visit(node)
+      puts "non-leaf: #{node}"
+    end
+  end
+
+  class LeafVisitor
+    def visit(node)
+      puts "leaf: #{node}"
+    end
+  end
+end

data/lib/i18n/tasks/missing_keys.rb

@@ -41,11 +41,11 @@ module I18n::Tasks
       return keys_missing_from_base if locale == base_locale
       @keys_missing_from_locale         ||= {}
       @keys_missing_from_locale[locale] ||= begin
-        keys = data[base_locale].traverse_map_if { |key, base_value|
-          next if ignore_key?(key, :missing)
+        keys = data[base_locale].keys(root: false).map { |key, node|
           key = depluralize_key(key, locale)
-          key if !key_value?(key, locale)
-        }.uniq
+          next if ignore_key?(key, :missing) || key_value?(key, locale)
+          key
+        }.compact.uniq
         KeyGroup.new keys, type: :missing_from_locale, locale: locale
       end
     end
@@ -54,9 +54,9 @@ module I18n::Tasks
     def keys_eq_base(locale)
       @keys_eq_base         ||= {}
       @keys_eq_base[locale] ||= begin
-        keys = data[base_locale].traverse_map_if { |key, base_value|
-          key if base_value == t(key, locale) && !ignore_key?(key, :eq_base, locale)
-        }
+        keys = data[base_locale].keys(root: false).map { |key, node|
+          key if node.value == t(key, locale) && !ignore_key?(key, :eq_base, locale)
+        }.compact
         KeyGroup.new keys, type: :eq_base, locale: locale
       end
     end

data/lib/i18n/tasks/plural_keys.rb

@@ -5,11 +5,11 @@ module I18n::Tasks::PluralKeys
   # @param [String] locale to pull key data from
   # @return the base form if the key is a specific plural form (e.g. apple for apple.many), and the key as passed otherwise
   def depluralize_key(key, locale = base_locale)
-    return key if key !~ PLURAL_KEY_RE || t(key, locale).is_a?(Hash)
-    parent_key      = key.split('.')[0..-2] * '.'
-    plural_versions = t(parent_key, locale) || (locale != base_locale && t(parent_key, base_locale))
-    if plural_versions.is_a?(Hash) && plural_versions.all? { |k, v| !v.is_a?(Hash) && ".#{k}" =~ PLURAL_KEY_RE }
-      parent_key
+    return key if key !~ PLURAL_KEY_RE
+    node = node(key, locale)
+    nodes = node.try(:siblings).presence || (locale != base_locale && node(key, base_locale).try(:siblings))
+    if nodes && nodes.all? { |x| x.leaf? && ".#{x.key}" =~ PLURAL_KEY_RE }
+      key.split('.')[0..-2] * '.'
     else
       key
     end

data/lib/i18n/tasks/unused_keys.rb

@@ -8,11 +8,11 @@ module I18n
       def unused_keys(locale = base_locale)
         @unused_keys         ||= {}
         @unused_keys[locale] ||= begin
-          keys = data[locale].traverse_map_if { |key, value|
+          keys = data[locale].keys(root: false).map { |key, value|
             next if used_in_expr?(key) || ignore_key?(key, :unused)
             key = depluralize_key(key, locale)
-            [key, value] unless used_key?(key)
-          }.uniq
+            key unless used_key?(key)
+          }.compact.uniq
           KeyGroup.new keys, locale: locale, type: :unused
         end
       end
@@ -21,10 +21,9 @@ module I18n
         locales ||= self.locales
         unused  = unused_keys
         locales.each do |locale|
-          used_key_values = data[locale].traverse_map_if { |key, value|
-            [key, value] unless unused.include?(depluralize_key(key, locale))
+          data[locale] = data[locale].select_keys(root: false) { |key, value|
+            !unused.include?(depluralize_key(key, locale))
           }
-          data[locale] = used_key_values
         end
       end
     end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.3.11'
+    VERSION = '0.4.0.beta1'
   end
 end

data/spec/conservative_router_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'Conservative router' do
+  describe '#available_locales' do
+    before do
+      TestCodebase.setup(
+          'config/locales/en.yml'       => {en: {a: 1}}.to_yaml,
+          'config/locales/other.en.yml' => {en: {b: 1}}.to_yaml,
+          'config/locales/es.yml'       => {es: {}}.to_yaml,
+          'config/locales/other.es.yml' => {es: {c: 1}}.to_yaml
+      )
+    end
+    after do
+      TestCodebase.teardown
+    end
+    let(:data) {
+      I18n::Tasks::Data::FileSystem.new(
+          router:      'conservative_router',
+          base_locale: 'en',
+          read:        'config/locales/*%{locale}.yml',
+          write:       ['config/locales/not_found.%{locale}.yml']
+      )
+    }
+
+    it 'preserves existing keys' do
+      TestCodebase.in_test_app_dir do
+        data['es'] = data['es']
+        data.reload
+        data['es']['es.c'].data[:path].should == 'config/locales/other.es.yml'
+      end
+    end
+
+    it 'infers new keys from base locale' do
+      TestCodebase.in_test_app_dir do
+        data['es'] = data['es'].merge!(build_tree(es: {a: 1, b: 2}))
+        data.reload
+        data['es']['es.a'].data[:path].should == 'config/locales/es.yml'
+        data['es']['es.b'].data[:path].should == 'config/locales/other.es.yml'
+      end
+    end
+
+    it 'falls back to pattern_router when the key is new' do
+      TestCodebase.in_test_app_dir do
+        data['es'] = data['es'].merge!(build_tree(es: {z: 2}))
+        data.reload
+        data['es']['es.z'].data[:path].should == 'config/locales/not_found.es.yml'
+      end
+    end
+  end
+end

data/spec/file_system_data_spec.rb

@@ -45,7 +45,8 @@ describe 'File system i18n' do
           'c.yml' => {en: {c: 1}}.stringify_keys.to_yaml
       )
       TestCodebase.in_test_app_dir {
-        expect(data[:en].data.symbolize_keys).to eq(a: 1, b: 1, c: 1)
+        actual = data[:en].to_hash['en'].symbolize_keys
+        expect(actual).to eq(a: 1, b: 1, c: 1)
       }
     end
 
@@ -55,7 +56,7 @@ describe 'File system i18n' do
       locale_data = {'pizza' => keys, 'sushi' => keys}
       TestCodebase.setup
       TestCodebase.in_test_app_dir {
-        data[:en] = locale_data
+        data[:en] = data[:en].merge!('en' => locale_data)
         files     = %w(pizza.en.yml sushi.en.yml)
         Dir['*.yml'].sort.should == files.sort
         files.each { |f| YAML.load_file(f)['en'].should == {File.basename(f, '.en.yml') => keys} }
@@ -80,7 +81,7 @@ describe 'File system i18n' do
           'c.json' => {en: {c: 1}}.stringify_keys.to_json
       )
       TestCodebase.in_test_app_dir {
-        expect(data[:en].data.symbolize_keys).to eq(a: 1, b: 1, c: 1)
+        expect(data[:en].to_hash['en'].symbolize_keys).to eq(a: 1, b: 1, c: 1)
       }
     end
 
@@ -90,7 +91,7 @@ describe 'File system i18n' do
       locale_data = {'pizza' => keys, 'sushi' => keys}
       TestCodebase.setup
       TestCodebase.in_test_app_dir {
-        data[:en] = locale_data
+        data[:en] = data[:en].merge!('en' => locale_data)
         files     = %w(pizza.en.json sushi.en.json)
         Dir['*.json'].sort.should == files.sort
         files.each { |f| JSON.parse(File.read f)['en'].should == {File.basename(f, '.en.json') => keys} }

data/spec/google_translate_spec.rb

@@ -33,9 +33,9 @@ describe 'Google Translation' do
 
         it 'works' do
           in_test_app_dir do
-            task.data[:en] = {'common' => {'hello' => TEST_STRING}}
+            task.data[:en] = build_tree('en' => {'common' => {'hello' => TEST_STRING}})
             cmd.translate_missing
-            expect(task.data[:es].t('common.hello')).to eq(TEST_RESULT)
+            expect(task.t('common.hello', 'es')).to eq(TEST_RESULT)
           end
         end
       end

data/spec/i18n_tasks_spec.rb

@@ -9,7 +9,7 @@ describe 'i18n-tasks' do
   describe 'missing' do
     let (:expected_missing_keys) {
       %w( en.used_but_missing.key en.relative.index.missing
-          es.missing_in_es.a es.blank_in_es.a es.same_in_es.a
+          es.missing_in_es.a es.same_in_es.a
           en.hash.pattern_missing.a en.hash.pattern_missing.b
           en.missing_symbol_key en.missing_symbol.key_two en.missing_symbol.key_three
           es.missing_in_es_plural_1.a es.missing_in_es_plural_2.a)

data/spec/locale_tree/siblings_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'Tree siblings / forest' do
+
+  context 'a tree' do
+    let(:a_hash) { {a: 1, b: {ba: 1, bb: 2}}.deep_stringify_keys }
+
+    it '::from_nested_hash' do
+      a = build_tree(a_hash)
+      expect(a.to_hash).to eq(a_hash)
+    end
+
+    it '#derive' do
+      a = build_tree(a_hash)
+      b = a.derive.append! build_tree(c: 1)
+
+      # a was not modified
+      expect(a.to_hash).to eq(a_hash)
+      # but b was
+      expect(b.to_hash).to eq(a_hash.merge('c' => 1))
+    end
+
+    it '#merge' do
+      a = build_tree(a_hash)
+      b_hash = {b: {bc: 1}, c: 1}.deep_stringify_keys
+      expect(a.merge(build_tree(b_hash)).to_hash).to eq(a_hash.deep_merge(b_hash))
+    end
+  end
+end

data/spec/plural_keys_spec.rb

@@ -5,7 +5,7 @@ describe 'Plural keys' do
   before do
     TestCodebase.setup('config/locales/en.yml' => '')
     TestCodebase.in_test_app_dir do
-      task.data['en'] = {
+      tree = ::I18n::Tasks::Data::Tree::Siblings.from_nested_hash('en' => {
           'regular_key'       => 'a',
           'plural_key'        => {
               'one' => 'one', 'other' => '%{count}'
@@ -14,7 +14,8 @@ describe 'Plural keys' do
               'one'   => 'a',
               'green' => 'b'
           }
-      }
+      })
+      task.data['en'] = tree
       task.data['en']
     end
   end

data/spec/spec_helper.rb

@@ -19,4 +19,5 @@ Dir['spec/support/**/*.rb'].each { |f| require "./#{f}" }
 RSpec.configure do |config|
   config.include FixturesSupport
   config.include CaptureStd
+  config.include Trees
 end

data/spec/support/trees.rb

@@ -0,0 +1,5 @@
+module Trees
+  def build_tree(hash)
+    I18n::Tasks::Data::Tree::Siblings.from_nested_hash(hash)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0.beta1
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".jrubyrc"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -200,6 +201,8 @@ files:
 - README.md
 - Rakefile
 - bin/i18n-tasks
+- config/locales/en.yml
+- config/locales/es.yml
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
@@ -212,8 +215,13 @@ files:
 - lib/i18n/tasks/data/file_formats.rb
 - lib/i18n/tasks/data/file_system.rb
 - lib/i18n/tasks/data/file_system_base.rb
-- lib/i18n/tasks/data/locale_tree.rb
-- lib/i18n/tasks/data/router.rb
+- lib/i18n/tasks/data/router/conservative_router.rb
+- lib/i18n/tasks/data/router/pattern_router.rb
+- lib/i18n/tasks/data/tree/node.rb
+- lib/i18n/tasks/data/tree/nodes.rb
+- lib/i18n/tasks/data/tree/siblings.rb
+- lib/i18n/tasks/data/tree/traversal.rb
+- lib/i18n/tasks/file_structure.rb
 - lib/i18n/tasks/fill_tasks.rb
 - lib/i18n/tasks/google_translation.rb
 - lib/i18n/tasks/ignore_keys.rb
@@ -236,6 +244,7 @@ files:
 - lib/i18n/tasks/unused_keys.rb
 - lib/i18n/tasks/used_keys.rb
 - lib/i18n/tasks/version.rb
+- spec/conservative_router_spec.rb
 - spec/file_system_data_spec.rb
 - spec/fixtures/app/assets/javascripts/application.js
 - spec/fixtures/app/controllers/events_controller.rb
@@ -247,6 +256,7 @@ files:
 - spec/i18n_tasks_spec.rb
 - spec/key_group_spec.rb
 - spec/key_pattern_matching_spec.rb
+- spec/locale_tree/siblings_spec.rb
 - spec/pattern_scanner_spec.rb
 - spec/plural_keys_spec.rb
 - spec/readme_spec.rb
@@ -257,6 +267,7 @@ files:
 - spec/support/i18n_tasks_output_matcher.rb
 - spec/support/key_pattern_matcher.rb
 - spec/support/test_codebase.rb
+- spec/support/trees.rb
 - spec/used_keys_spec.rb
 homepage: https://github.com/glebm/i18n-tasks
 licenses:
@@ -274,17 +285,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manage translations in ruby applications with the awesome power of static
   analysis — Edit
 test_files:
+- spec/conservative_router_spec.rb
 - spec/file_system_data_spec.rb
 - spec/fixtures/app/assets/javascripts/application.js
 - spec/fixtures/app/controllers/events_controller.rb
@@ -296,6 +308,7 @@ test_files:
 - spec/i18n_tasks_spec.rb
 - spec/key_group_spec.rb
 - spec/key_pattern_matching_spec.rb
+- spec/locale_tree/siblings_spec.rb
 - spec/pattern_scanner_spec.rb
 - spec/plural_keys_spec.rb
 - spec/readme_spec.rb
@@ -306,5 +319,6 @@ test_files:
 - spec/support/i18n_tasks_output_matcher.rb
 - spec/support/key_pattern_matcher.rb
 - spec/support/test_codebase.rb
+- spec/support/trees.rb
 - spec/used_keys_spec.rb
 has_rdoc: