yaml-translator 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5efedd6c0d7d7ab451309c07e4a12d2368f4ae7
-  data.tar.gz: 2ce47bada38eaa653ab2c08edce3802ff76c7502
+  metadata.gz: 5387a0e1e5e1482632320ccf25455514f2c1fc96
+  data.tar.gz: ca5121bb2cae23d58858993569ec76685b9df661
 SHA512:
-  metadata.gz: 2e89577c0e8997d224141d13c152fcfd340d610215f245c54f63a38f46fa34fbd072a88661accebc6fb52b2ba0884de79620e3b327edce1d491df7ddadc52d64
-  data.tar.gz: fe40499add8f2425693a02d906f51a65878673063324cdf15f5203bf29715356afc9227dc5dba62a459e1fdb9d20b605d177d6663dbef7196fb805d2f43c4f1f
+  metadata.gz: e10f2395ce53bdb9460a04e40c5e7ba21208cb15f2118f7c4575530fccd3df87cc37be0f85d558fba212edd07faf2a3d22219efc194efb9b5e01c93f77219516
+  data.tar.gz: 16cf23202f4c212aaad45812cc53d55ca948ae501ff1596b82788c90f1515ef061e0f7832084cfc354a57ae7e073f167f3668dcca67bac1f8ef62b4a0da0aa5e

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 env:
   secure: "OPbJVv+xHdc56rzLDDpBiPsVtQ6Gmc7k4373BaZArjJbB1Dx34FHBNG0UoyF2XUKXVRs5TWgwbs9M4MDM9U13hv2VozT8/RaOkH48d2eHQ93vJX4P8vfR68AA73TV+LtJ7ktlkPp0JLJ54yfHVmANyOxRv2MIDSGGxg+m/FdaTssded4v0YF2dQSKCwfokwyVSCtAx8dsP0Q5UbOYKRDyjn5MR8xZWWiB9wmxuyTnhtKSyGASb+hO4aHll7pTYhebz1NViQhz0vB8BBP5AWdoi5LsToHi2obhu3+5f18pEfqtraJQJ2wa8ix3VaTuL5z1FHfxw2Etq9Eooa3sbrxvQEisSX+JpCPrxBNy4S4GcpXcc8Zg4b2IhLIww6EpDnOxod85N6Q1EzYvo5URxdM5bYVBNuFLjeVg8BSFGGYfebR/Xx4Zh5vDVWJlfkc7fbpGV4IGKUMHhTVSyT19TwTnJnKcahVZO9lChZFPj+SkTFp+SsdReJg3xnIOr+AuPuxqn2n9PPMMyvQng3VxWog7a2SP8Db6VTY5A1JPpOJXVEsNkHwqiUuE3nNLp6WFIXbYIzmJyYFmm5ij7aoaK/gcvDNHoGz/cPZrW+juIXKJC24Qk8hXrZPzEO54+e+M6qsR3p8TlpN5TSxPoeO0hET2cMX0xHFOHU+UnFDx1oTC0c="
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2
   - 2.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaml-translator (0.4.0)
+    yaml-translator (0.5.0)
       diff-lcs
       easy_translate
 

data/README.md

@@ -17,7 +17,7 @@ dir = File.dirname(__FILE__)
 adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
 translator = ::YamlTranslator::Translator.new(adapter)
 
-english_locale = ::YamlTranslator::Locale.load_file("#{dir}/en.yml")
+english_locale = ::YamlTranslator.load_file("#{dir}/en.yml")
 japanese_locale = english_locale.translate(translator, to: :ja)
 
 p japanese_locale.to_s # convert to japanese locale yaml format
@@ -37,8 +37,8 @@ The method of translating the difference is as follows.
 adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
 translator = ::YamlTranslator::Translator.new(adapter)
 
-before_english_locale = ::YamlTranslator::Locale.load_file("/path/to/before/en.yml")
-after_english_locale = ::YamlTranslator::Locale.load_file("/path/to/after/en.yml")
+before_english_locale = ::YamlTranslator.load_file("/path/to/before/en.yml")
+after_english_locale = ::YamlTranslator.load_file("/path/to/after/en.yml")
 
 diff_locale = before_english_locale.diff(after_english_locale)
 diff_japanese_locale = diff_locale.translate(translator, to: :ja)

data/example/locale.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'yaml'
+require 'yaml-translator'
+
+dir = File.dirname(__FILE__)
+english_locale1 = ::YamlTranslator.load_file("#{dir}/en.yml")
+english_locale2 = ::YamlTranslator.load_file("#{dir}/new.en.yml")
+
+diff_locale = english_locale1.diff(english_locale2)
+
+merged_locale = english_locale1.merge(diff_locale)
+merged_locale.save_to("/tmp")

data/example/new.en.yml

@@ -0,0 +1,3 @@
+en:
+  hello_world: 'Hello would'
+  hello_new_world: 'Hello would'

data/lib/yaml-translator.rb

@@ -1,5 +1,14 @@
 require 'yaml-translator/version'
+require 'yaml-translator/structure'
 require 'yaml-translator/locale'
 require 'yaml-translator/key_path'
 require 'yaml-translator/translator'
 require 'yaml-translator/adapters'
+
+module YamlTranslator
+  class << self
+    def load_file(file)
+      Locale.load_file(file)
+    end
+  end
+end

data/lib/yaml-translator/locale.rb

@@ -3,6 +3,7 @@ require 'diff/lcs'
 
 module YamlTranslator
   class Locale
+
     attr_reader :lang, :values
 
     def initialize(values, lang)
@@ -15,15 +16,21 @@ module YamlTranslator
     end
 
     def diff(other)
-      before_seq = flatten_hash.map { |k, v| "#{k}: #{v}" }
-      after_seq = other.flatten_hash.map { |k, v| "#{k}: #{v}" }
+      before_seq = to_single_key_hash.map { |k, v| "#{k}: #{v}" }
+      after_seq = other.to_single_key_hash.map { |k, v| "#{k}: #{v}" }
       diffs = Diff::LCS.diff(before_seq, after_seq).flatten.map do |operation|
         type, position, element = *operation
         next if type == '-'
         key, text = *element.split(':')
         [key, text.strip]
       end
-      Locale.new(Hash[diffs.compact], lang)
+      single_key_hash = Hash[diffs.compact]
+      Locale.new(single_key_hash.to_tree, lang)
+    end
+
+    def merge(locale)
+      merged = flatten_hash.merge(locale.flatten_hash)
+      Locale.new(merged.to_tree, lang)
     end
 
     def save(dir=Dir.pwd)
@@ -34,8 +41,8 @@ module YamlTranslator
       save(dir)
     end
 
-    def flatten_hash
-      flatten(values)
+    def to_single_key_hash
+      values.to_single_key
     end
 
     def to_s
@@ -52,21 +59,6 @@ module YamlTranslator
 
     private
 
-    # Covert to a flatten hash
-    def flatten(values={}, path=KeyPath.new)
-      result = {}
-      values.each_with_index do |(i, v)|
-        path.move_to(i)
-        if v.is_a?(Hash)
-          result.merge!(flatten(v, path))
-        else
-          result[path.to_s] = v
-        end
-        path.leave
-      end
-      result
-    end
-
     def write_file(file_path)
       File.write(file_path, to_s)
     end

data/lib/yaml-translator/structure.rb

@@ -0,0 +1,5 @@
+require 'yaml-translator/structure/tree'
+require 'yaml-translator/structure/single_key'
+
+Hash.include YamlTranslator::Structure::Tree
+Hash.include YamlTranslator::Structure::SingleKey

data/lib/yaml-translator/structure/single_key.rb

@@ -0,0 +1,27 @@
+module YamlTranslator
+  module Structure
+    module SingleKey
+      # Covert to a flatten hash
+      def to_single_key
+        compact_of(self, KeyPath.new)
+      end
+
+      private
+
+      # Covert to a flatten hash
+      def compact_of(values={}, path=KeyPath.new)
+        result = {}
+        values.each_with_index do |(i, v)|
+          path.move_to(i)
+          if v.is_a?(Hash)
+            result.merge!(compact_of(v, path))
+          else
+            result[path.to_s] = v
+          end
+          path.leave
+        end
+        result
+      end
+    end
+  end
+end

data/lib/yaml-translator/structure/tree.rb

@@ -0,0 +1,35 @@
+module YamlTranslator
+  module Structure
+    module Tree
+      def to_tree
+        tree_of(self)
+      end
+
+      private
+
+      # Returning the flattened structure to the tree structure
+      #
+      # @param [Hash] values flatten Hash
+      # @return [Hash] translated hash
+      def tree_of(values)
+        result = {}
+        current = result
+        values.each do |k, v|
+          keys = k.split('.')
+          last_key = keys.pop
+          keys.each do |ks|
+            current = if current.key?(ks)
+                        current[ks]
+                      else
+                        current[ks] = {}
+                        current[ks]
+                      end
+          end
+          current[last_key] = v
+          current = result
+        end
+        result
+      end
+    end
+  end
+end

data/lib/yaml-translator/translator.rb

@@ -2,6 +2,7 @@ require "yaml-translator/adapters"
 
 module YamlTranslator
   class Translator
+
     def initialize(adapter = Adapters::NoopAdaptor.new)
       @adapter = adapter
     end
@@ -11,34 +12,8 @@ module YamlTranslator
     # @param [Locale] locale of translate target
     # @return [Locale] locale
     def translate(locale, options={})
-      translated = @adapter.translate(locale.flatten_hash, options)
-      Locale.new(rebuild(translated), options[:to])
-    end
-
-    private
-
-    # Returning the flattened structure to the tree structure
-    #
-    # @param [Hash] values flatten Hash
-    # @return [Hash] translated hash
-    def rebuild(values)
-      result = {}
-      current = result
-      values.each do |k, v|
-        keys = k.split('.')
-        last_key = keys.pop
-        keys.each do |ks|
-          current = if current.key?(ks)
-                      current[ks]
-                    else
-                      current[ks] = {}
-                      current[ks]
-                    end
-        end
-        current[last_key] = v
-        current = result
-      end
-      result
+      translated = @adapter.translate(locale.to_single_key_hash, options)
+      Locale.new(translated.to_tree, options[:to])
     end
   end
 end

data/lib/yaml-translator/version.rb

@@ -1,3 +1,3 @@
 module YamlTranslator
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/yaml-translator/locale_spec.rb

@@ -13,7 +13,7 @@ describe YamlTranslator::Locale do
   describe '#diff' do
     let(:before_locale) { load_locale('diff/before/en') }
     let(:after_locale) { load_locale('diff/after/en') }
-    let(:flatten_hash) do
+    let(:single_key_hash) do
       {
         'en.foo1.foo3' => 'foo1-3'
       }
@@ -21,12 +21,12 @@ describe YamlTranslator::Locale do
     it 'should be return flatten hash' do
       diff_locale = before_locale.diff(after_locale)
       expect(diff_locale.lang).to eq('en')
-      expect(diff_locale.flatten_hash).to eq(flatten_hash)
+      expect(diff_locale.to_single_key_hash).to eq(single_key_hash)
     end
   end
 
-  describe '#flatten_hash' do
-    let(:flatten_hash) do
+  describe '#to_single_key_hash' do
+    let(:single_key_hash) do
       {
         'en.bar' => 'bar',
         'en.foo'=> 'foo',
@@ -35,7 +35,7 @@ describe YamlTranslator::Locale do
       }
     end
     it 'should be return flatten hash' do
-      expect(locale.flatten_hash).to eq(flatten_hash)
+      expect(locale.to_single_key_hash).to eq(single_key_hash)
     end
   end
   describe '#to_s' do

data/spec/yaml-translator/structure/single_key.rb

@@ -0,0 +1,8 @@
+describe YamlTranslator::Structure::SingleKey do
+  let(:tree) { { en: { foo: 'bar' } } }
+  describe '#to_single_key' do
+    it 'should be return single key hash' do
+      expect(tree.to_single_key).to eq({ 'en.foo' => 'bar' })
+    end
+  end
+end

data/spec/yaml-translator/structure/tree_spec.rb

@@ -0,0 +1,8 @@
+describe YamlTranslator::Structure::Tree do
+  let(:single_key) { { 'en.foo' => 'bar' } }
+  describe '#to_tree' do
+    it 'should be return tree hash' do
+      expect(single_key.to_tree.to_s).to eq({ 'en' => { 'foo' => 'bar' } }.to_s)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-translator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Noritaka Horio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_translate
@@ -155,6 +155,8 @@ files:
 - Rakefile
 - example/en.yml
 - example/google_translate.rb
+- example/locale.rb
+- example/new.en.yml
 - lib/yaml-translator.rb
 - lib/yaml-translator/adapters.rb
 - lib/yaml-translator/adapters/base_adapter.rb
@@ -162,6 +164,9 @@ files:
 - lib/yaml-translator/adapters/noop_adapter.rb
 - lib/yaml-translator/key_path.rb
 - lib/yaml-translator/locale.rb
+- lib/yaml-translator/structure.rb
+- lib/yaml-translator/structure/single_key.rb
+- lib/yaml-translator/structure/tree.rb
 - lib/yaml-translator/translator.rb
 - lib/yaml-translator/version.rb
 - spec/fixtures/diff/after/en.yml
@@ -172,6 +177,8 @@ files:
 - spec/helpers/locale_helper.rb
 - spec/spec_helper.rb
 - spec/yaml-translator/locale_spec.rb
+- spec/yaml-translator/structure/single_key.rb
+- spec/yaml-translator/structure/tree_spec.rb
 - spec/yaml-translator/translator_spec.rb
 - yaml-translator.gemspec
 homepage: https://github.com/holyshared/yaml-translator
@@ -207,4 +214,6 @@ test_files:
 - spec/helpers/locale_helper.rb
 - spec/spec_helper.rb
 - spec/yaml-translator/locale_spec.rb
+- spec/yaml-translator/structure/single_key.rb
+- spec/yaml-translator/structure/tree_spec.rb
 - spec/yaml-translator/translator_spec.rb