yaml-translator 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c3823177cd2f7fc6b6ac035050c40ee885962c9
-  data.tar.gz: 127e2ee94b6e7424827ffbe1504a8813d5d6c075
+  metadata.gz: da4cda7e0c0b4e1d18d9263bc51e018e660b0902
+  data.tar.gz: 66dbc7e06c1561486815e1e0c266cbaf54146057
 SHA512:
-  metadata.gz: bf35cb1c0a3c2b55bdf0d30e1c2d6c29108479beccc2400ffcb52373206f96c2a815de35c96e551b9a1eef95501795b83bc1c89f31a91a6989e7dd38f98cb31c
-  data.tar.gz: 9a610c0172e17f92cfd0eb42290d95fcd6d9d35d561410e053961d54722160157030857d47a3c5a406d851e42b31bbe5c684c76758c1a08dfee828514a1171ad
+  metadata.gz: 92b3ccd4969f1df29d8a95b7110e2ecf24d04fb0066b5803e5ace67193a92ad3d6ba99c8992adb4b413c61bb317c6c543efe3016870a808df441de16ff9e2fe2
+  data.tar.gz: ac073cf2fb71577ecc7376c5e1a4799c8de9ad37668220543e9f120f02284e01b62ff2bb58cf25daaa697c0cbbfa54cb081293772ed1e71fdf9bd55c13d92392

data/Gemfile.lock

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

data/README.md

@@ -48,6 +48,13 @@ diff_locale = translator.file("/path/to/before/en.yml").diff("/path/to/after/en.
 diff_locale.to(:ja).save
 ```
 
+translate into multiple languages
+
+```ruby
+diff_locale = translator.file("/path/to/before/en.yml").diff("/path/to/after/en.yml")
+diff_locale.all(%w(ja en)).each { |r| r.save }
+```
+
 ## Run the test
 
 	bundle install

data/lib/yaml-translator.rb

@@ -1,5 +1,4 @@
 require 'yaml-translator/version'
-require 'yaml-translator/structure'
 require 'yaml-translator/locale'
 require 'yaml-translator/context'
 require 'yaml-translator/key_path'

data/lib/yaml-translator/adapters/google_translate_adapter.rb

@@ -3,6 +3,9 @@ require 'easy_translate'
 module YamlTranslator
   module Adapters
     class GoogleTranslateAdapter < BaseAdapter
+      # Translate for locale texts
+      # @param [Hash] locale texts of translate target
+      # @return [Hash] locale texts
       def translate(values, options={})
         keys = []
         texts = []

data/lib/yaml-translator/adapters/noop_adapter.rb

@@ -1,6 +1,9 @@
 module YamlTranslator
   module Adapters
     class NoopAdapter < BaseAdapter
+      # Always return the text before translation
+      # @param [Hash] locale texts of translate target
+      # @return [Hash] locale texts
       def translate(values, options={})
         values
       end

data/lib/yaml-translator/context.rb

@@ -4,8 +4,13 @@ module YamlTranslator
       @locale = locale
       @translator = translator
     end
-    def to(lang)
-      @translator.translate(@locale, to: lang)
+
+    def to(target)
+      @locale.translate(@translator, to: target)
+    end
+
+    def all(targets)
+      targets.map { |target| @locale.translate(@translator, to: target) }
     end
   end
 

data/lib/yaml-translator/locale.rb

@@ -1,37 +1,50 @@
 require 'yaml'
+require 'ostruct'
 require 'diff/lcs'
 
 module YamlTranslator
-  class Locale
+  class Locale < OpenStruct
+    attr_reader :lang
 
-    attr_reader :lang, :values
+    class << self
+      def load(s)
+        self.new(YAML.load(s))
+      end
 
-    def initialize(values, lang)
-      @lang = lang
-      @values = values
+      def load_file(file)
+        load(File.open(file, &:read))
+      end
+    end
+
+    def initialize(config)
+      super(config)
+      @lang = config.keys.first.to_sym # FIXME check support language
     end
 
     def translate(translator, options={})
-      translator.translate(self, options)
+      result = {}
+      values = to_h
+      translated_values = translator.translate(compact_of(values[@lang]), options)
+      result[options[:to]] = tree_of(translated_values)
+      Locale.new(result)
     end
 
-    def diff(other)
+    def diff(other_locale)
       before_seq = to_single_key_hash.map { |k, v| "#{k}: #{v}" }
-      after_seq = other.to_single_key_hash.map { |k, v| "#{k}: #{v}" }
+      after_seq = other_locale.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
-      single_key_hash = Hash[diffs.compact]
-      Locale.new(single_key_hash.to_tree, lang)
+      Locale.new(tree_of(Hash[diffs.compact]))
     end
 
-    def merge(locale)
+    def merge(other_locale)
       s = to_single_key_hash
-      o = locale.to_single_key_hash
-      Locale.new(s.merge(o).to_tree, lang)
+      o = other_locale.to_single_key_hash
+      Locale.new(tree_of(s.merge(o)))
     end
 
     def merge_to(locale)
@@ -56,27 +69,55 @@ module YamlTranslator
       save(dir)
     end
 
+    # Covert to a flatten hash
     def to_single_key_hash
-      values.to_single_key
+      compact_of(to_h, KeyPath.new)
     end
 
     def to_s
-      YAML.dump(values)
+      YAML.dump(tree_of(compact_of(to_h)))
     end
 
-    class << self
-      def load(s)
-        yaml = YAML.load(s)
-        lang = yaml.keys.first # FIXME check support language
-        self.new(yaml, lang)
-      end
+    private
 
-      def load_file(file)
-        load(File.open(file, &:read))
+    # 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
 
-    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.to_s.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
 
     def write_file(file_path)
       File.write(file_path, to_s)

data/lib/yaml-translator/translator.rb

@@ -12,16 +12,10 @@ module YamlTranslator
 
     # Translate target
     #
-    # @param [Locale] locale of translate target
-    # @return [Locale] locale
-    def translate(locale, options={})
-      translated = @adapter.translate(locale.to_single_key_hash, options)
-      translated_tree = translated.to_tree
-
-      result = {}
-      result[options[:to].to_s] = translated_tree[locale.lang]
-
-      Locale.new(result, options[:to])
+    # @param [Hash] locale texts of translate target
+    # @return [Hash] locale texts
+    def translate(locale_texts, options={})
+      @adapter.translate(locale_texts, options)
     end
 
     def string(s)

data/lib/yaml-translator/version.rb

@@ -1,3 +1,3 @@
 module YamlTranslator
-  VERSION = '0.8.4'
+  VERSION = '0.9.0'
 end

data/spec/yaml-translator/context_spec.rb

@@ -0,0 +1,16 @@
+describe YamlTranslator::Context do
+  let(:lang_file) { File.join(File.dirname(__FILE__), '/../fixtures/en.yml') }
+  let(:locale) { YamlTranslator::Locale.load_file(lang_file) }
+  let(:adapter) { YamlTranslator::Adapters::NoopAdapter.new }
+  let(:translator) { YamlTranslator::Translator.new(adapter) }
+
+  describe '#all' do
+    let(:context) { YamlTranslator::Context.new(locale, translator) }
+    subject { context.all(%w(ja en)) }
+    it 'should be translate all' do
+      expect(subject.size).to eq(2)
+      expect(subject[0].lang).to eq(:ja)
+      expect(subject[1].lang).to eq(:en)
+    end
+  end
+end

data/spec/yaml-translator/locale_spec.rb

@@ -13,7 +13,7 @@ describe YamlTranslator::Locale do
   describe '#load' do
     it 'should be load from string' do
       locale = YamlTranslator::Locale.load(lang_file_content)
-      expect(locale.lang).to eq('en')
+      expect(locale.lang).to eq(:en)
     end
   end
 
@@ -27,7 +27,7 @@ describe YamlTranslator::Locale do
     end
     it 'should be return flatten hash' do
       diff_locale = before_locale.diff(after_locale)
-      expect(diff_locale.lang).to eq('en')
+      expect(diff_locale.lang).to eq(:en)
       expect(diff_locale.to_single_key_hash).to eq(single_key_hash)
     end
   end
@@ -50,14 +50,14 @@ describe YamlTranslator::Locale do
     let(:merge_target_file) { File.join(File.dirname(__FILE__), '/../fixtures/merge_target.yml') }
     it 'should be merge to yaml file' do
       merged = locale.merge_to_file(merge_target_file)
-      expect(merged.values['en']['target']).to eq('bar')
+      expect(merged['en']['target']).to eq('bar')
     end
   end
 
   describe '#merge_to_s' do
     it 'should be merge to yaml formatted string' do
       merged = locale.merge_to_s("---\nen:\n  merge_to_s: ok?")
-      expect(merged.values['en']['merge_to_s']).to eq('ok?')
+      expect(merged['en']['merge_to_s']).to eq('ok?')
     end
   end
 

data/spec/yaml-translator/translator_spec.rb

@@ -7,7 +7,7 @@ describe YamlTranslator::Translator do
       it 'translate files' do
         result = translator.file(path).to(:ja)
         expect(result.lang).to eq(:ja)
-        expect(result.values).to eq(expected_locale.values)
+        expect(result.config).to eq(expected_locale.config)
       end
     end
     context 'when zh-CN' do
@@ -16,7 +16,7 @@ describe YamlTranslator::Translator do
       it 'translate files' do
         result = translator.file(path).to(:'zh-CN')
         expect(result.lang).to eq(:'zh-CN')
-        expect(result.values).to eq(expected_locale.values)
+        expect(result.config).to eq(expected_locale.config)
       end
     end
   end
@@ -28,7 +28,7 @@ describe YamlTranslator::Translator do
       it 'translate yaml string' do
         result = translator.string(yaml_source).to(:ja)
         expect(result.lang).to eq(:ja)
-        expect(result.values).to eq(expected_locale.values)
+        expect(result.config).to eq(expected_locale.config)
       end
     end
     context 'when zh-CN' do
@@ -37,7 +37,7 @@ describe YamlTranslator::Translator do
       it 'translate yaml string' do
         result = translator.string(yaml_source).to(:'zh-CN')
         expect(result.lang).to eq(:'zh-CN')
-        expect(result.values).to eq(expected_locale.values)
+        expect(result.config).to eq(expected_locale.config)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-translator
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Noritaka Horio
@@ -165,9 +165,6 @@ files:
 - lib/yaml-translator/context.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
@@ -178,9 +175,8 @@ files:
 - spec/fixtures/zh-CN.yml
 - spec/helpers/locale_helper.rb
 - spec/spec_helper.rb
+- spec/yaml-translator/context_spec.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
 - spec/yaml_translator_spec.rb
 - yaml-translator.gemspec
@@ -217,8 +213,7 @@ test_files:
 - spec/fixtures/zh-CN.yml
 - spec/helpers/locale_helper.rb
 - spec/spec_helper.rb
+- spec/yaml-translator/context_spec.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
 - spec/yaml_translator_spec.rb

data/lib/yaml-translator/structure.rb

@@ -1,5 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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/spec/yaml-translator/structure/single_key.rb

@@ -1,8 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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