nice_hash 1.12.11 → 1.12.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c48d69517e60d0888a04cec6b9fe10d26b95b78f7645f5e3213a7d7dfb90e9f
-  data.tar.gz: 278966b1d3941031e4083cccb1fde61fe77f51cdaff5c60ee7dcf88b960d0279
+  metadata.gz: 9a0e597912bd0c1e3267f0e6b5889fcd737be6baccccd27a4587f08f6d6f8b63
+  data.tar.gz: 9a2e1cd75206b5ce890ef1a74d1617b618303d628d9c7e8ccbf641eec49c5ec2
 SHA512:
-  metadata.gz: 4043f4f7473788c17c9d54a025d4003c92a913bad3a5e78374f40582e4d636c9a3b64b51125f3529274c787493cdfd307b2532599cfcddc5869e51dc6f611e93
-  data.tar.gz: e7e542a1ebf41d7801c687ee87cba15c294de46a610548e859e85e7d1c98aaac7d48fb1e242a1a2acf7a898fb8299d40d07587da190051903de9dbb13e7468a8
+  metadata.gz: 4b6c046f3be34f532acc10632e2e4833e646615cffd6d63fbcc80d9faa915aa988eb2212d2ad3442b45c5906260dc250fda767d206b546de0ec20286e1777228
+  data.tar.gz: bb29455a449ad02c4fe46a1e4a7a1fb5de62d3d37fb596eb78567d5018802db7f3a8bd9c8a233737e937b4f8fb08e4d07a85fdca70f88ecf210efb2382e5ea48

data/lib/nice_hash.rb

@@ -407,8 +407,13 @@ class NiceHash
           unless array_pattern
             value_ret = Array.new
             value.each { |v|
-              ret = NiceHash.generate(v, select_hash_key, expected_errors: expected_errors)
-              ret = v if ret.kind_of?(Hash) and ret.size == 0
+              if v.is_a?(Hash)
+                ret = NiceHash.generate(v, select_hash_key, expected_errors: expected_errors)
+              else
+                ret = NiceHash.generate({doit: v}, select_hash_key, expected_errors: expected_errors)
+                ret = ret[:doit] if ret.is_a?(Hash) and ret.key?(:doit)
+              end
+              ret = v if ret.kind_of?(Hash) and ret.size == 0 
               value_ret << ret
             }
             hashv[key] = value_ret
@@ -608,17 +613,43 @@ class NiceHash
               end
             }
             unless array_pattern or results.include?(key)
-              i = 0
-              value.each { |v|
-                res = NiceHash.validate([v, select_hash_key], values[key][i], only_patterns: only_patterns)
-                if res.size > 0
-                  results[key] = Array.new() if !results.keys.include?(key)
-                  results[key][i] = res
+              if value.size == 1 and values[key].size > 1
+                # for the case value == ['Ford|Newton|Seat'] and values == ['Ford', 'Newton', 'Ford']
+                i= 0
+                values[key].each do |v|
+                  if value[0].is_a?(Hash)
+                    res = NiceHash.validate([value[0], select_hash_key], v, only_patterns: only_patterns)
+                  else
+                    # for the case {cars: ['Ford|Newton|Seat']}
+                    res = NiceHash.validate([{key => value[0]}, select_hash_key], {key => v}, only_patterns: only_patterns)
+                    #res = {key => res[:doit]} if res.is_a?(Hash) and res.key?(:doit)
+                    array_pattern = true
+                  end
+                  if res.size > 0
+                    results[key] = Array.new() if !results.keys.include?(key)
+                    results[key][i] = res
+                  end
+                  i += 1
                 end
-                i += 1
-              }
+              else
+                i = 0
+                value.each { |v|
+                  if v.is_a?(Hash)
+                    res = NiceHash.validate([v, select_hash_key], values[key][i], only_patterns: only_patterns)
+                  else
+                    # for the case {cars: ['Ford|Newton|Seat']}
+                    res = NiceHash.validate([{key => v}, select_hash_key], {key => values[key][i]}, only_patterns: only_patterns)
+                    array_pattern = true
+                  end
+                  if res.size > 0
+                    results[key] = Array.new() if !results.keys.include?(key)
+                    results[key][i] = res
+                  end
+                  i += 1
+                }
+              end
             end
-            unless array_pattern or only_patterns or results.include?(key) or complex_data
+            unless array_pattern or only_patterns or results.include?(key) or complex_data 
               results[key] = false unless value == values[key]
             end
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_hash
 version: !ruby/object:Gem::Version
-  version: 1.12.11
+  version: 1.12.12
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string_pattern