yaml-translator 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a831e015e8495d91dfcd7ce06da490c2e92a8c
-  data.tar.gz: 19a700af24925a9b0bbb79324e057c63d0a50faf
+  metadata.gz: e3bfa580dc446bc7a0c98da5d0cc7ce74d191b35
+  data.tar.gz: 75427c09ee6f7749e01509990230b47a8e4aa0a1
 SHA512:
-  metadata.gz: 3f6f078dadceae0715d084bafa2ee1431947ea4f92d4b4d3f353670b909c62b2995857b51f34f6f7535d5add5b9acd1acd8244bf818d82eb41f6bff91702ccad
-  data.tar.gz: 8b28ba8cb0953650264e528b23591c3c1438d1c2b0fef1d3fda0eb296c96f668628eb2a7d41b03b085eb5b1f6b0d3fad62dc130b32f238491b12c9ef2593dadc
+  metadata.gz: 984c67e93ed798aca92a50e4fb78738c72bda3afb8c3e470fd94003f19f21e67615a8cefac9278f765235713444abaf0ff427f43958931aba57fed2dde99206e
+  data.tar.gz: 1115fdb4126c618712970663bd19df037d8d796b15eb94bd4584d2c9ba88013b4d03c81ed7d54fbf88195fe12f75f3142ce46039d36deb8caa8dc0cb5d8edc9f

data/.rubocop.yml

@@ -0,0 +1,16 @@
+inherit_gem:
+  onkcop:
+    - "config/rubocop.yml"
+    # uncomment if use rails cops
+    # - "config/rails.yml"
+    # uncomment if use rspec cops
+    # - "config/rspec.yml"
+
+AllCops:
+  TargetRubyVersion: 2.4
+
+Style/PreferredHashMethods:
+  EnforcedStyle: short
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaml-translator (0.11.1)
+    yaml-translator (0.11.2)
       diff-lcs
       easy_translate
 
@@ -9,6 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
+    ast (2.3.0)
     coveralls (0.7.2)
       multi_json (~> 1.3)
       rest-client (= 1.6.7)
@@ -27,6 +28,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     multi_json (1.12.1)
+    onkcop (0.47.1.2)
+      rubocop (~> 0.47.1)
+      rubocop-rspec (>= 1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.1)
     rake (10.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -45,6 +53,15 @@ GEM
     rspec-support (3.5.0)
     rspec-temp_dir (1.0.0)
       rspec (>= 3.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.13.0)
+      rubocop (>= 0.42.0)
+    ruby-progressbar (1.8.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -60,6 +77,7 @@ GEM
     thread (0.2.2)
     thread_safe (0.3.6)
     tins (0.13.2)
+    unicode-display_width (1.1.3)
 
 PLATFORMS
   ruby
@@ -67,6 +85,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   coveralls
+  onkcop
   rake (~> 10.0)
   rspec
   rspec-temp_dir
@@ -75,4 +94,4 @@ DEPENDENCIES
   yaml-translator!
 
 BUNDLED WITH
-   1.14.1
+   1.14.6

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/example/diff_translate.rb

@@ -10,9 +10,9 @@ translator = ::YamlTranslator.create(
 
 diff_some_dir = File.join(File.dirname(__FILE__), 'diff/some')
 diff_locale = translator.file("#{diff_some_dir}/en.yml").diff("#{diff_some_dir}/new.en.yml")
-diff_locale.to(:ja).save_to("/tmp", prefix: 'some_diff.')
+diff_locale.to(:ja).save_to('/tmp', prefix: 'some_diff.')
 
 # diff nothing!!
 diff_none_dir = File.join(File.dirname(__FILE__), 'diff/none')
 diff_locale = translator.file("#{diff_none_dir}/en.yml").diff("#{diff_none_dir}/new.en.yml")
-diff_locale.to(:ja).save_to("/tmp", prefix: 'no_diff.')
+diff_locale.to(:ja).save_to('/tmp', prefix: 'no_diff.')

data/lib/yaml-translator.rb

@@ -7,7 +7,7 @@ require 'yaml-translator/adapters'
 
 module YamlTranslator
   class << self
-    def create(name, options={})
+    def create(name, options = {})
       adapter = Adapters.find_and_create(name, options)
       Translator.new(adapter)
     end

data/lib/yaml-translator/adapters.rb

@@ -5,8 +5,8 @@ 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('')
+      def find_and_create(name, options = {})
+        prefix = name.to_s.split('_').map(&: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)

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

@@ -3,12 +3,12 @@ module YamlTranslator
     class BaseAdapter
       attr_reader :name
 
-      def initialize(options={})
+      def initialize(options = {})
         @name = adapter_name
         @options = options
       end
 
-      def translate(values, options={})
+      def translate(values, options = {})
         raise 'Translation processing is not implemented'
       end
 
@@ -18,15 +18,15 @@ module YamlTranslator
 
       private
 
-      def adapter_name
-        ptn = /[A-Z\s]*[^A-Z]*/
-        class_name = self.class.name.split('::').last
-        snake_case_s = class_name.gsub(/Adapter/, '').scan(ptn)
-          .map { |v| v.empty? ? nil : v.downcase }
-          .compact
-          .join('_')
-        snake_case_s.to_sym
-      end
+        def adapter_name
+          ptn = /[A-Z\s]*[^A-Z]*/
+          class_name = self.class.name.split('::').last
+          snake_case_s = class_name.gsub(/Adapter/, '').scan(ptn).
+                         map { |v| v.empty? ? nil : v.downcase }.
+                         compact.
+                         join('_')
+          snake_case_s.to_sym
+        end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module YamlTranslator
       # Translate for locale texts
       # @param [Hash] locale texts of translate target
       # @return [Hash] locale texts
-      def translate(values, options={})
+      def translate(values, options = {})
         keys = []
         texts = []
         opts = default_options.merge(options)
@@ -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 => @options[: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/noop_adapter.rb

@@ -4,7 +4,7 @@ module YamlTranslator
       # Always return the text before translation
       # @param [Hash] locale texts of translate target
       # @return [Hash] locale texts
-      def translate(values, options={})
+      def translate(values, options = {})
         values
       end
     end

data/lib/yaml-translator/locale.rb

@@ -19,16 +19,16 @@ module YamlTranslator
 
     def initialize(config)
       super(config)
-      @lang = config.keys.first.to_sym # FIXME check support language
+      @lang = config.keys.first.to_sym # FIXME: check support language
     end
 
     def locale_texts
       self[lang]
     end
 
-    def translate(translator, options={})
+    def translate(translator, options = {})
       translated_values = translator.translate(compact_of(locale_texts), options)
-      Locale.new(Hash[*[options[:to], tree_of(translated_values)]])
+      Locale.new(Hash[options[:to], tree_of(translated_values)])
     end
 
     def diff(other_locale)
@@ -70,12 +70,12 @@ module YamlTranslator
     # @param dir [String] Directory path to save the file
     # @param options [Hash] Options for saving
     # @return int
-    def save(dir=Dir.pwd, options={})
+    def save(dir = Dir.pwd, options = {})
       prefix = options[:prefix] if options.key?(:prefix)
       write_file(File.join(dir, "#{prefix}#{lang}.yml"), options)
     end
 
-    def save_to(dir, options={})
+    def save_to(dir, options = {})
       save(dir, options)
     end
 
@@ -88,53 +88,53 @@ module YamlTranslator
       to_yaml
     end
 
-    def to_yaml(options={})
-      Hash[*[lang.to_s, locale_texts]].to_yaml(options)
+    def to_yaml(options = {})
+      Hash[lang.to_s, locale_texts].to_yaml(options)
     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
+      # 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
-        path.leave
+        result
       end
-      result
-    end
 
-    # 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
+      # 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
-      result
-    end
 
-    def write_file(file_path, options={})
-      File.write(file_path, to_yaml(options))
-    end
+      def write_file(file_path, options = {})
+        File.write(file_path, to_yaml(options))
+      end
   end
 end

data/lib/yaml-translator/translator.rb

@@ -1,4 +1,4 @@
-require "yaml-translator/adapters"
+require 'yaml-translator/adapters'
 
 module YamlTranslator
   class Translator
@@ -14,7 +14,7 @@ module YamlTranslator
     #
     # @param [Hash] locale texts of translate target
     # @return [Hash] locale texts
-    def translate(locale_texts, options={})
+    def translate(locale_texts, options = {})
       @adapter.translate(locale_texts, options)
     end
 

data/lib/yaml-translator/version.rb

@@ -1,3 +1,3 @@
 module YamlTranslator
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'.freeze
 end

data/spec/helpers/locale_helper.rb

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

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ if ENV['COVERALLS_REPO_TOKEN']
   Coveralls.wear!
 else
   SimpleCov.formatters = [
-    SimpleCov::Formatter::Console
+    SimpleCov::Formatter::Console,
   ]
 end
 

data/spec/yaml-translator/adapters/google_translate_adapter_spec.rb

@@ -9,7 +9,7 @@ describe YamlTranslator::Adapters::GoogleTranslateAdapter do
         values
       end
       before do
-        allow(EasyTranslate).to receive(:translate).and_return(['a_a', 'a_b'])
+        allow(EasyTranslate).to receive(:translate).and_return(%w(a_a a_b))
       end
       subject { adapter.translate(some_values, to: :ja) }
       it 'should be return translate results' do

data/spec/yaml-translator/locale_spec.rb

@@ -22,7 +22,7 @@ describe YamlTranslator::Locale do
     let(:after_locale) { load_locale('diff/after/en') }
     let(:single_key_hash) do
       {
-        'en.foo1.foo3' => 'foo1-3'
+        'en.foo1.foo3' => 'foo1-3',
       }
     end
     it 'should be return flatten hash' do
@@ -36,9 +36,9 @@ describe YamlTranslator::Locale do
     let(:single_key_hash) do
       {
         'en.bar' => 'bar',
-        'en.foo'=> 'foo',
+        'en.foo' => 'foo',
         'en.foo1.foo1' => 'foo1-1',
-        'en.foo1.foo2' => 'foo1-2'
+        'en.foo1.foo2' => 'foo1-2',
       }
     end
     it 'should be return flatten hash' do

data/yaml-translator.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = YamlTranslator::VERSION
   spec.authors       = ['Noritaka Horio']
   spec.email         = ['holy.shared.design@gmail.com']
-  spec.summary       = %q{Translate for the locales configuration file}
-  spec.description   = %q{Translate for the locales configuration file}
+  spec.summary       = 'Translate for the locales configuration file'
+  spec.description   = 'Translate for the locales configuration file'
   spec.homepage      = 'https://github.com/holyshared/yaml-translator'
   spec.license       = 'MIT'
 
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-console'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rspec-temp_dir'
+  spec.add_development_dependency 'onkcop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-translator
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Noritaka Horio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_translate
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: onkcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Translate for the locales configuration file
 email:
 - holy.shared.design@gmail.com
@@ -147,6 +161,7 @@ files:
 - ".editorconfig"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -203,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Translate for the locales configuration file