var_block 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4402003ba6ed9894c5c346f3dac996e8b0a52c1
-  data.tar.gz: e1f48bd2618296ba9392180cbd0cdd6b6d6c4568
+  metadata.gz: b5eff5e3d3eabecc4648ffda2370f50e17b2d4ab
+  data.tar.gz: 9843dd46c637d96897b68f99bec939cbc2d8015c
 SHA512:
-  metadata.gz: f23bea2ab3859970eaa3669d961a75634a4f569fe22eace63c785f76037a41add32d381b0a8644f45518fe970182a1720798f0d1a837dbb06ae16db598da1dcb
-  data.tar.gz: 7dacd9c7c46940e469e55e0fdff1d602cffc3a449f43847d18462a90df1f5461019d45589795183e37591d6bf8217e380f16186aef5bb0038f5c537f042386fa
+  metadata.gz: 7dd22cc5fe605b40680407df3cd704f637d7a8774c54bcbb5ee15578ea365220d7126b4236618f5211c7e2065d9521debf85112edd5c2e4a883c8db2efbdb6c2
+  data.tar.gz: f65d3d1e7eb077ef7d0f6a8e8a71e846c6ae5feffa201ed1abd52d8c587262bdca278c087c0617b1d3e05273bd6230101b72fc39ccc1e365d25d5fee3a5b0c4d

data/lib/var_block/globals.rb

@@ -32,7 +32,7 @@ module VarBlock
     end
 
     def with(var_hash_parent = nil, **variables)
-      var_hash = VarHash.new(var_hash: var_hash_parent)
+      var_hash = VarHash.new_from_var_hash(var_hash: var_hash_parent)
 
       variables.each do |key, value|
         var_hash[key] = value

data/lib/var_block/var_hash.rb

@@ -6,18 +6,20 @@ module VarBlock
     include VarBlock::Globals
     include VarBlock::Support
 
-    def initialize(var_hash: nil)
+    def self.new_from_var_hash(var_hash: nil)
+      new_var_hash = VarHash.new
       if var_hash
         raise ArgumentError.new('`instance` should be a `VarHash` object') unless var_hash.is_a? VarHash
-        self.merge!(var_hash)
+        new_var_hash = new_var_hash.merge!(var_hash.to_h)
       end
-      self
+      new_var_hash
     end
 
     def with(variables = {})
       super(self, variables)
     end
 
+    # OVERRIDES Hash `merge`
     def merge(variables)
       raise ArgumentError, '`merge` does not accept a block. Are you looking for `merged_with` instead?' if block_given?
       
@@ -27,9 +29,9 @@ module VarBlock
         # if variable already has a value, we need to wrap both values into a VarArray if not yet a VarArray
         if self.has_key?(key)
           unless current_value.is_a? VarArray
-            self[key] = VarArray.new(array_wrap(current_value) + array_wrap(value)) unless current_value.is_a? VarArray
+            self[key] = VarArray.new(array_wrap(current_value) + array_wrap(value))
           else
-            self[key].concat(array_wrap(value))
+            self[key] = self[key].clone.concat(array_wrap(value))
           end
           
         # else if new variable

data/lib/var_block/version.rb

@@ -1,3 +1,3 @@
 module VarBlock
-	VERSION = '1.0.5'.freeze
+	VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: var_block
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jules Roman B. Polidario