i18n-tasks 0.4.0.beta1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328ef834a8ef2756aa154f9e4eb5207df02486d4
-  data.tar.gz: d3d0d63e4fb566037f64606cdfd2a140928492c1
+  metadata.gz: efe7070e53b66680ce9137f81c21755823c27cb2
+  data.tar.gz: 925f44e4027a20cff615a97b2ad2dcf3c8e10ff1
 SHA512:
-  metadata.gz: 0ea465b2b3799df29d77c5db1c7fdbb5deb824b838399f663ef82411f62dee84f14fef9e34498b958e06e53deacd91bbf53252933f9792ef4ad2f0cd3b2c0a5f
-  data.tar.gz: f0e8d5a760021dd976741f28f06bc5aa2e4fcdc2158573b2eeb9795f8984f6c15c39a46a717f7de44a4bcd8757e858541b74a08230c9433534eb148922d831b2
+  metadata.gz: e079e4bb84bde0365ac3628c63670317b7827db35fc1eef6789e1ce3eb82144a42de4e7ace9240e737c0b08db5e711b13a7be38465881f49b5989f856beb0cf9
+  data.tar.gz: 1878f3455bb41be8824e5dd59a235f4afafd1ca0830e1b881fc9e0f26688c50b7e7e95de97d8ee0a38f10b416f8bab7f3de4fb011237e3378586efc014e9ca81

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 rvm:
 - 2.1.1
 - 2.0.0
-- jruby
-- rbx
+- jruby-head
+- rbx-2
 matrix:
   allow_failures:
   # no keyword argument support in rbx

data/README.md

@@ -18,7 +18,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.3.11'
+gem 'i18n-tasks', '~> 0.4.0'
 ```
 
 i18n-tasks does not load or execute any of the application's code but performs static-only analysic.
@@ -188,7 +188,7 @@ data:
     - 'config/locales/%{locale}.yml'
 ```
 
-##### Conservative router (v0.4.0+)
+##### Conservative router
 
 Conservative router keeps the keys where they are found, or infers the path from base locale.
 If the key is completely new, conservative router will fall back to the pattern router behaviour.

data/i18n-tasks.gemspec

@@ -37,6 +37,6 @@ It can also can pre-fill missing keys, including from Google Translate, and it c
   s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'yard'
 end

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

@@ -119,7 +119,7 @@ module I18n::Tasks::Scanners
       key
     end
 
-    VALID_KEY_RE = /^[\w.\#{}]+$/
+    VALID_KEY_RE = /^[-\w.\#{}]+$/
 
     def valid_key?(key)
       key =~ VALID_KEY_RE && !(@key_filter && @key_filter_pattern !~ key)

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.4.0.beta1'
+    VERSION = '0.4.0'
   end
 end

data/spec/conservative_router_spec.rb

@@ -26,7 +26,7 @@ describe 'Conservative router' do
       TestCodebase.in_test_app_dir do
         data['es'] = data['es']
         data.reload
-        data['es']['es.c'].data[:path].should == 'config/locales/other.es.yml'
+        expect(data['es']['es.c'].data[:path]).to eq('config/locales/other.es.yml')
       end
     end
 
@@ -34,8 +34,8 @@ describe 'Conservative router' do
       TestCodebase.in_test_app_dir do
         data['es'] = data['es'].merge!(build_tree(es: {a: 1, b: 2}))
         data.reload
-        data['es']['es.a'].data[:path].should == 'config/locales/es.yml'
-        data['es']['es.b'].data[:path].should == 'config/locales/other.es.yml'
+        expect(data['es']['es.a'].data[:path]).to eq('config/locales/es.yml')
+        expect(data['es']['es.b'].data[:path]).to eq('config/locales/other.es.yml')
       end
     end
 
@@ -43,7 +43,7 @@ describe 'Conservative router' do
       TestCodebase.in_test_app_dir do
         data['es'] = data['es'].merge!(build_tree(es: {z: 2}))
         data.reload
-        data['es']['es.z'].data[:path].should == 'config/locales/not_found.es.yml'
+        expect(data['es']['es.z'].data[:path]).to eq('config/locales/not_found.es.yml')
       end
     end
   end

data/spec/file_system_data_spec.rb

@@ -58,8 +58,8 @@ describe 'File system i18n' do
       TestCodebase.in_test_app_dir {
         data[:en] = data[:en].merge!('en' => locale_data)
         files     = %w(pizza.en.yml sushi.en.yml)
-        Dir['*.yml'].sort.should == files.sort
-        files.each { |f| YAML.load_file(f)['en'].should == {File.basename(f, '.en.yml') => keys} }
+        expect(Dir['*.yml'].sort).to eq(files.sort)
+        files.each { |f| expect(YAML.load_file(f)['en']).to eq({File.basename(f, '.en.yml') => keys}) }
       }
     end
   end
@@ -93,8 +93,8 @@ describe 'File system i18n' do
       TestCodebase.in_test_app_dir {
         data[:en] = data[:en].merge!('en' => locale_data)
         files     = %w(pizza.en.json sushi.en.json)
-        Dir['*.json'].sort.should == files.sort
-        files.each { |f| JSON.parse(File.read f)['en'].should == {File.basename(f, '.en.json') => keys} }
+        expect(Dir['*.json'].sort).to eq(files.sort)
+        files.each { |f| expect(JSON.parse(File.read f)['en']).to eq({File.basename(f, '.en.json') => keys}) }
       }
     end
   end

data/spec/fixtures/app/views/index.html.slim

@@ -2,6 +2,7 @@ p #{t('ca.a')} #{t 'ca.b'} #{t "ca.c"}
 p #{t 'ca.d'} #{t 'ca.f', i: 'world'} #{t 'ca.e', i: 'world'}
 p #{t 'missing_in_es.a'} #{t 'same_in_es.a'} #{t 'blank_in_es.a'}
 p = t 'used_but_missing.key'
+p = t 'missing-key-with-a-dash.key'
 p = t 'x', scope: 'scoped'
 p = t 'x', scope: [:very, :scoped]
 p = t 'x', scope: [:scoped, code]

data/spec/google_translate_spec.rb

@@ -13,9 +13,9 @@ describe 'Google Translation' do
 
       context 'API' do
         it 'works' do
-          google_translate(
+          expect(google_translate(
               [['common.hello', TEST_STRING]], from: :en, to: :es, key: ENV['GOOGLE_TRANSLATE_API_KEY']
-          ).should == [['common.hello', TEST_RESULT]]
+          )).to eq([['common.hello', TEST_RESULT]])
         end
       end
 

data/spec/i18n_tasks_spec.rb

@@ -12,7 +12,9 @@ describe 'i18n-tasks' do
           es.missing_in_es.a es.same_in_es.a
           en.hash.pattern_missing.a en.hash.pattern_missing.b
           en.missing_symbol_key en.missing_symbol.key_two en.missing_symbol.key_three
-          es.missing_in_es_plural_1.a es.missing_in_es_plural_2.a)
+          es.missing_in_es_plural_1.a es.missing_in_es_plural_2.a
+          en.missing-key-with-a-dash.key
+        )
     }
     it 'detects missing or identical' do
       capture_stderr do
@@ -39,8 +41,8 @@ describe 'i18n-tasks' do
       in_test_app_dir do
         t = i18n_task
         expected_unused_keys.each do |key|
-          expect(t.key_value?(key, :en)).to be_true
-          expect(t.key_value?(key, :es)).to be_true
+          expect(t.key_value?(key, :en)).to be true
+          expect(t.key_value?(key, :es)).to be true
         end
         ENV['CONFIRM'] = '1'
         capture_stderr {
@@ -48,8 +50,8 @@ describe 'i18n-tasks' do
         }
         t.data.reload
         expected_unused_keys.each do |key|
-          expect(t.key_value?(key, :en)).to be_false
-          expect(t.key_value?(key, :es)).to be_false
+          expect(t.key_value?(key, :en)).to be false
+          expect(t.key_value?(key, :es)).to be false
         end
       end
     end

data/spec/key_pattern_matching_spec.rb

@@ -6,58 +6,58 @@ describe 'Key pattern' do
   describe 'matching' do
     describe '*' do
       it 'as suffix' do
-        'devise.*'.should match_key 'devise.some.key'
+        expect('devise.*').to match_key 'devise.some.key'
       end
       it 'as prefix' do
-        '*.some.key'.should match_key 'devise.some.key'
+        expect('*.some.key').to match_key 'devise.some.key'
       end
       it 'as infix' do
-        '*.some.*'.should match_key 'devise.some.key'
+        expect('*.some.*').to match_key 'devise.some.key'
       end
       it 'matches multiple namespaces' do
-        'a.*.e*'.should match_key 'a.b.c.d.eeee'
+        expect('a.*.e*').to match_key 'a.b.c.d.eeee'
       end
     end
 
     describe ':' do
       it 'as suffix' do
-        'a.b.:'.should match_key 'a.b.c'
-        'a.b.:'.should_not match_key 'a.b.c.d'
+        expect('a.b.:').to match_key 'a.b.c'
+        expect('a.b.:').not_to match_key 'a.b.c.d'
       end
 
       it 'as prefix' do
-        ':.b.c'.should match_key 'a.b.c'
-        ':.b.c'.should_not match_key 'x.a.b.c'
+        expect(':.b.c').to match_key 'a.b.c'
+        expect(':.b.c').not_to match_key 'x.a.b.c'
       end
 
       it 'as infix' do
-        'a.:.c'.should match_key 'a.b.c'
-        'a.:.c'.should_not match_key 'a.b.x.c'
+        expect('a.:.c').to match_key 'a.b.c'
+        expect('a.:.c').not_to match_key 'a.b.x.c'
       end
     end
 
     describe '{sets}' do
       it 'matches' do
         p = 'a.{x,y}.b'
-        p.should match_key 'a.x.b'
-        p.should match_key 'a.y.b'
-        p.should_not match_key 'a.z.b'
+        expect(p).to match_key 'a.x.b'
+        expect(p).to match_key 'a.y.b'
+        expect(p).not_to match_key 'a.z.b'
       end
 
       it 'supports :' do
-        'a.{:}.c'.should match_key 'a.b.c'
-        'a.{:}.c'.should_not match_key 'a.b.x.c'
+        expect('a.{:}.c').to match_key 'a.b.c'
+        expect('a.{:}.c').not_to match_key 'a.b.x.c'
       end
 
       it 'supports *' do
-        'a.{*}.c'.should match_key 'a.b.c'
-        'a.{*}.c'.should match_key 'a.b.x.y.c'
+        expect('a.{*}.c').to match_key 'a.b.c'
+        expect('a.{*}.c').to match_key 'a.b.x.y.c'
       end
 
       it 'captures' do
         p = 'a.{x,y}.{:}'
         compile_key_pattern(p) =~ 'a.x.c'
-        [$1, $2].should == ['x', 'c']
+        expect([$1, $2]).to eq(['x', 'c'])
       end
     end
   end

data/spec/relative_keys_spec.rb

@@ -6,13 +6,13 @@ describe 'Relative keys' do
 
     context 'default settings' do
       it 'works' do
-        scanner.absolutize_key('.title', 'app/views/movies/show.html.slim', %w(app/views)).should == 'movies.show.title'
+        expect(scanner.absolutize_key('.title', 'app/views/movies/show.html.slim', %w(app/views))).to eq('movies.show.title')
       end
     end
 
     context 'custom roots' do
       it 'works' do
-        scanner.absolutize_key('.title', 'app/views-mobile/movies/show.html.slim', %w(app/views app/views-mobile)).should == 'movies.show.title'
+        expect(scanner.absolutize_key('.title', 'app/views-mobile/movies/show.html.slim', %w(app/views app/views-mobile))).to eq('movies.show.title')
       end
     end
 

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   Coveralls.wear! 'rails'
 end
 
-require 'rspec/autorun'
 $: << File.expand_path('../lib', __FILE__)
 
 require 'i18n/tasks'

data/spec/support/i18n_tasks_output_matcher.rb

@@ -26,10 +26,10 @@ RSpec::Matchers.define :be_i18n_keys do |expected|
   end
 
   match do |actual|
-    extract_keys(actual).sort.should == expected.sort
+    expect(extract_keys(actual).sort).to eq(expected.sort)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     e = expected.sort
     a = extract_keys(actual).sort
 

data/spec/support/key_pattern_matcher.rb

@@ -3,6 +3,6 @@ RSpec::Matchers.define :match_key do |key|
   include I18n::Tasks::KeyPatternMatching
 
   match do |pattern|
-    compile_key_pattern(pattern).should =~ key
+    expect(compile_key_pattern(pattern)).to match(key)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.0
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -154,16 +154,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -285,9 +285,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2