nice_hash 1.12.13 → 1.12.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160dc4a4a31b1c19945bd9abdcd63cc533d2c43507e2203938a6c669b108d06d
-  data.tar.gz: 1ab71eed50c782832be864d79edbdc8f88021c4b741917a874cbece6c041c1ca
+  metadata.gz: c04f2f984651321da92e9adab8820cb92334b4e719d800830f0d9a6cee052238
+  data.tar.gz: 9c9dff7d8107996236770e99aeaf8bd7e995a76738bfa2cd3b6e3a126ac23bb6
 SHA512:
-  metadata.gz: b6468de26ff322ac3015c251439bc4199a69054db6d78c1cd6d167e17c48b39c11372449838ea1924748c48dd05779c224f250cdc1def7b34cbb12a56298d2a2
-  data.tar.gz: 005dc902f3fd66ecd70a47cdabb9146e861f9ff758a7467b615f4fd0feee3d174804fc2b0d0ac3ead8590bb824b10239eaa1b10cb4daa64129188ae1ba7f6909
+  metadata.gz: d6059cb29c2f15b07bd83f50dd17959461ab3e208de0d196c67bacabd70d92ba29b12017f640977dea5819e8b2ebf72899fb4098a965372e84644441021d460e
+  data.tar.gz: '09f8201012b7715473c62715eca70b96161c0e30c6b9ce403b5ab6c861567ac1bb6d095e6c6ac6317510f3eb1e427d47f1d22a59c67de720dfd6480ce3dbda76'

data/lib/nice_hash.rb

@@ -551,6 +551,10 @@ class NiceHash
       return { error: :error }
     end
     values = values_hash_to_validate
+    if pattern_hash.keys.size == get_all_keys(pattern_hash).size and values.keys.size != get_all_keys(values)
+      # all patterns on patterns_hash are described on first level, so no same structure than values
+      pattern_hash = values.set_values(pattern_hash)
+    end
     results = {}
     same_values = {}
     if pattern_hash.kind_of?(Hash) and pattern_hash.size > 0
@@ -617,20 +621,24 @@ class NiceHash
               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
+                if values[key].class == value.class
+                  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
-                  if res.size > 0
-                    results[key] = Array.new() if !results.keys.include?(key)
-                    results[key][i] = res
-                  end
-                  i += 1
+                else
+                  results[key] = false
                 end
               else
                 i = 0
@@ -936,6 +944,31 @@ class NiceHash
     return keys.join(".")
   end
 
+  ##################################################
+  #  Get all the keys of a hash
+  #
+  #  @param hash [Hash] The hash
+  #
+  #  @return [Array]
+  #
+  #  @example
+  #    my_hash =  { uno: {dos: :tres} }
+  #    NiceHash.get_all_keys(my_hash)
+  #    #>[:uno, :dos, :tres]
+  ##################################################
+  def self.get_all_keys(h)
+    h.each_with_object([]) do |(k,v),keys|
+      keys << k
+      keys.concat(get_all_keys(v)) if v.is_a? Hash
+      if v.is_a?(Array)
+        v.each do |vv|
+          keys.concat(get_all_keys(vv)) if vv.is_a? Hash or vv.is_a? Array
+        end
+      end
+    end
+  end
+  
+
   ##################################################
   #  Deletes the supplied key
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nice_hash
 version: !ruby/object:Gem::Version
-  version: 1.12.13
+  version: 1.12.14
 platform: ruby
 authors:
 - Mario Ruiz