i18n-tasks 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ba419e2a8a2c55b5a06ae4bebd614498107330
-  data.tar.gz: 1f61d868e4ed17245c9932eb2a0fc7e5d79ecb7b
+  metadata.gz: a8fdd3b0e7a3f582d6ebf37b2fa35117f626ce72
+  data.tar.gz: 2e487915be57d0b7392bba89bb666a28fd143d23
 SHA512:
-  metadata.gz: 013ee29af74037df89abd7e74c9bede1423d7274fa752fba8aca4d0f04c13408dc509df796cacd817ed090e766c89d7e3df5562543cec87aa58c6d288c1fe761
-  data.tar.gz: ef12279c48c34e3691ad826569d30b88b01cc9a082756c0d8d7bb5f3807de0fbd6c2076ad9bf66e5b2a59b3dde225752c7ebb752013b9958c58130f628b83a69
+  metadata.gz: 445084513fabeddd582963ed14d6fbb8345f45781c294b7d20bd97aeb5fa88820dcd75d268a9a1e701175d982ef9f3e1f2f46e31e07f1bae03b1af6b82978772
+  data.tar.gz: 23e916f594cd903f57d9b130a39d2ee89b834c319db8e15c9791caa963bb183f9161718079d81c1b8ce2318fb01a25a94027836fa9794b85bf4c6a85acb7662c

data/README.md

@@ -24,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.9.11'
+gem 'i18n-tasks', '~> 0.9.12'
 ```
 
 Copy the default [configuration file](#configuration):

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

@@ -10,14 +10,17 @@ module I18n::Tasks::Data::Tree
     attr_accessor :value
     attr_reader :key, :children, :parent
 
-    def initialize(key:, value: nil, data: nil, parent: nil, children: nil)
+    # rubocop:disable Metrics/ParameterLists
+    def initialize(key:, value: nil, data: nil, parent: nil, children: nil, warn_about_add_children_to_leaf: true)
       @key = key
       @key = @key.to_s.freeze if @key
       @value = value
       @data = data
       @parent = parent
+      @warn_about_add_children_to_leaf = warn_about_add_children_to_leaf
       self.children = (children if children)
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def attributes
       { key: @key, value: @value, data: @data.try(:clone), parent: @parent, children: @children }
@@ -34,7 +37,11 @@ module I18n::Tasks::Data::Tree
                   when NilClass
                     nil
                   else
-                    Siblings.new(nodes: children, parent: self)
+                    Siblings.new(
+                      nodes: children,
+                      parent: self,
+                      warn_about_add_children_to_leaf: @warn_about_add_children_to_leaf
+                    )
                   end
       dirty!
     end

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

@@ -18,6 +18,7 @@ module I18n::Tasks::Data::Tree
       @parent = opts[:parent] || first.try(:parent)
       @list.map! { |node| node.parent == @parent ? node : node.derive(parent: @parent) }
       @key_to_node = @list.each_with_object({}) { |node, h| h[node.key] = node }
+      @warn_about_add_children_to_leaf = opts.fetch(:warn_about_add_children_to_leaf, true)
     end
 
     def attributes
@@ -104,11 +105,16 @@ module I18n::Tasks::Data::Tree
 
       if rest
         unless child
-          child = Node.new(key: key_part, parent: parent, children: [])
+          child = Node.new(
+            key: key_part,
+            parent: parent,
+            children: [],
+            warn_about_add_children_to_leaf: @warn_add_children_to_leaf
+          )
           append! child
         end
         unless child.children
-          warn_add_children_to_leaf child
+          warn_add_children_to_leaf child if @warn_about_add_children_to_leaf
           child.children = []
         end
         child.children.set rest, node
@@ -254,7 +260,7 @@ module I18n::Tasks::Data::Tree
       # @param key_occurrences [I18n::Tasks::Scanners::KeyOccurrences]
       # @return [Siblings]
       def from_key_occurrences(key_occurrences)
-        build_forest do |forest|
+        build_forest(warn_about_add_children_to_leaf: false) do |forest|
           key_occurrences.each do |key_occurrence|
             forest[key_occurrence.key] = ::I18n::Tasks::Data::Tree::Node.new(
               key:  split_key(key_occurrence.key).last,

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

@@ -45,7 +45,7 @@ module I18n::Tasks::Scanners
       /(?:
          :scope\s*=>\s* | (?# :scope => :home )
          scope:\s*        (?#    scope: :home )
-        ) ([^\n)%#]*)/x
+        ) (\[[^\n)%#]*\]|[^\n)%#,]*)/x
     end
 
     # match code expression

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module I18n
   module Tasks
-    VERSION = '0.9.11'
+    VERSION = '0.9.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport