i18n-tasks 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaa9e7e25dff9f4b1dc1cc1050c31b0fbbb64a53
-  data.tar.gz: 744f2ad91cc01f1fdc504e0071eb826a9c14c749
+  metadata.gz: a9d57ea517b4561e2eb31ddee6376bb9d65ef9c7
+  data.tar.gz: ddaf2b27bca1586c84625864809c970ac697e8de
 SHA512:
-  metadata.gz: 9e26846e83a160f186aefe663ebdfc06c0ddf95467eef1e00dc98de90c72fdbde095533786f564be08ad0ad021530ff15a795484e800003e84fd6373029b2653
-  data.tar.gz: f51de5a3004845077b9dab2c79079832a868ec9706d19126fb0e6aee73d92bcb0971318a911a33a458dbd7acc09f6f7b0fe601f4901f44eb1fdd2a107ec20cd4
+  metadata.gz: 669191968390c3ed44ba2537ecd51603a76f56f542c82499dbf3ce89d5c0b303085ba6d37ba40a0099c7947cf319a42e2b3513756aacf2c2f40c89dd592e9396
+  data.tar.gz: 88f3289f9e4734a074056d6be1d0310c2c8299c98679988664f62819cf39fa9b11ebb58df353bed86dc4fca21f72bed5bc784c5af0ba9820434e0fd18a6ead89

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
+- 2.2.0
 - 2.1.5
 - 2.0.0
 - 1.9.3
 - jruby
-- rbx-2.2.10
+- rbx-2.4.1
 env:
   global:
   - TRAVIS=1

data/CHANGES.md

@@ -1,6 +1,12 @@
+## 0.7.12
+
+* Handle relative keys in controllers nested in modules by [Alexander Tipugin](https://github.com/atipugin). [#128](https://github.com/glebm/i18n-tasks/issues/128).
+* Only write files that changed [#125](https://github.com/glebm/i18n-tasks/issues/125).
+* Allow `[]` in the non-strict scanner pattern [#127](https://github.com/glebm/i18n-tasks/issues/127).
+
 ## 0.7.11
 
-* Set slop dependency to 3.5 to ensure Ruby 1.9 compatibility. [#121](https://github.com/glebm/i18n-tasks/pull/121)
+* Set slop dependency to 3.5 to ensure Ruby 1.9 compatibility ([#121](https://github.com/glebm/i18n-tasks/pull/121)).
   MRI 1.9 EOL is [February 23, 2015](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/).
   We will support 1.9 until rbx and jruby support 2.0.
 
@@ -10,7 +16,7 @@
 
 ## 0.7.9
 
-* Support relative keys in Rails controller actions by [Jessie A. Young](https://github.com/jessieay). [#46](https://github.com/glebm/i18n-tasks/issues/46)
+* Support relative keys in Rails controller actions by [Jessie A. Young](https://github.com/jessieay). [#46](https://github.com/glebm/i18n-tasks/issues/46).
 * Minor fixes
 
 ## 0.7.8

data/README.md

@@ -22,7 +22,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add it to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.7.11'
+gem 'i18n-tasks', '~> 0.7.12'
 ```
 
 Copy default [configuration file](#configuration) (optional):

data/lib/i18n/tasks/data/file_formats.rb

@@ -38,10 +38,16 @@ module I18n
         end
 
         def write_tree(path, tree)
+          hash = tree.to_hash(true)
+          adapter = self.class.adapter_name_for_path(path)
+          content = adapter_dump(hash, adapter)
+          # Ignore unchanged data
+          return if File.file?(path) &&
+              # Comparing hashes for equality directly would ignore key order.
+              # Round-trip through the adapter and compare the strings instead:
+              content == adapter_dump(load_file(path), adapter)
           ::FileUtils.mkpath(File.dirname path)
-          ::File.open(path, 'w') { |f|
-            f.write adapter_dump(tree.to_hash(true), self.class.adapter_name_for_path(path))
-          }
+          ::File.open(path, 'w') { |f| f.write content }
         end
 
         module ClassMethods

data/lib/i18n/tasks/scanners/base_scanner.rb

@@ -128,7 +128,7 @@ module I18n::Tasks::Scanners
 
     VALID_KEY_CHARS = /[-\w.?!;]/
     VALID_KEY_RE_STRICT = /^#{VALID_KEY_CHARS}+$/
-    VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[:\#{@}])+$/
+    VALID_KEY_RE = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/
 
     def valid_key?(key, strict = false)
       return false if @key_filter && @key_filter_pattern !~ key

data/lib/i18n/tasks/scanners/relative_keys.rb

@@ -42,7 +42,7 @@ module I18n
           file_name = normalized_path.gsub(%r(#{path_root(normalized_path, roots)}/|(\.[^/]+)*$), '')
 
           if options[:closest_method].present?
-            "#{file_name.split('_').first}.#{options[:closest_method]}"
+            "#{file_name.split('_').first}.#{options[:closest_method]}".tr('/', '.')
           else
             file_name.tr('/', '.').gsub(%r(\._), '.')
           end

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module I18n
   module Tasks
-    VERSION = '0.7.11'
+    VERSION = '0.7.12'
   end
 end

data/spec/google_translate_spec.rb

@@ -9,7 +9,7 @@ describe 'Google Translation' do
       nil_value_test = ['nil-value-key', nil, nil],
       text_test      = ['key', "Hello - %{user} O'neill!", "Hola - %{user} O'neill!"],
       html_test      = ['html-key.html', "Hello - <b>%{user} O'neill</b>", "Hola - <b>%{user} O'neill</b>"],
-      array_test     = ['array-key', ['Hello.', nil, '', 'Goodbye.'], ['¡Hola.', nil, '', '¡Adiós.']],
+      array_test     = ['array-key', ['Hello.', nil, '', 'Goodbye.'], ['Hola.', nil, '', 'Adiós.']],
       fixnum_test    = ['numeric-key', 1, 1],
   ]
 

data/spec/locale_tree/siblings_spec.rb

@@ -6,12 +6,32 @@ describe 'Tree siblings / forest' do
   context 'Node' do
     it '::new with children' do
       children = I18n::Tasks::Data::Tree::Siblings.from_key_attr([['a', value: 1]])
-      node = I18n::Tasks::Data::Tree::Node.new(
+      node = new_node(
           key: 'fr',
           children: children
       )
       expect(node.to_siblings.first.children.parent.key).to eq 'fr'
     end
+
+    it '== (false by value)' do
+      expect(build_node({'a' => {'b' => {'c' => 1}}})).to_not(
+          eq(build_node({'a' => {'b' => {'c' => 2}}})))
+    end
+
+    it '== (false by key)' do
+      expect(build_node({'a' => {'b' => {'c' => 1}}})).to_not(
+          eq(build_node({'a' => {'b' => {'d' => 1}}})))
+    end
+
+    it '== (false by children)' do
+      expect(build_node({'a' => {'b' => {'c' => 1}}})).to_not(
+          eq(build_node({'a' => {'b' => {'c' => 1}, 'x' => 2}})))
+    end
+
+    it '== (true)' do
+      expect(build_node({'a' => {'b' => {'c' => 1}, 'x' => 2}})).to_not(
+          eq(build_node({'a' => {'b' => {'d' => 1}, 'x' => 2}})))
+    end
   end
 
   context 'a tree' do
@@ -55,7 +75,7 @@ describe 'Tree siblings / forest' do
 
     it '#set conflict value <- scope' do
       a = build_tree(a: 1)
-      expect { silence_stderr { a.set('a.b', build_node(key: 'b', value: 1)) } }.to_not raise_error
+      expect { silence_stderr { a.set('a.b', new_node(key: 'b', value: 1)) } }.to_not raise_error
     end
 
     it '#intersect' do
@@ -72,18 +92,18 @@ describe 'Tree siblings / forest' do
     end
 
     it '#append!' do
-      expect(build_tree({'a' => 1}).append!(build_node(key: 'b', value: 2)).to_hash).to eq('a' => 1, 'b' => 2)
+      expect(build_tree({'a' => 1}).append!(new_node(key: 'b', value: 2)).to_hash).to eq('a' => 1, 'b' => 2)
     end
 
     it '#set replace value' do
-      expect(build_tree(a: {b: 1}).tap {|t| t['a.b'] = build_node(key: 'b', value: 2) }.to_hash).to(
+      expect(build_tree(a: {b: 1}).tap {|t| t['a.b'] = new_node(key: 'b', value: 2) }.to_hash).to(
           eq('a' => {'b' => 2})
       )
     end
 
     it '#set get' do
       t = build_tree(a: {x: 1})
-      node = build_node(key: 'd', value: 'e')
+      node = new_node(key: 'd', value: 'e')
       t['a.b.c.' + node.key] = node
       expect(t['a.b.c.d'].value).to eq('e')
     end

data/spec/readme_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 describe 'README.md' do
-  let(:readme) { File.read('README.md') }
+  let(:readme) { File.read('README.md', encoding: 'UTF-8') }
   it 'has valid YAML in ```yaml blocks' do
     readme.scan /```yaml\n(.*)(?=^)\n```/ do |m|
       expect { YAML.load(m[0]) }.to_not raise_errors

data/spec/relative_keys_spec.rb

@@ -19,9 +19,7 @@ describe 'Relative keys' do
 
     context 'relative key in controller' do
       it 'works' do
-        base_scanner = I18n::Tasks::Scanners::BaseScanner.new
-
-        key = base_scanner.absolutize_key(
+        key = scanner.absolutize_key(
           '.success',
           'app/controllers/users_controller.rb',
           %w(app/controllers),
@@ -30,6 +28,19 @@ describe 'Relative keys' do
 
         expect(key).to eq('users.create.success')
       end
+
+      context 'nested in module' do
+        it 'works' do
+          key = scanner.absolutize_key(
+            '.success',
+            'app/controllers/nested/users_controller.rb',
+            %w(app/controllers),
+            'create'
+          )
+
+          expect(key).to eq('nested.users.create.success')
+        end
+      end
     end
   end
 end

data/spec/support/capture_std.rb

@@ -15,4 +15,8 @@ module CaptureStd
   ensure
     $stdout = out
   end
+
+  def silence_stderr(&block)
+    silence_stream($stderr, &block)
+  end
 end

data/spec/support/test_codebase.rb

@@ -23,7 +23,7 @@ module TestCodebase
 
   def run_cmd(name, *args, &block)
     in_test_app_dir do
-      silence_stderr {
+      silence_stream($stderr) {
         capture_stdout { i18n_cmd.run(name, *args, &block) }
       }
     end

data/spec/support/trees.rb

@@ -10,6 +10,12 @@ module Trees
   end
 
   def build_node(attr = {})
+    raise 'invalid node (more than 1 root)' if attr.size > 1
+    key, value = attr.first
+    I18n::Tasks::Data::Tree::Node.from_key_value(key, value)
+  end
+
+  def new_node(attr = {})
     I18n::Tasks::Data::Tree::Node.new(attr)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -206,7 +206,6 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
-- ".jrubyrc"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -334,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis

data/.jrubyrc

@@ -1,2 +0,0 @@
-compat.version=2.0
-