yaml-translator 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5387a0e1e5e1482632320ccf25455514f2c1fc96
-  data.tar.gz: ca5121bb2cae23d58858993569ec76685b9df661
+  metadata.gz: 615a90101e9d6e0174bbe05202ae96270cb5aac7
+  data.tar.gz: 5f4087a2954b3e0225bab4c199101fe1a531fac9
 SHA512:
-  metadata.gz: e10f2395ce53bdb9460a04e40c5e7ba21208cb15f2118f7c4575530fccd3df87cc37be0f85d558fba212edd07faf2a3d22219efc194efb9b5e01c93f77219516
-  data.tar.gz: 16cf23202f4c212aaad45812cc53d55ca948ae501ff1596b82788c90f1515ef061e0f7832084cfc354a57ae7e073f167f3668dcca67bac1f8ef62b4a0da0aa5e
+  metadata.gz: 15951fd552e844646c3c138f9907a0cb1193627a9492495ce51a756751c1bbbf3d4d3aa8ea53a40d7e71927cd57f185a147dcb16feed6ff116a9d07008e35b45
+  data.tar.gz: fea0ff6f1d5d0d672cc04fa05c9f9bf567054721753078a56dcfa37cb9057c0530b711b669d0b16edb31a62aff815967151a004ad3eff776467acdfd36aac9fb

data/Gemfile.lock

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

data/README.md

@@ -17,13 +17,14 @@ dir = File.dirname(__FILE__)
 adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
 translator = ::YamlTranslator::Translator.new(adapter)
 
-english_locale = ::YamlTranslator.load_file("#{dir}/en.yml")
-japanese_locale = english_locale.translate(translator, to: :ja)
+
+english_locale = translator.file("#{dir}/en.yml")
+japanese_locale = english_locale.to(:ja)
 
 p japanese_locale.to_s # convert to japanese locale yaml format
 p japanese_locale.save_to(dir) # Write a ja.yml
 
-german_locale = english_locale.translate(translator, to: :de)
+german_locale = english_locale.to(:de)
 
 p german_locale.to_s # convert to german locale yaml format
 p german_locale.save_to(dir) # Write a de.yml
@@ -34,16 +35,12 @@ p german_locale.save_to(dir) # Write a de.yml
 The method of translating the difference is as follows.
 
 ```ruby
+dir = File.dirname(__FILE__)
 adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
 translator = ::YamlTranslator::Translator.new(adapter)
 
-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)
-
-diff_japanese_locale.save # Save the difference translation file
+diff_locale = translator.file("/path/to/before/en.yml").diff("/path/to/after/en.yml")
+diff_locale.to(:ja).save
 ```
 
 ## Run the test

data/example/diff_translate.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'yaml'
+require 'yaml-translator'
+
+dir = File.dirname(__FILE__)
+adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
+translator = ::YamlTranslator::Translator.new(adapter)
+
+diff_locale = translator.file("#{dir}/en.yml").diff("#{dir}/new.en.yml")
+diff_locale.to(:ja).save_to("/tmp")

data/example/{google_translate.rb → simple.rb}

@@ -7,13 +7,13 @@ 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")
-japanese_locale = english_locale.translate(translator, to: :ja)
+english_locale = translator.file("#{dir}/en.yml")
+japanese_locale = english_locale.to(:ja)
 
 p japanese_locale.to_s
 p japanese_locale.save_to(dir)
 
-german_locale = english_locale.translate(translator, to: :de)
+german_locale = english_locale.to(:de)
 
 p german_locale.to_s
 p german_locale.save_to(dir)

data/lib/yaml-translator/context.rb

@@ -0,0 +1,28 @@
+module YamlTranslator
+  class Context
+    def initialize(locale, translator)
+      @locale = locale
+      @translator = translator
+    end
+    def to(lang)
+      @translator.translate(@locale, to: lang)
+    end
+  end
+
+  class FileContext < Context
+    def diff(path)
+      diff_locale = @locale.diff(Locale.load_file(path))
+      DiffContext.new(diff_locale, @translator)
+    end
+  end
+
+  class StringContext < Context
+    def diff(s)
+      diff_locale = @locale.diff(Locale.load(s))
+      DiffContext.new(diff_locale, @translator)
+    end
+  end
+
+  class DiffContext < Context
+  end
+end

data/lib/yaml-translator/locale.rb

@@ -50,11 +50,15 @@ module YamlTranslator
     end
 
     class << self
-      def load_file(file)
-        lang = File.basename(file).gsub(/.(yml|yaml)/, '')
-        yaml = YAML.load(File.open(file, &:read))
+      def load(s)
+        yaml = YAML.load(s)
+        lang = yaml.keys.first # FIXME check support language
         self.new(yaml, lang)
       end
+
+      def load_file(file)
+        load(File.open(file, &:read))
+      end
     end
 
     private

data/lib/yaml-translator/translator.rb

@@ -15,5 +15,13 @@ module YamlTranslator
       translated = @adapter.translate(locale.to_single_key_hash, options)
       Locale.new(translated.to_tree, options[:to])
     end
+
+    def string(s)
+      StringContext.new(Locale.load(s), self)
+    end
+
+    def file(f)
+      FileContext.new(Locale.load_file(f), self)
+    end
   end
 end

data/lib/yaml-translator/version.rb

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

data/lib/yaml-translator.rb

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

data/spec/helpers/locale_helper.rb

@@ -2,13 +2,17 @@ require 'yaml'
 
 module Helpers
   module LocaleHelper
+    def yaml_path(name)
+      "#{File.dirname(__FILE__)}/../fixtures/#{name.to_s}.yml"
+    end
+    def yaml_contents(name)
+      File::open(yaml_path(name), &:read)
+    end
     def load_yaml(name)
-      path = "#{File.dirname(__FILE__)}/../fixtures/#{name.to_s}.yml"
-      YAML.load(File::open(path, &:read))
+      YAML.load(yaml_contents(name))
     end
     def load_locale(name)
-      path = "#{File.dirname(__FILE__)}/../fixtures/#{name.to_s}.yml"
-      YamlTranslator::Locale.load_file(path)
+      YamlTranslator::Locale.load_file(yaml_path(name))
     end
   end
 end

data/spec/yaml-translator/locale_spec.rb

@@ -10,6 +10,13 @@ describe YamlTranslator::Locale do
   let(:output_file) { File.join(tmp_dir, 'en.yml') }
   let(:file_exist) { File.exist?(output_file) }
 
+  describe '#load' do
+    it 'should be load from string' do
+      locale = YamlTranslator::Locale.load(lang_file_content)
+      expect(locale.lang).to eq('en')
+    end
+  end
+
   describe '#diff' do
     let(:before_locale) { load_locale('diff/before/en') }
     let(:after_locale) { load_locale('diff/after/en') }

data/spec/yaml-translator/translator_spec.rb

@@ -1,6 +1,6 @@
 describe YamlTranslator::Translator do
+  let(:translator) { YamlTranslator::Translator.new }
   describe '#translate' do
-    let(:translator) { YamlTranslator::Translator.new }
     context 'when have root' do
       let(:yaml_tree) { load_yaml(:with_root) }
       let(:locale) { YamlTranslator::Locale.new(yaml_tree, :en) }
@@ -18,4 +18,20 @@ describe YamlTranslator::Translator do
       end
     end
   end
+  describe '#file' do
+    let(:path) { yaml_path(:en) }
+    let(:expected_locale) { YamlTranslator::Locale.load_file(path) }
+    it 'translate files' do
+      result = translator.file(path).to(:en)
+      expect(result.values).to eq(expected_locale.values)
+    end
+  end
+  describe '#string' do
+    let(:yaml_source) { yaml_contents(:en) }
+    let(:expected_locale) { YamlTranslator::Locale.load(yaml_source) }
+    it 'translate yaml string' do
+      result = translator.string(yaml_source).to(:en)
+      expect(result.values).to eq(expected_locale.values)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-translator
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Noritaka Horio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_translate
@@ -153,15 +153,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/diff_translate.rb
 - example/en.yml
-- example/google_translate.rb
-- example/locale.rb
 - example/new.en.yml
+- example/simple.rb
 - lib/yaml-translator.rb
 - lib/yaml-translator/adapters.rb
 - lib/yaml-translator/adapters/base_adapter.rb
 - lib/yaml-translator/adapters/google_translate_adapter.rb
 - lib/yaml-translator/adapters/noop_adapter.rb
+- lib/yaml-translator/context.rb
 - lib/yaml-translator/key_path.rb
 - lib/yaml-translator/locale.rb
 - lib/yaml-translator/structure.rb

data/example/locale.rb

@@ -1,13 +0,0 @@
-$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")