i18n-tasks 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0198838a2cf17a2fc7a9913b57834523ace51815
-  data.tar.gz: 7be76e4bc18d61ad4083dae29effdd766fe3c2d1
+  metadata.gz: 6927148f79d82a7dfc85f9ed1551c65ab5534e34
+  data.tar.gz: 16af9b34933d2e3101c55e8c0edd0da014faa286
 SHA512:
-  metadata.gz: bc3e3b650239a541435b7ee77b375e04e4d18c2a64ee2a1c82a9016d813d2c9145e479453502c332999d6f1e8b87facc8a955f6f2197cc29a1927a87ffd03da6
-  data.tar.gz: a161e61578a2ba3b63e23add1724d67e5b4f05cfb4a795c5cf33542bddb1d210019150a75e7976ef3b11aa31a2f0002c5bc0167442ee65b2790da3482cbab5ab
+  metadata.gz: 2fac88101d8d8087cf436299a25be28a56e70305f28b2c15c43d0888e1b3da34bb6ca23683d7dca216ecc27b7fa32324645882a77ee87b76c7dc7ead85e81b87
+  data.tar.gz: 4692ca4f35efcce3f1069f6d6068c4db6e492f99be500f57c4c88bf2bdf57d31ca7215edc23f8cdc5d16e3213c4c1ff3fded90378cf71a653638253cc368c11d

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.8.4
+
+* Support relative keys in mailers [#155](https://github.com/glebm/i18n-tasks/issues/155).
+
 ## 0.8.3
 
 * Fix regression: ActiveSupport < 4 support [#143](https://github.com/glebm/i18n-tasks/issues/143).

data/i18n-tasks.gemspec

@@ -37,7 +37,7 @@ TEXT
   s.add_dependency 'activesupport'
   s.add_dependency 'easy_translate', '>= 0.5.0'
   s.add_dependency 'term-ansicolor'
-  s.add_dependency 'terminal-table'
+  s.add_dependency 'terminal-table', '~> 1.4.5'
   s.add_dependency 'highline'
   s.add_dependency 'i18n'
   s.add_development_dependency 'axlsx', '~> 2.0'

data/lib/i18n/tasks.rb

@@ -24,12 +24,19 @@ module I18n
 end
 
 
+require 'active_support/inflector'
 require 'active_support/core_ext/hash'
-require 'active_support/core_ext/string'
 require 'active_support/core_ext/array/access'
+require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/blank'
+begin
+  # activesupport >= 3
+  require 'active_support/core_ext/object/try'
+rescue LoadError => _e
+  # activesupport ~> 2.3.2
+  require 'active_support/core_ext/try'
+end
 require 'term/ansicolor'
 require 'erubis'
 

data/lib/i18n/tasks/command/collection.rb

@@ -1,3 +1,4 @@
+require 'i18n/tasks/command/dsl'
 require 'i18n/tasks/command/options/common'
 require 'i18n/tasks/command/options/locales'
 require 'i18n/tasks/command/options/data'

data/lib/i18n/tasks/command/commands/missing.rb

@@ -1,3 +1,5 @@
+require 'i18n/tasks/command/collection'
+
 module I18n::Tasks
   module Command
     module Commands

data/lib/i18n/tasks/command/dsl.rb

@@ -3,9 +3,7 @@ module I18n::Tasks
     module DSL
       def self.included(base)
         base.module_eval do
-          @dsl = HashWithIndifferentAccess.new { |h, k|
-            h[k] = HashWithIndifferentAccess.new
-          }
+          @dsl = Hash.new { |h, k| h[k] = {} }
           extend ClassMethods
         end
       end

data/lib/i18n/tasks/command/options/common.rb

@@ -1,3 +1,4 @@
+require 'i18n/tasks/command/dsl'
 
 module I18n::Tasks
   module Command

data/lib/i18n/tasks/data.rb

@@ -10,11 +10,11 @@ module I18n::Tasks
       @data ||= begin
         data_config   = (config[:data] || {}).with_indifferent_access
         data_config.merge!(base_locale: base_locale, locales: config[:locales])
-        adapter_class = data_config[:adapter].presence || data_config[:class].presence || :file_system
+        adapter_class = data_config[:adapter].presence || data_config[:class].presence || 'file_system'
         adapter_class = adapter_class.to_s
-        adapter_class = "I18n::Tasks::Data::#{adapter_class.camelize}" if adapter_class !~ /[A-Z]/
+        adapter_class = 'I18n::Tasks::Data::FileSystem' if adapter_class == 'file_system'
         data_config.except!(:adapter, :class)
-        adapter_class.constantize.new data_config
+        ActiveSupport::Inflector.constantize(adapter_class).new data_config
       end
     end
 

data/lib/i18n/tasks/data/file_system_base.rb

@@ -122,13 +122,16 @@ module I18n::Tasks
         self.router = router_was
       end
 
+
+      ROUTER_NAME_ALIASES = {
+          'conservative_router' => 'I18n::Tasks::Data::Router::ConservativeRouter',
+          'pattern_router' => 'I18n::Tasks::Data::Router::PatternRouter'
+      }
       def router
         @router ||= begin
           name = @config[:router].presence || 'conservative_router'
-          if name[0] != name[0].upcase
-            name = "I18n::Tasks::Data::Router::#{name.classify}"
-          end
-          name.constantize.new(self, @config.merge(base_locale: base_locale, locales: locales))
+          name = ROUTER_NAME_ALIASES[name] || name
+          ActiveSupport::Inflector.constantize(name).new(self, @config.merge(base_locale: base_locale, locales: locales))
         end
       end
       attr_writer :router

data/lib/i18n/tasks/data/tree/traversal.rb

@@ -128,7 +128,7 @@ module I18n::Tasks
       def set_each_value!(val_pattern, key_pattern = nil, &value_proc)
         value_proc ||= proc { |node|
           node_value = node.value
-          human_key  = node.key.to_s.humanize
+          human_key  = ActiveSupport::Inflector.humanize(node.key.to_s)
           StringInterpolation.interpolate_soft(
               val_pattern,
               value: node_value,

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

@@ -47,7 +47,7 @@ module I18n::Tasks::Scanners
 
     def absolute_key(key, path, location)
       if key.start_with?('.')
-        if controller_file?(path)
+        if controller_file?(path) || mailer_file?(path)
           absolutize_key(key, path, relative_roots, closest_method(location))
         else
           absolutize_key(key, path)
@@ -61,6 +61,10 @@ module I18n::Tasks::Scanners
       /controllers/.match(path)
     end
 
+    def mailer_file?(path)
+      /mailers/.match(path)
+    end
+
     def closest_method(location)
       method = File.readlines(location[:src_path], encoding: 'UTF-8').first(location[:line_num] - 1).reverse_each.find { |x| x=~ /\bdef\b/ }
       method &&= method.strip.sub(/^def\s*/, '').sub(/[\(\s;].*$/, '')

data/lib/i18n/tasks/split_key.rb

@@ -17,7 +17,7 @@ module I18n
           parts << part
           pos += part.length + 1
           if parts.length + 1 >= max
-            parts << key.from(pos) unless pos == key.length
+            parts << key[pos..-1] unless pos == key.length
             break
           end
         end

data/lib/i18n/tasks/used_keys.rb

@@ -22,7 +22,7 @@ module I18n::Tasks
       @scanner ||= begin
         search_config = (config[:search] || {}).with_indifferent_access
         class_name    = search_config[:scanner] || '::I18n::Tasks::Scanners::PatternWithScopeScanner'
-        class_name.constantize.new search_config
+        ActiveSupport::Inflector.constantize(class_name).new search_config
       end
     end
 

data/lib/i18n/tasks/version.rb

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

data/spec/fixtures/config/i18n-tasks.yml

@@ -36,6 +36,7 @@ search:
   relative_roots:
     - app/views
     - app/controllers
+    - app/mailers
 
 
 # do not report these keys ever

data/spec/i18n_tasks_spec.rb

@@ -158,7 +158,7 @@ describe 'i18n-tasks' do
       }
       run_cmd 'add-missing', 'base'
       in_test_app_dir {
-        expect(YAML.load_file('config/locales/en.yml')['en']['used_but_missing']['key']).to eq I18n.t('i18n_tasks.common.key')
+        expect(YAML.load_file('config/locales/en.yml')['en']['used_but_missing']['key']).to eq 'Key'
         expect(YAML.load_file('config/locales/en.yml')['en']['present_in_es_but_not_en']['a']).to eq 'ES_TEXT'
       }
     end

data/spec/relative_keys_spec.rb

@@ -55,5 +55,44 @@ describe 'Relative keys' do
         end
       end
     end
+
+    context 'relative key in mailer' do
+      it 'works' do
+        key = scanner.absolutize_key(
+          '.subject',
+          'app/mailers/user_mailer.rb',
+          %w(app/mailers),
+          'welcome'
+        )
+
+        expect(key).to eq('user_mailer.welcome.subject')
+      end
+
+      context 'multiple words in mailer name' do
+        it 'works' do
+          key = scanner.absolutize_key(
+            '.subject',
+            'app/mailers/admin_user_mailer.rb',
+            %w(app/mailers),
+            'welcome'
+          )
+
+          expect(key).to eq('admin_user_mailer.welcome.subject')
+        end
+      end
+
+      context 'nested in module' do
+        it 'works' do
+          key = scanner.absolutize_key(
+            '.subject',
+            'app/mailers/nested/user_mailer.rb',
+            %w(app/mailers),
+            'welcome'
+          )
+
+          expect(key).to eq('nested.user_mailer.welcome.subject')
+        end
+      end
+    end
   end
 end

data/spec/support/capture_std.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'active_support/core_ext/kernel/reporting'
 module CaptureStd
   def capture_stderr
     err, $stderr = $stderr, StringIO.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -70,16 +70,16 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement