var_block 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9cc715fb265b3db18b53f109ee4b8d734a07599
-  data.tar.gz: a381c9284aa85bb3a5be201121b405303337e7c4
+  metadata.gz: aa34f9f2b6748dc5e35d66e1ca06faf5936718b7
+  data.tar.gz: c33f79f5a249c36ead3d87105f5f23a4e7044516
 SHA512:
-  metadata.gz: a10baf8ae1b4b8fd1eea457b2aa8282fc64ebe62b8a487e6a6db66ba5fe3bb8b4816a8eda36dcdd8f6d64a0e2f4d3bd071f9972dd9681a262d138cb42ded00fe
-  data.tar.gz: d55ab095aa5883bc84f0b5a229de69a9ae1a71634c5fe5f4b268ef22968abc7de71e91ebd2bd9d25a99839ae78581fdf6d7e682a4d9d558c2fa085fc6b343fa5
+  metadata.gz: 3a2faec471a4b069babadc3cbb666e476f7d506fbd385e773bfacb72ef7bb677129481dca25561a0c1ba30ef1ada705b0052095575f9510553387caf735d1e39
+  data.tar.gz: 2d895e33e052a8c03725e0cbfc2bc1f44edecd440ff20b87897882c76e67c324bc1d22bd5a5c943d622c63f544a1b8204beee95890d022f02f22815824feaacb

data/lib/var_block/getvar_handlers.rb

@@ -1,14 +1,18 @@
+require 'var_block/support'
+
 module VarBlock
   module GetvarHandlers
     class << self
+      include VarBlock::Support
+
       def handle_var_array(value, context)
         merged_values = []
 
         value.each do |v|
           if v.is_a? Proc
-            merged_values = merged_values + handle_proc(v, context)
+            merged_values = merged_values + array_wrap(handle_proc(v, context))
           else
-            merged_values = merged_values + handle_default(v, context)
+            merged_values = merged_values + array_wrap(handle_default(v, context))
           end
         end
 
@@ -37,7 +41,7 @@ module VarBlock
         end
 
         return_value
-      end
+      end      
     end
   end
 end

data/lib/var_block/globals.rb

@@ -1,29 +1,27 @@
 module VarBlock
   module Globals
-    
-
     def self.included(base)
       # fail if there is already same-name methods to prevent breaking dependencies
       # thanks to Jack, https://stackoverflow.com/questions/44156150/how-to-raise-error-when-including-a-module-that-already-has-same-name-methods
-      overrides = instance_methods.select { |method| base.instance_method(method).owner != self }
-      raise "#{self.name} overrides #{overrides.join(', ')}" if overrides.any?
+      overrides = instance_methods.reject { |method| base.instance_method(method).owner == self }
+      raise "#{name} overrides #{overrides.join(', ')}" if overrides.any?
 
       base.extend self
     end
 
     def getvar(var_hash, index, *options)
-      raise ArgumentError.new('1st argument should be a VarHash object!') unless var_hash.is_a? VarHash
+      raise ArgumentError, '1st argument should be a VarHash object!' unless var_hash.is_a? VarHash
 
       value = var_hash[index]
 
-      case value
-      when VarArray
-        return_value = VarBlock::GetvarHandlers.handle_var_array(value, self)
-      when Proc
-        return_value = VarBlock::GetvarHandlers.handle_proc(value, self)
-      else
-        return_value = VarBlock::GetvarHandlers.handle_default(value, self)
-      end
+      return_value = case value
+                     when VarArray
+                       VarBlock::GetvarHandlers.handle_var_array(value, self)
+                     when Proc
+                       VarBlock::GetvarHandlers.handle_proc(value, self)
+                     else
+                       VarBlock::GetvarHandlers.handle_default(value, self)
+                     end
 
       unless options.empty?
         return_value = VarBlock::GetvarHandlers.handle_options(return_value, self, options)
@@ -42,4 +40,4 @@ module VarBlock
       yield var_hash
     end
   end
-end
+end

data/lib/var_block/support.rb

@@ -0,0 +1,15 @@
+module VarBlock
+	module Support
+		# copied directly from Rails Array class
+    # https://apidock.com/rails/v4.2.7/Array/wrap/class
+    def array_wrap(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
+	end
+end

data/lib/var_block/var_hash.rb

@@ -1,6 +1,10 @@
+require 'var_block/globals'
+require 'var_block/support'
+
 module VarBlock
   class VarHash < Hash
     include VarBlock::Globals
+    include VarBlock::Support
 
     def initialize(var_hash: nil)
       if var_hash
@@ -18,9 +22,21 @@ module VarBlock
       variables.each do |key, value|
         current_value = self[key]
 
-        self[key] = VarArray.new([current_value]) unless current_value.is_a? VarArray
-        self[key].push(value)
+        # 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)
+          self[key] = VarArray.new(array_wrap(current_value) + array_wrap(value)) unless current_value.is_a? VarArray
+          
+        # else if new variable
+        else
+          self[key] = value
+        end
       end
     end
+
+    def merged_with(variables = {})
+      cloned_self = self.clone
+      cloned_self.merge(variables)
+      cloned_self.with() { yield(cloned_self) }
+    end
   end
 end

data/lib/var_block/version.rb

@@ -1,3 +1,3 @@
 module VarBlock
-	VERSION = '0.0.4'.freeze
+	VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: var_block
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jules Roman B. Polidario
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +69,7 @@ files:
 - lib/var_block.rb
 - lib/var_block/getvar_handlers.rb
 - lib/var_block/globals.rb
+- lib/var_block/support.rb
 - lib/var_block/var_array.rb
 - lib/var_block/var_hash.rb
 - lib/var_block/version.rb