nice_hash 1.18.0 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db65b5feb3fcc8b21b275873835592202ac1eb6b82a27325d61f1cad19665712
-  data.tar.gz: a1b5014b99126979bb8bf052db0574bd4e9e02b9311b7133a21d1d0467cbcd05
+  metadata.gz: 28cebce97247546c4f1db4d7f7fda1d307e24cecd2cd8a235782f2c8765092e2
+  data.tar.gz: cc3fca8a245ad2dd48d0bd3d1653ef09c2aa371fe3509304a0c04795bc3e2597
 SHA512:
-  metadata.gz: 7ca4ced479153a9de0a527f6b9ceb0a7b248d263e7914e9b0fe498028fc164fafefbbfbe64e7d4abc7850572e760fa4911903e0cb56ac7809c3a2bc7c0bb116b
-  data.tar.gz: cb8b29027ce6d232a46f493d20bbb3bc8031c3ff1772e90686097a8102b462e9e76917349bd723db7a3bd42dc4bc9f80f21fb0e28845eae9acd609a5470d363b
+  metadata.gz: 196b9c9e068ef89415b6b2883deaec846a1b7b5ccb3b0c835ed2d50e02f409344ecb4bbfd5a4c87cacf46181765f7bf52b0ee945dff5eec81180a3b5c20e93b6
+  data.tar.gz: '09ce814e6899f7c163a5c5c009e1617f33262809b7401ee6d3e8c4e73c1a18c4377cf21d80e1d0dc4d6f2a8da0266f0df5aefe599f4adbc77318c41f0f9a0fa3'

data/lib/nice/hash/add_to_ruby.rb

@@ -198,8 +198,8 @@ class Hash
   # returns a clean copy of the hash
   ###########################################################################
   def deep_copy
-    Marshal.load(Marshal.dump(self))
-  end
+    NiceHash.deep_clone(self)
+  end  
 
   ###########################################################################
   # It will filter the hash by the key specified on select_hash_key.
@@ -291,18 +291,25 @@ class Hash
   ###########################################################################
   # Merging multi-dimensional hashes
   ###########################################################################
-  def nice_merge(hash = nil)
-    return self unless hash.is_a?(Hash)
-    base = self
+  def nice_merge(hash = nil, return_self = false)
+    if return_self
+      base = self
+    else
+      base = self.deep_copy
+    end
+    return base unless hash.is_a?(Hash)
     hash.each do |key, v|
       if base[key].is_a?(Hash) && hash[key].is_a?(Hash)
-        base[key].nice_merge(hash[key])
+        base[key].nice_merge!(hash[key])
       else
         base[key]= hash[key]
       end
     end
     base
   end
+  def nice_merge!(hash = nil)
+    return nice_merge(hash, true)
+  end
 
   alias gen generate
   alias val validate

data/lib/nice/hash/deep_clone.rb

@@ -0,0 +1,30 @@
+class NiceHash
+  ##################################################
+  #  Deep clones the supplied object
+  #
+  #  @param obj [Object] The object we want to deep clone
+  #
+  #  @return [Object]
+  #
+  #  @example
+  #  my_hash = { user: {
+  #                      address: {
+  #                             city: 'Madrid',
+  #                             country: 'Spain'
+  #                          },
+  #                      name: 'Peter',
+  #                      age: 33
+  #                    },
+  #              customer: true
+  #  }
+  #    NiceHash.deep_clone(my_hash)
+  #    #>{:user=>{:address=>{:city=>"Madrid", :country=>"Spain"}, :name=>"Peter", :age=>33}, :customer=>true}
+  ##################################################
+  def self.deep_clone(obj)
+    obj.clone.tap do |new_obj|
+      new_obj.each do |key, val|
+        new_obj[key] = deep_clone(val) if val.is_a?(Hash)
+      end
+    end
+  end
+end

data/lib/nice/hash/set_values.rb

@@ -34,6 +34,7 @@ class NiceHash
         end
 
       end
+
       hash_array.each do |k, v|
         #for the case of using same_values: [:pwd1, :pwd2] => :'10:N' and supply hash_values: pwd1: 'a', pwd2: 'b'
         #instead of [:pwd1,:pwd2]=>'a'
@@ -69,8 +70,8 @@ class NiceHash
               hash_values.each do |kk,vv|
                 if kk.to_s.match?(/^#{k}\./)
                   kk = kk.to_s.gsub(/^#{k}\./, '').to_sym
-                  new_hash_values[kk] = vv
                 end
+                new_hash_values[kk] = vv
               end
               hashv[k] = NiceHash.set_values(v, new_hash_values)
             else
@@ -81,9 +82,11 @@ class NiceHash
           end
         end
       end
+
       hash_values.each do |k, v|
         hashv = NiceHash.set_nested(hashv, k, v, true) if k.is_a?(Hash)
       end
+      
       return hashv
     elsif hash_array.is_a?(Array) and hash_array.size > 0
       hashv = Array.new

data/lib/nice_hash.rb

@@ -16,6 +16,7 @@ require_relative "nice/hash/set_nested"
 require_relative "nice/hash/set_values"
 require_relative "nice/hash/transtring"
 require_relative "nice/hash/validate"
+require_relative "nice/hash/deep_clone"
 
 
 require "string_pattern"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_hash
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.2
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string_pattern
@@ -69,6 +69,7 @@ files:
 - lib/nice/hash/add_to_ruby.rb
 - lib/nice/hash/change_one_by_one.rb
 - lib/nice/hash/compare_structure.rb
+- lib/nice/hash/deep_clone.rb
 - lib/nice/hash/delete_nested.rb
 - lib/nice/hash/generate.rb
 - lib/nice/hash/get_all_keys.rb