i18n-tasks 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aaee1c5ad26d0ecf8e4b35f358ffb96092b4f58
-  data.tar.gz: 82e7baa6d2b38e4628ba7cd77b27291e7cc2f04b
+  metadata.gz: 43ba419e2a8a2c55b5a06ae4bebd614498107330
+  data.tar.gz: 1f61d868e4ed17245c9932eb2a0fc7e5d79ecb7b
 SHA512:
-  metadata.gz: 262a49e458e4bdf8e26a29acad82bb5f568b9dd6ed2c19753bdde6d228629dae539c2dcca05730b5e80a2d23a8188d5dc9197cbd8a8f4f721d0686a66dac58ea
-  data.tar.gz: 7e67b2dfb0cbe9be2445bbecb7ee2805bee09d171e50e8b05a7ba0e95f520ce08ada1c729c0e7229f82f92aa4402bb904a7f9ce140bed1b469fd6809943f819e
+  metadata.gz: 013ee29af74037df89abd7e74c9bede1423d7274fa752fba8aca4d0f04c13408dc509df796cacd817ed090e766c89d7e3df5562543cec87aa58c6d288c1fe761
+  data.tar.gz: ef12279c48c34e3691ad826569d30b88b01cc9a082756c0d8d7bb5f3807de0fbd6c2076ad9bf66e5b2a59b3dde225752c7ebb752013b9958c58130f628b83a69

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.10'
+gem 'i18n-tasks', '~> 0.9.11'
 ```
 
 Copy the default [configuration file](#configuration):

data/lib/i18n/tasks/data/file_system_base.rb

@@ -7,7 +7,7 @@ require 'i18n/tasks/key_pattern_matching'
 
 module I18n::Tasks
   module Data
-    class FileSystemBase
+    class FileSystemBase # rubocop:disable Metrics/ClassLength
       include ::I18n::Tasks::Data::FileFormats
       include ::I18n::Tasks::Logging
 
@@ -142,11 +142,31 @@ module I18n::Tasks
         end.reduce(:+).map do |path|
           [path.freeze, load_file(path) || {}]
         end.map do |path, data|
+          filter_nil_keys! path, data
           Data::Tree::Siblings.from_nested_hash(data).tap do |s|
             s.leaves { |x| x.data.update(path: path, locale: locale) }
           end
         end.reduce(:merge!) || Tree::Siblings.null
       end
+
+      def filter_nil_keys!(path, data, suffix = [])
+        data.each do |key, value|
+          if key.nil?
+            data.delete(key)
+            log_warn <<-TEXT
+Skipping a nil key found in #{path.inspect}:
+  key: #{suffix.join('.')}.`nil`
+  value: #{value.inspect}
+Nil keys are not supported by i18n.
+The following unquoted YAML keys result in a nil key:
+  #{%w(null Null NULL ~).join(', ')}
+See http://yaml.org/type/null.html
+TEXT
+          elsif value.is_a?(Hash)
+            filter_nil_keys! path, value, suffix + [key]
+          end
+        end
+      end
     end
   end
 end

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)%#]*)/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.10'
+    VERSION = '0.9.11'
   end
 end

metadata

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