i18n-tasks 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfe7323638e8b9f562528fbe39b95485723ad281
-  data.tar.gz: e400db0a471a49ef707b2649ce5f61794a8dafae
+  metadata.gz: f197d49c3a8d79992339e4ba4a23e1b9f7df23ff
+  data.tar.gz: 5f08596a492cfec055aab5425353dc8ec2fda1f8
 SHA512:
-  metadata.gz: 89c721ee39ed8d8921ec6b4db5dce0b6392d300e9ec4940f9eeaab0869e186f5019a35a1224c3156777d9d580a1378c4eb4056fdf9b307224bd971a5d524d1c3
-  data.tar.gz: 6517a687403394655ea9c6e96f057b88c6d49f66fa4249fb2f60d97a2117d865d991e555a41ca839200d927a98cb665e078394301778b4d76d0bcc1ca18742f2
+  metadata.gz: caedad036795f4861f8bdc1fff7309af8c1682f8e3d61779cd8aca8ab681cad1d62b922b57a8ec51eb84608d72572873bc49b5f90ee62340fb6b3e2bd53010a9
+  data.tar.gz: 4a185853088b92aa109b392f18cd940fb30c1aeafd98e083633034886d5a411a69c3a97f834ce7bacfa4358c00e74dd8dfa052d3b7553e031cb0efea6a19e9e1

data/CHANGES.md

@@ -1,3 +1,6 @@
+## v0.1.5
+* Removed get_locale_data, added data configuration options
+
 ## v0.1.4
 
 * Fix relative keys in partials (@paulfioravanti)

data/README.md

@@ -59,35 +59,29 @@ ignore_unused:
 ignore:
   - kaminari.
 
-# grep configuration
+# search configuration (grep arguments)
 grep:
   # search these directories (relative to your Rails.root directory, default: 'app/')
   paths:
     - 'app/'
-    - 'vendor/'
   # include only files matching this glob pattern (default: blank = include all files)
   include:
     - '*.rb'
     - '*.html*'
   # explicitly exclude files (default: blank = exclude no files)
   exclude: '*.js'
-```
-
 
-By default reports I18n reads locale data from `config/locales/{locale_code}.yml`.
-You can customize this, e.g.:
-
-```ruby
-# load all config/locales/*.locale.yml and config/locales/locale.yml:
-I18n::Tasks.get_locale_data = ->(locale) {
-  (["config/locales/#{locale}.yml"] + Dir["config/locales/*.#{locale}.yml"]).inject({}) { |hash, path|
-    hash.deep_merge! YAML.load_file(path)
-    hash
-  }
-}
+# where to read locale data from
+data:
+  # file patterns for a given %{locale} (supports globs)
+  paths:
+    # default:
+    - 'config/locales/%{locale}.yml'
+  # you can also implement a custom loader, use the default as an example
+  class: I18n::Tasks::Data::Yaml
 ```
 
-## i18n-tasks HTML report
+## HTML report
 
 While i18n-tasks does not provide an HTML version of the report, it's easy to roll your own, see [the example](https://gist.github.com/glebm/6887030).
 
@@ -95,3 +89,7 @@ While i18n-tasks does not provide an HTML version of the report, it's easy to ro
 
 This was originally developed for [Zuigo](http://zuigo.com/), a platform to organize and discover events.
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/glebm/i18n-tasks/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/i18n-tasks.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = I18n::Tasks::VERSION
   spec.authors       = ['glebm']
   spec.email         = ['glex.spb@gmail.com']
-  spec.summary       = %q{Rails I18n tasks to find missing / unused translations and more}
+  spec.summary       = %q{Find all the missing and unused translations!}
   spec.description   = %q{Rails I18n tasks to find missing / unused translations and more}
   spec.homepage      = 'https://github.com/glebm/i18n-tasks'
   spec.license       = 'MIT'

data/lib/i18n/tasks.rb

@@ -1,14 +1,11 @@
 require 'i18n/tasks/version'
 require 'i18n/tasks/railtie'
+require 'i18n/tasks/data/yaml'
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/string/access'
 
 module I18n
   module Tasks
-    mattr_accessor :get_locale_data
-    self.get_locale_data = lambda { |locale|
-      YAML.load_file("config/locales/#{locale}.yml")
-    }
-
     CONFIG_FILE = 'config/i18n-tasks.yml'
     class << self
       def config

data/lib/i18n/tasks/base_task.rb

@@ -9,8 +9,21 @@ module I18n
 
       # locale data hash, with locale name as root
       # @return [Hash{String => String,Hash}] locale data in nested hash format
-      def get_locale_data(locale)
-        (@locale_data ||= {})[locale] ||= I18n::Tasks.get_locale_data.call(locale)
+      def locale_data(locale)
+        locale                        = locale.to_s
+        (@locale_data ||= {})[locale] ||= data_source.get(locale)
+      end
+
+      def data_source
+        return @source if @source
+        conf    = config[:data] || {}
+        @source = if conf[:class]
+                    conf[:class].constantize.new(conf.except(:class))
+                  else
+                    I18n::Tasks::Data::Yaml.new(
+                        paths: Array(conf[:paths].presence || ['config/locales/%{locale}.yml'])
+                    )
+                  end
       end
 
       # main locale file path (for writing to)
@@ -64,7 +77,7 @@ module I18n
 
       # whether the value for key exists in locale (defaults: base_locale)
       def key_has_value?(key, locale = base_locale)
-        t(get_locale_data(locale)[locale], key).present?
+        t(locale_data(locale)[locale], key).present?
       end
 
       # traverse hash, yielding with full key and value
@@ -72,11 +85,11 @@ module I18n
       # @yield [full_key, value] yields full key and value for every translation in #hash
       # @return [nil]
       def traverse(path = '', hash)
-        q = [ [path, hash] ]
+        q = [[path, hash]]
         until q.empty?
           path, value = q.pop
           if value.is_a?(Hash)
-            value.each { |k,v| q << ["#{path}.#{k}", v] }
+            value.each { |k, v| q << ["#{path}.#{k}", v] }
           else
             yield path[1..-1], value
           end
@@ -86,7 +99,7 @@ module I18n
       # translation of the key found in the passed hash or nil
       # @return [String,nil]
       def t(hash, key)
-        key.split('.').inject(hash) { |r,seg| r[seg] if r }
+        key.split('.').inject(hash) { |r, seg| r[seg] if r }
       end
 
       # @param key [String] relative i18n key (starts with a .)
@@ -94,7 +107,7 @@ module I18n
       # @return [String] absolute version of the key
       def absolutize_key(key, path)
         # normalized path
-        path = Pathname.new(File.expand_path path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+        path   = Pathname.new(File.expand_path path).relative_path_from(Pathname.new(Dir.pwd)).to_s
         # key prefix based on path
         prefix = path.gsub(%r(app/views/|(\.[^/]+)*$), '').tr('/', '.').gsub(%r(\._), '.')
         "#{prefix}#{key}"
@@ -124,7 +137,7 @@ module I18n
 
       # @return [Hash{String => String,Hash}] default i18n locale data
       def base_locale_data
-        get_locale_data(base_locale)[base_locale]
+        locale_data(base_locale)[base_locale]
       end
 
       # Run grep searching for source keys and return grep output
@@ -135,7 +148,7 @@ module I18n
           next unless (val = grep_config[opt]).present?
           args += Array(val).map { |v| "--#{opt}=#{v}" }
         end
-        args += [ %q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, *grep_config[:paths]]
+        args += [%q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, *grep_config[:paths]]
         args.compact!
         run_command *args
       end

data/lib/i18n/tasks/data/yaml.rb

@@ -0,0 +1,22 @@
+module I18n::Tasks
+  module Data
+    class Yaml
+      attr_reader :paths
+
+      def initialize(options)
+        @paths = options[:paths]
+      end
+
+      def get(locale)
+        paths.map do |path|
+          Dir.glob path % { locale: locale }
+        end.flatten.map do |locale_file|
+          YAML.load_file locale_file
+        end.inject({}) do |hash, locale_data|
+          hash.deep_merge! locale_data
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/i18n/tasks/missing.rb

@@ -29,7 +29,7 @@ module I18n
       # present in base locale, but untranslated in another locale
       # @return Array{Hash}
       def keys_missing_translation(locale)
-        trn = get_locale_data(locale)[locale]
+        trn = locale_data(locale)[locale]
         r   = []
         traverse base_locale_data do |key, base_value|
           value_in_locale = t(trn, key)

data/lib/i18n/tasks/prefill.rb

@@ -6,7 +6,7 @@ module I18n
       def perform
         # Will also rewrite en, good for ordering
         I18n.available_locales.map(&:to_s).each do |target_locale|
-          trn = get_locale_data(target_locale)
+          trn = locale_data(target_locale)
           prefilled = { target_locale => base_locale_data }.deep_merge(trn)
           File.open(locale_file_path(target_locale), 'w'){ |f| f.write prefilled.to_yaml }
         end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

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

@@ -31,3 +31,11 @@ grep:
     - '*.file'
   # explicitly exclude files (default: blank = exclude no files)
   exclude: '*.js'
+
+# how to get the locale data
+data:
+  paths:
+    # files for a given %{locale}
+    - 'config/locales/%{locale}.yml'
+    - 'config/locales/*.%{locale}.yml'
+  class: I18n::Tasks::Data::Yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,6 +127,7 @@ files:
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
+- lib/i18n/tasks/data/yaml.rb
 - lib/i18n/tasks/missing.rb
 - lib/i18n/tasks/output/terminal.rb
 - lib/i18n/tasks/prefill.rb
@@ -166,10 +167,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
-summary: Rails I18n tasks to find missing / unused translations and more
+summary: Find all the missing and unused translations!
 test_files:
 - spec/fixtures/app/assets/javascripts/application.js
 - spec/fixtures/app/controllers/events_controller.rb