i18n-tasks 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71be19b5936a14fe104e5637369097c2a835b57a
-  data.tar.gz: bf6e3c088c8f202032c81f71782acff219465c0c
+  metadata.gz: c36031ff1ffa5b67ffd68c4fc5375f4508598eff
+  data.tar.gz: 1dec92e192b4f30d33ba4411a69c55cb09ff542e
 SHA512:
-  metadata.gz: 22661c315b535b89fd04b9d8efc52781da3b5409f3474ae9ada566d98e96795ca802988c917fd300e90d889b6c6057ef4fab144d98e212d5f592e87303c57967
-  data.tar.gz: 1d9778f7d2ae1a3a56e76fe33ed00d7fcfb453337e224deac743b21213aee2b8f2beaadd005133abe991ea49004fe10a6c95743302f5152fa7aef378bc4ca017
+  metadata.gz: 636e7c94c6890519aa730e7b1aa13a8dba0c9d323c0b59214dc9474bf39fff80266267a770e41974eff888f7805fc59be63c1d3873094558d23319a13f1eb344
+  data.tar.gz: ce2e60ac8f14d31357a9508a9160f7cd2eb308e3c5df0793156b22fbcd160356188a40eb3a7d215f2894c23893510e6068dcb8461f60159654e0fdc2afaeba1e

data/.travis.yml

@@ -2,12 +2,13 @@ language: ruby
 rvm:
 - 2.1.1
 - 2.0.0
+- 1.9.3
 - jruby-head
 - rbx-2
 matrix:
   allow_failures:
   # no keyword argument support in rbx
-  - rbx
+  - rvm: rbx-2
 env:
   global:
   - TRAVIS=1

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.4.2
+
+* Ruby 1.9.3-compatible again
+
 ## 0.4.1
 
 * Improved error messages across the board

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 
 group :development do
   gem 'coveralls', require: false
-  gem 'byebug', platform: :mri, require: false
+  gem 'byebug', platform: :mri_20, require: false
 end

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.4.0'
+gem 'i18n-tasks', '~> 0.4.2'
 ```
 
 i18n-tasks does not load or execute any of the application's code but performs static-only analysic.

data/lib/i18n/tasks/commands.rb

@@ -98,7 +98,8 @@ module I18n::Tasks
     cmd :config do
       cfg = i18n_task.config_for_inspect.to_yaml
       cfg.sub! /\A---\n/, ''
-      cfg.gsub! /^([^\s-].+?)$/, Term::ANSIColor.cyan(Term::ANSIColor.bold('\1'))
+      cfg.gsub! /^([^\s-].+?:)/, Term::ANSIColor.cyan(Term::ANSIColor.bold('\1'))
+      cfg.gsub! '!ruby/hash:ActiveSupport::HashWithIndifferentAccess', ''
       puts cfg
     end
 

data/lib/i18n/tasks/configuration.rb

@@ -9,6 +9,7 @@ module I18n::Tasks::Configuration
       config/i18n-tasks.yml config/i18n-tasks.yml.erb
       i18n-tasks.yml i18n-tasks.yml.erb
   )
+
   def file_config
     file = CONFIG_FILES.detect { |f| File.exists?(f) }
     file = YAML.load(Erubis::Eruby.new(File.read(file)).result) if file
@@ -27,7 +28,7 @@ module I18n::Tasks::Configuration
     @config_sections[:data] ||= begin
       {
           adapter: data.class.name,
-          config: data.config
+          config:  data.config
       }
     end
   end
@@ -97,6 +98,13 @@ module I18n::Tasks::Configuration
 
   def config_for_inspect
     # hide empty sections, stringify keys
-    Hash[config_sections.reject { |k, v| v.empty? }.map { |k, v| [k.to_s, v.respond_to?(:stringify_keys) ? v.stringify_keys : v] }]
+    Hash[config_sections.reject { |k, v| v.empty? }.map { |k, v|
+      [k.to_s, v.respond_to?(:stringify_keys) ? v.stringify_keys : v] }].tap do |h|
+      h.each do |_k, v|
+        if v.is_a?(Hash) && v.key?('config')
+          v.merge! v.delete('config')
+        end
+      end
+    end
   end
 end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'i18n/tasks/data/tree/traversal'
 require 'i18n/tasks/data/tree/siblings'
 module I18n::Tasks::Data::Tree
@@ -5,12 +7,12 @@ module I18n::Tasks::Data::Tree
     attr_accessor :value
     attr_reader :key, :children, :parent
 
-    def initialize(key: nil, value: nil, data: nil, parent: nil, children: nil)
-      @key          = key.try(:to_s)
-      @value        = value
-      @data         = data
-      @parent       = parent
-      self.children = children if children
+    def initialize(opts = {})
+      @key          = opts[:key].try(:to_s)
+      @value        = opts[:value]
+      @data         = opts[:data]
+      @parent       = opts[:parent]
+      self.children = opts[:children] if opts[:children]
     end
 
     def attributes
@@ -113,7 +115,8 @@ module I18n::Tasks::Data::Tree
       derive.append!(nodes)
     end
 
-    def full_key(root: true)
+    def full_key(opts = {})
+      root = opts.key?(:root) ? opts[:root] : true
       @full_key       ||= {}
       @full_key[root] ||= "#{"#{parent.full_key(root: root)}." if parent? && (root || parent.parent?)}#{key}"
     end
@@ -151,7 +154,7 @@ module I18n::Tasks::Data::Tree
     delegate :to_json, to: :to_hash
     delegate :to_yaml, to: :to_hash
 
-    def inspect(level: 0)
+    def inspect(level = 0)
       label =
           if null?
             Term::ANSIColor.dark '∅'
@@ -167,7 +170,7 @@ module I18n::Tasks::Data::Tree
 
       r = "#{'  ' * level}#{label}"
       if children?
-        r += "\n" + children.map { |c| c.inspect(level: level + 1) }.join("\n") if children?
+        r += "\n" + children.map { |c| c.inspect(level + 1) }.join("\n") if children?
       end
       r
     end

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

@@ -1,11 +1,13 @@
+# coding: utf-8
+
 require 'i18n/tasks/data/tree/traversal'
 module I18n::Tasks::Data::Tree
   # A list of nodes
   class Nodes
     attr_reader :list
 
-    def initialize(nodes: [])
-      @list = nodes.to_a.clone
+    def initialize(opts = {})
+      @list = opts[:nodes] ? opts[:nodes].to_a.clone : []
     end
 
     delegate :each, :present?, :empty?, :blank?, :size, :to_a, to: :@list

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'i18n/tasks/data/tree/traversal'
 require 'i18n/tasks/data/tree/nodes'
 module I18n::Tasks::Data::Tree
@@ -7,11 +9,11 @@ module I18n::Tasks::Data::Tree
   class Siblings < Nodes
     attr_reader :parent, :key_to_node
 
-    def initialize(nodes: [], parent: nil)
-      super(nodes: nodes)
+    def initialize(opts = {})
+      super(nodes: opts[:nodes])
       @key_to_node = siblings.inject({}) { |h, node| h[node.key] = node; h }
       @parent      = first.try(:parent) || Node.null
-      self.parent  = parent if parent
+      self.parent  = opts[:parent] if opts[:parent]
     end
 
     def attributes
@@ -111,9 +113,10 @@ module I18n::Tasks::Data::Tree
 
       # build forest from nested hash, e.g. {'es' => { 'common' => { name => 'Nombre', 'age' => 'Edad' } } }
       # this is the native i18n gem format
-      def from_nested_hash(hash, parent: Node.null)
+      def from_nested_hash(hash, opts = {})
+        opts[:parent] ||= Node.null
         Siblings.new nodes: hash.map { |key, value| Node.from_key_value key, value },
-                     parent: parent
+                     parent: opts[:parent]
       end
 
       alias [] from_nested_hash

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

@@ -14,7 +14,8 @@ module I18n::Tasks::Data::Tree
     end
 
     # @param root include root in full key
-    def keys(root: true, &visitor)
+    def keys(opts = {}, &visitor)
+      root = opts.key?(:root) ? opts[:root] : true
       return to_enum(:keys, root: root) unless visitor
       leaves { |node| visitor.yield(node.full_key(root: root), node) }
     end
@@ -65,7 +66,8 @@ module I18n::Tasks::Data::Tree
     end
 
     # @return Siblings
-    def select_keys(root: true, &block)
+    def select_keys(opts = {}, &block)
+      root = opts.key?(:root) ? opts[:root] : true
       ok = {}
       keys(root: root) do |full_key, node|
         if block.yield(full_key, node)

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis