i18n-tasks 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b6ca864b87be5f8d5c8a1c6be42ebe3c4c4ec3c
-  data.tar.gz: 41133bde7863a0b57c9d14889ea4d56846c0c543
+  metadata.gz: e1bc1cb806707bc4c7658d1c26a943c92dbd654c
+  data.tar.gz: b63519bafa3e4f0f149a553c10af48f6e16e5b0d
 SHA512:
-  metadata.gz: 583ff94e1c15d0946de46f2dcf4a20ab9ea348a2f4ce9b60feabfbbd6e5123ae0e0fb9860c4fda7481ff5b60ab7011103cd67b646673395c16cf37dac8bf3827
-  data.tar.gz: 0d40adb4b4d03cd123aa9e099a65784fbf936da6eaaa780fa6dd1e936c769aeb5932cdc124b699f801200f11d283bba8d69b10814ffd8589cc39bc8372a8fef4
+  metadata.gz: 5b8b9bd686f9bfce0e95e335f28a14afa966acc6b2c7f3a916c8f5fe5ca6a9b7b33cac512684d768f1646f2e220f3bb4e46e1e5eaab3f178f07f3c0858e7c068
+  data.tar.gz: a5384b5edd7c0fcf17d0bd4264e81e2db0f071ddf525933403370fd1fcf6bbc5c89788b4b8bb924f1e7645561ed253618556c1083a49de69ac6240b3dd7b751a

data/CHANGES.md

@@ -1,3 +1,11 @@
+## v0.2.6
+
+* config/i18n-tasks.yml now processed with ERB (@glebm)
+
+## v0.2.5
+
+* can now be used with any ruby apps, not just Rails (@glebm)
+
 ## v0.2.4
 
 * more powerful key pattern matching with sets and backtracking (@glebm)

data/README.md

@@ -73,7 +73,7 @@ For more examples see [the tests](/spec/i18n_tasks_spec.rb).
 Simply add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.2.5'
+gem 'i18n-tasks', '~> 0.2.6'
 ```
 
 If you do not use Rails, you will also need to require the tasks in your Rakefile:
@@ -85,7 +85,15 @@ load 'tasks/i18n-tasks.rake'
 
 ## Configuration
 
-Configuration is read from `config/i18n-tasks.yml`.
+Configuration is read from `config/i18n-tasks.yml` (processed with ERB then Yaml).
+
+By default, `i18n-tasks` will work with `I18n.default_locale` and `I18n.available_locales`, but you can override this:
+
+```yaml
+# config/i18n-tasks.yml
+base_locale: en
+locales: [es, fr]
+```
 
 ### Storage
 

data/i18n-tasks.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'rake'
+  s.add_dependency 'erubis'
   s.add_dependency 'activesupport'
   s.add_dependency 'easy_translate'
   s.add_dependency 'term-ansicolor'

data/lib/i18n/tasks.rb

@@ -4,16 +4,20 @@ require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/try'
 require 'term/ansicolor'
+require 'erubis'
 require 'i18n/tasks/railtie' if defined?(Rails)
 
 module I18n
   module Tasks
-    CONFIG_FILE = 'config/i18n-tasks.yml'
+    CONFIG_FILES = %w(
+      config/i18n-tasks.yml config/i18n-tasks.yml.erb
+      i18n-tasks.yml i18n-tasks.yml.erb
+    )
     class << self
       def config
         @config ||= begin
-          file = File.read(CONFIG_FILE) if File.exists?(CONFIG_FILE)
-          file = YAML.load(file) if file.present?
+          file = File.read(CONFIG_FILES.detect { |f| File.exists?(f) })
+          file = YAML.load(Erubis::Eruby.new(file).result) if file.present?
           HashWithIndifferentAccess.new.merge(file.presence || {})
         end
       end

data/lib/i18n/tasks/data_traversal.rb

@@ -4,7 +4,7 @@ module I18n::Tasks::DataTraversal
   def t(hash = data[base_locale], key)
     if hash.is_a?(String)
       # has is a locale
-      raise ArgumentError.new("invalid locale: #{hash}") if hash =~ /\W/
+      raise ArgumentError.new("invalid locale: #{hash}") if hash =~ /[^A-z-]/
       hash = data[hash]
     end
     key.split('.').inject(hash) { |r, seg| r[seg] if r }

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - glebm
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement