i18n-tasks 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760bba77247fae6727219b0e36b605c01f760dff
-  data.tar.gz: 12e5076cdf6279ae466e8137c84ea7f08f155eb7
+  metadata.gz: 217d5375c8adaf43404a25edbb7b8d1e0ace0846
+  data.tar.gz: 7cb0ada61b7e6d10f4da54c879eb8955eed92400
 SHA512:
-  metadata.gz: 739772e09dde3095da37f5e0e47e53ce03564448479867de3b6b4bc7300d1aad9c331b7182ce28f942e29032b6ba30524e398b627ae04d6ce2a05373c09a321c
-  data.tar.gz: 39e7fad91f6269ab0aff4e60ef9d44a6e48baa34c134b177e21974a2aaf2828382af8b640817e6a53efd482531742bcb788a1ce0d8727cb6d0f661b526acccb1
+  metadata.gz: c8a931302b28482f56cef52028280832c0a9e963c9e6c4ee28131c139db5b4e2667719f7776f192a8106b91200704ca80e8e1b5c2152a04dfa8b5410dc7c1579
+  data.tar.gz: 4e9597da0828551fcd2fb82ae0a2a21d84bf4f699137d6b16e58b4de57433554ea2f6b44a21f64841271ddc71b21b87cd1aa6458db9b5b59da24dd504c3b8ca6

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
-  - jruby
-  - rbx
+- 2.1.0
+- 2.0.0
+- 1.9.3
+- jruby
+- rbx
 env:
   global:
-    - TRAVIS=1
+  - TRAVIS=1
+  - secure: Clln+r2rG6adnmVjS0zGMVHs1hOq58UPIqRE73xW3MPLOdozGUyIZ0RrAU2new1h4sqk/5HVwG5NSW7AsUJDGgkNCDx4saJbf/G+oKIity1zNxlHZu5ijZOZGyxYNzGGM4cb2OO6RS6lfzA6TFv2TQtw8DDfKjzG2gpuJOje8sU=

data/i18n-tasks.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rake'
   s.add_dependency 'erubis'
   s.add_dependency 'activesupport'
-  s.add_dependency 'easy_translate'
+  s.add_dependency 'easy_translate', '>= 0.4.0'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'terminal-table'
   s.add_dependency 'highline'

data/lib/i18n/tasks/configuration.rb

@@ -26,7 +26,7 @@ module I18n::Tasks::Configuration
     end
   end
 
-  DEFAULT_PATTERN = /\bt[( ]\s*(:?".+?"|:?'.+?'|:\w+)/
+  DEFAULT_PATTERN = /\bt(?:ranslate)?[( ]\s*(:?".+?"|:?'.+?'|:\w+)/
   # search config
   # @return [Hash{String => String,Hash,Array}]
   def search_config

data/lib/i18n/tasks/source_keys.rb

@@ -41,17 +41,15 @@ module I18n::Tasks::SourceKeys
   end
 
   # Extract i18n keys from file
-  # @return [String] list of unique, absolut keys
+  # @return [String] keys used in file (absolutized and unique)
   def extract_keys(path)
     keys = []
     File.open(path, 'rb') do |f|
-      while (line = f.gets)
-        line.scan(search_config[:pattern]) do |match|
-          key = parse_key(match)
-          key = absolutize_key(key, path) if key.start_with? '.'
-          if key =~ /^[\w.\#{}]+$/
-            keys << key
-          end
+      f.read.scan(search_config[:pattern]) do |match|
+        key = parse_key(match)
+        key = absolutize_key(key, path) if key.start_with? '.'
+        if key =~ /^[\w.\#{}]+$/
+          keys << key
         end
       end
     end
@@ -59,6 +57,7 @@ module I18n::Tasks::SourceKeys
   end
 
   private
+  # remove the leading colon and unwrap quotes from the key match
   def parse_key(match)
     key = match[0]
     key.slice!(0) if ':' == key[0]

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.2.14'
+    VERSION = '0.2.15'
   end
 end

data/spec/source_keys_spec.rb

@@ -8,7 +8,7 @@ describe 'Source keys' do
     ['t "a.b"', "t 'a.b'", 't("a.b")', "t('a.b')",
      "t('a.b', :arg => val)", "t('a.b', arg: val)",
      "t :a_b", "t :'a.b'", 't :"a.b"', "t(:ab)", "t(:'a.b')", 't(:"a.b")',
-    'I18n.t("a.b")'].each do |s|
+    'I18n.t("a.b")', 'I18n.translate("a.b")'].each do |s|
       it "matches #{s}" do
         pattern.should match s
       end
@@ -20,4 +20,4 @@ describe 'Source keys' do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Tasks to manage missing and unused translations in ruby applications using