i18n-tasks 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b2e4af8b66aed1ff33eba3cb802322ceea57db
-  data.tar.gz: 951337877ce07c613b5765b609dd0c3508742a89
+  metadata.gz: 1adbf899220bdaffacd8f8b95f74eb2c102268a6
+  data.tar.gz: 028937e7d90a8af43ad66497a0b3f869c52fb599
 SHA512:
-  metadata.gz: 8b04b6fbabcd0598b2473162142679e81ef5eec9301c3c9362bc44a81084517fbf8d254c1015b0b5dc5365261730550c1356db3cc7d57e56a78ff3a85be1e471
-  data.tar.gz: 2ecb5edaa048079936459dc1f8d607aafe441abb352e7ee0e8585c1a5e251336d8206cc0e7840a3a95a84de78963baafd181a46f779120322ef5736466bfbb35
+  metadata.gz: 16ee9ac1ea60d4ed1d04881d9c40fdc88478c16c9d0471d8b94d31a77a2a44e915b4236ad8d13a7c3517d40e7179ff9909c5215f828b8d193b19b61b59ee0747
+  data.tar.gz: 025e2fee7f5590377e4b8ddfb2cec98256e45ff120ef5219d545064d745a23430b15cd071683edf0aa44618e22cdb3b78073be13c1c64a826e18e958db5cc4b7

data/CHANGES.md

@@ -1,3 +1,22 @@
+## 0.7.1
+
+* 1.9.3 compatibility
+
+## 0.7.0
+
+New tasks:
+
+* `i18n-tasks health` to display missing and unused keys along with other information
+* `i18n-tasks tree-` to manipulate trees
+* `i18n-tasks data-` to look up and manipulate locale data
+* Better `help` for all commands
+* Minor bug fixes
+
+Internally:
+
+* Refactored commands DSL
+* `add-missing`, `remove-unused` implemented in terms of the new `tree-` commands
+
 ## 0.6.3
 
 * Strict mode added for `unused` and `remove-unused`. When passed `-s` or `--strict`, these tasks will not attempt to infer dynamic key usages, such as `t("category.#{category.key}")`.

data/README.md

@@ -25,7 +25,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.7.0'
+gem 'i18n-tasks', '~> 0.7.1'
 ```
 
 Copy default [configuration file](#configuration) (optional):

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

@@ -2,8 +2,6 @@ module I18n::Tasks
   module Command
     module Options
       module EnumOpt
-        delegate :enum_opt, to: :class
-
         DEFAULT_ENUM_OPT_ERROR = proc { |bad, good|
           I18n.t('i18n_tasks.cmd.enum_opt.invalid_one', invalid: bad, valid: good * ', ')
         }
@@ -38,6 +36,10 @@ module I18n::Tasks
             raise CommandError.new error_msg.call(invalid, valid)
           end
         end
+
+        def enum_opt(*args)
+          self.class.enum_opt(*args)
+        end
       end
     end
   end

data/lib/i18n/tasks/data/file_formats.rb

@@ -9,8 +9,6 @@ module I18n
           base.extend ClassMethods
         end
 
-        delegate :adapter_for_path, :adapter_by_name, :adapter_name, :adapter_names, to: :class
-
         def adapter_dump(tree, format)
           adapter_op :dump, format, tree, write_config(format)
         end
@@ -20,7 +18,7 @@ module I18n
         end
 
         def adapter_op(op, format, tree, config)
-          adapter_by_name(format).send(op, tree, config)
+          self.class.adapter_by_name(format).send(op, tree, config)
         rescue Exception => e
           raise CommandError.new("#{format} #{op} error: #{e.message}")
         end
@@ -36,14 +34,13 @@ module I18n
         end
 
         def load_file(path)
-          adapter = adapter_for_path(path)
-          adapter.parse ::File.read(path), read_config(adapter_name(adapter))
+          adapter_parse ::File.read(path), self.class.adapter_name_for_path(path)
         end
 
         def write_tree(path, tree)
           ::FileUtils.mkpath(File.dirname path)
           ::File.open(path, 'w') { |f|
-            f.write(adapter_dump(tree.to_hash, adapter_name(adapter_for_path(path))))
+            f.write adapter_dump(tree.to_hash, self.class.adapter_name_for_path(path))
           }
         end
 
@@ -54,22 +51,16 @@ module I18n
             (@fn_patterns ||= []) << [name, pattern, adapter]
           end
 
-          def adapter_for_path(path)
+          def adapter_name_for_path(path)
             @fn_patterns.detect { |(_name, pattern, _adapter)|
               ::File.fnmatch(pattern, path)
-            }.try(:last) or raise CommandError.new("Adapter not found for #{path}. Registered adapters: #{@fn_patterns.inspect}")
+            }.try(:first) or raise CommandError.new("Adapter not found for #{path}. Registered adapters: #{@fn_patterns.inspect}")
           end
 
           def adapter_names
             @fn_patterns.map(&:first)
           end
 
-          def adapter_name(adapter)
-            @fn_patterns.detect { |(adapter_name, _pattern, registered_adapter)|
-              registered_adapter == adapter
-            }.try(:first) or raise CommandError.new("Adapter #{adapter.inspect} is not registered. Registered adapters: #{@fn_patterns.inspect}")
-          end
-
           def adapter_by_name(name)
             name = name.to_s
             @fn_patterns.detect { |(adapter_name, _pattern, _adapter)|

data/lib/i18n/tasks/plural_keys.rb

@@ -5,12 +5,12 @@ module I18n::Tasks::PluralKeys
   PLURAL_KEY_RE = /\.(?:#{PLURAL_KEY_SUFFIXES.to_a * '|'})$/
 
   def collapse_plural_nodes!(tree)
-    tree.leaves.select(&:parent?).map(&:parent).uniq.each do |node|
+    tree.leaves.map(&:parent).compact.uniq.each do |node|
       children = node.children
-      if children.present? && children.all? { |c| PLURAL_KEY_SUFFIXES.include?(c.key) }
+      if plural_forms?(children)
         node.value    = children.to_hash
-        node.data.merge!(children.first.data)
         node.children = nil
+        node.data.merge! children.first.data
       end
     end
     tree
@@ -23,10 +23,18 @@ module I18n::Tasks::PluralKeys
     return key if key !~ PLURAL_KEY_RE
     parent_key = split_key(key)[0..-2] * '.'
     nodes = tree("#{locale}.#{parent_key}").presence || (locale != base_locale && tree("#{base_locale}.#{parent_key}"))
-    if nodes && nodes.all? { |x| x.leaf? && ".#{x.key}" =~ PLURAL_KEY_RE }
+    if nodes && plural_forms?(nodes)
       parent_key
     else
       key
     end
   end
+
+  def plural_forms?(s)
+    s.present? && s.all? { |node| node.leaf? && plural_suffix?(node.key) }
+  end
+
+  def plural_suffix?(key)
+    PLURAL_KEY_SUFFIXES.include?(key)
+  end
 end

data/lib/i18n/tasks/version.rb

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

metadata

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