yaml-translator 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 615a90101e9d6e0174bbe05202ae96270cb5aac7
-  data.tar.gz: 5f4087a2954b3e0225bab4c199101fe1a531fac9
+  metadata.gz: 91450cec2cf7f90ca1dbe8ec5b949bd7a3bd48b1
+  data.tar.gz: 84b3a8d5ef741ea905b9a3cf405b5fc1057a02be
 SHA512:
-  metadata.gz: 15951fd552e844646c3c138f9907a0cb1193627a9492495ce51a756751c1bbbf3d4d3aa8ea53a40d7e71927cd57f185a147dcb16feed6ff116a9d07008e35b45
-  data.tar.gz: fea0ff6f1d5d0d672cc04fa05c9f9bf567054721753078a56dcfa37cb9057c0530b711b669d0b16edb31a62aff815967151a004ad3eff776467acdfd36aac9fb
+  metadata.gz: 8c0f956835f849caaef6fe3a4e391043c26811071d567f88a11ebf1e8091f80cbce0e5d2ed45a58d29d90974622a35e113d64e6e6f99fef68c42886cce562d61
+  data.tar.gz: 752d7fbb490da950d890990f6e5dfb190170d031d3709036e0822915e22fb3cb2b1ebbbc92fb73864663baaad6aac62c0ce16e6c8035c998d0a092cbff19bdec

data/Gemfile.lock

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

data/README.md

@@ -14,9 +14,11 @@ The method of translating the language file is as follows.
 
 ```ruby
 dir = File.dirname(__FILE__)
-adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
-translator = ::YamlTranslator::Translator.new(adapter)
 
+translator = ::YamlTranslator.create(
+  :google_translate,
+  api_key: ENV['GOOGLE_TRANSLATE_API_KEY']
+)
 
 english_locale = translator.file("#{dir}/en.yml")
 japanese_locale = english_locale.to(:ja)
@@ -36,8 +38,11 @@ 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)
+
+translator = ::YamlTranslator.create(
+  :google_translate,
+  api_key: ENV['GOOGLE_TRANSLATE_API_KEY']
+)
 
 diff_locale = translator.file("/path/to/before/en.yml").diff("/path/to/after/en.yml")
 diff_locale.to(:ja).save

data/example/diff_translate.rb

@@ -4,8 +4,10 @@ require 'yaml'
 require 'yaml-translator'
 
 dir = File.dirname(__FILE__)
-adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
-translator = ::YamlTranslator::Translator.new(adapter)
+translator = ::YamlTranslator.create(
+  :google_translate,
+  api_key: ENV['GOOGLE_TRANSLATE_API_KEY']
+)
 
 diff_locale = translator.file("#{dir}/en.yml").diff("#{dir}/new.en.yml")
 diff_locale.to(:ja).save_to("/tmp")

data/example/simple.rb

@@ -4,8 +4,10 @@ require 'yaml'
 require 'yaml-translator'
 
 dir = File.dirname(__FILE__)
-adapter = ::YamlTranslator::Adapters::GoogleTranslateAdapter.new(ENV['GOOGLE_TRANSLATE_API_KEY'])
-translator = ::YamlTranslator::Translator.new(adapter)
+translator = ::YamlTranslator.create(
+  :google_translate,
+  api_key: ENV['GOOGLE_TRANSLATE_API_KEY']
+)
 
 english_locale = translator.file("#{dir}/en.yml")
 japanese_locale = english_locale.to(:ja)

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

@@ -3,8 +3,8 @@ require 'easy_translate'
 module YamlTranslator
   module Adapters
     class GoogleTranslateAdapter < BaseAdapter
-      def initialize(api_key=nil)
-        @api_key = api_key
+      def initialize(options={})
+        @options = options
       end
       def translate(values, options={})
         keys = []
@@ -15,7 +15,7 @@ module YamlTranslator
           keys << key # 0: a.b, 1: a.b.c
           texts << text # 0: a, 1: b
         end
-        translated_texts = EasyTranslate.translate(texts, :to => opts[:to], :key => @api_key)
+        translated_texts = EasyTranslate.translate(texts, :to => opts[:to], :key => @options[:api_key])
         Hash[keys.zip(translated_texts)]
       end
     end

data/lib/yaml-translator/adapters.rb

@@ -1,3 +1,22 @@
 require 'yaml-translator/adapters/base_adapter'
 require 'yaml-translator/adapters/noop_adapter'
 require 'yaml-translator/adapters/google_translate_adapter'
+
+module YamlTranslator
+  module Adapters
+    class << self
+      def find_and_create(name, options={})
+        prefix = name.to_s.split('_').map { |v| v.capitalize }.join('')
+        find_adapter_name = "#{prefix}Adapter"
+        raise "adapter #{find_adapter_name} is not defined" unless class_exists?(find_adapter_name)
+        const_get(find_adapter_name).new(options)
+      end
+
+      private
+
+      def class_exists?(class_name)
+        const_defined?(class_name) && const_get(class_name).is_a?(Class)
+      end
+    end
+  end
+end

data/lib/yaml-translator/locale.rb

@@ -29,8 +29,23 @@ module YamlTranslator
     end
 
     def merge(locale)
-      merged = flatten_hash.merge(locale.flatten_hash)
-      Locale.new(merged.to_tree, lang)
+      s = to_single_key_hash
+      o = locale.to_single_key_hash
+      Locale.new(s.merge(o).to_tree, lang)
+    end
+
+    def merge_to(locale)
+      locale.merge(self)
+    end
+
+    def merge_to_file(file)
+      target_locale = Locale.load_file(file)
+      target_locale.merge(self)
+    end
+
+    def merge_to_s(s)
+      target_locale = Locale.load(s)
+      target_locale.merge(self)
     end
 
     def save(dir=Dir.pwd)

data/lib/yaml-translator/version.rb

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

data/lib/yaml-translator.rb

@@ -15,5 +15,10 @@ module YamlTranslator
     def load_file(file)
       Locale.load_file(file)
     end
+
+    def create(name, options={})
+      adapter = Adapters.find_and_create(name, options)
+      Translator.new(adapter)
+    end
   end
 end

data/spec/fixtures/merge_target.yml

@@ -0,0 +1,3 @@
+---
+en:
+  target: bar

data/spec/yaml-translator/locale_spec.rb

@@ -45,6 +45,22 @@ describe YamlTranslator::Locale do
       expect(locale.to_single_key_hash).to eq(single_key_hash)
     end
   end
+
+  describe '#merge_to_file' 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')
+    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?')
+    end
+  end
+
   describe '#to_s' do
     it 'should be return yaml formatted string' do
       expect(locale.to_s).to eq(lang_file_content)

data/spec/yaml_translator_spec.rb

@@ -0,0 +1,10 @@
+require 'rspec/temp_dir'
+
+describe YamlTranslator do
+  describe '#create' do
+    it 'should be load translator' do
+      translator = YamlTranslator.create(:google_translate, api_key: 'xyz')
+      expect(translator).to be_kind_of(YamlTranslator::Translator)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-translator
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Noritaka Horio
@@ -173,6 +173,7 @@ files:
 - spec/fixtures/diff/after/en.yml
 - spec/fixtures/diff/before/en.yml
 - spec/fixtures/en.yml
+- spec/fixtures/merge_target.yml
 - spec/fixtures/no_root.yml
 - spec/fixtures/with_root.yml
 - spec/helpers/locale_helper.rb
@@ -181,6 +182,7 @@ files:
 - 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
 homepage: https://github.com/holyshared/yaml-translator
 licenses:
@@ -210,6 +212,7 @@ test_files:
 - spec/fixtures/diff/after/en.yml
 - spec/fixtures/diff/before/en.yml
 - spec/fixtures/en.yml
+- spec/fixtures/merge_target.yml
 - spec/fixtures/no_root.yml
 - spec/fixtures/with_root.yml
 - spec/helpers/locale_helper.rb
@@ -218,3 +221,4 @@ test_files:
 - 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