var_block 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7f65d9d4b76429f4383e7ce8a339313079a411
-  data.tar.gz: b0c3d95ba354f2509b1813ce7b03fc94ac59e532
+  metadata.gz: afff54f8fbdfa78d3381656b74cf55b61f2ad445
+  data.tar.gz: 44b695d5b423ec1df2cd73baa42d0663fb0c37b2
 SHA512:
-  metadata.gz: 2c47f79aa0e325ed9ebc7c7640949c59ace9703e950d0223d88b391d7e51a880b1f24fc70db0467dee511804a53db75f4de66a22b0ffda9fdd649446f80ce244
-  data.tar.gz: d6d8c21d04898c9101ca79447bbcad99ac524ef63f7cb42efa20d3175da8424c0eba07b6b43a5a444d2e802c060296e44b6b2bec23ad20a46ec6abb0af37da8a
+  metadata.gz: d16746b95437c2442412ec55c08969933f7b28890b56ed07baccdceb79e37bbd494bef279a065b7c8a9e0e8d36a35ad3527ee41e5363f5d570be41da1eda4574
+  data.tar.gz: 05d5f2049ea6f75902825a17eca1a7f5d56e11d1e85bdd139c7257d53e5e930318ccebc8f477aefce83e523653309e7b3236428008ac7c57baa210d27948feb3

data/lib/var_block/getvar_handlers.rb

@@ -0,0 +1,39 @@
+module VarBlock
+  module GetvarHandlers
+    class << self
+      def handle_var_array(value, context)
+        merged_values = []
+
+        value.each do |v|
+          merged_values = merged_values + handle_proc(v, context)
+        end
+
+        merged_values
+      end
+
+      def handle_proc(value, context)
+        context.instance_exec &value
+      end
+
+      def handle_default(value, context)
+        value
+      end
+
+      def handle_options(value, context, options)
+        return_value = value
+
+        options.each do |option|
+          case option
+          when :truthy?
+            ArgumentError.new("value should be an Array, but is found to be a #{value.class}") unless value.is_a? Array
+            return_value = !return_value.any?{|v| !!!v }
+          else
+            raise ArgumentError.new("#{option} not supported!")
+          end
+        end
+
+        return_value
+      end
+    end
+  end
+end

data/lib/var_block/globals.rb

@@ -2,17 +2,35 @@ 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?
 
       base.extend self
     end
 
-    def getvar(triggered_variables, index)
-      instance_exec &triggered_variables[index]
+    def getvar(var_hash, index, *options)
+      raise ArgumentError.new('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
+
+      unless options.empty?
+        return_value = VarBlock::GetvarHandlers.handle_options(return_value, self, options)
+      end
+
+      return_value
     end
 
-    def with(variables, var_hash: nil)
+    def with(var_hash = nil, **variables)
       var_hash = VarHash.new(var_hash: var_hash)
 
       variables.each do |key, value|
@@ -22,4 +40,6 @@ module VarBlock
       yield var_hash
     end
   end
+
+  private
 end

data/lib/var_block/var_array.rb

@@ -0,0 +1,2 @@
+class VarBlock::VarArray < Array
+end

data/lib/var_block/var_hash.rb

@@ -1,6 +1,6 @@
 module VarBlock
   class VarHash < Hash
-    include Globals
+    include VarBlock::Globals
 
     def initialize(var_hash: nil)
       if var_hash
@@ -10,8 +10,17 @@ module VarBlock
       self
     end
 
-    def with(variables)
-      super(variables, var_hash: self)
+    def with(variables = {})
+      super(self, variables)
+    end
+
+    def merge(variables)
+      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)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: var_block
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jules Roman B. Polidario
@@ -18,7 +18,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/var_block.rb
+- lib/var_block/getvar_handlers.rb
 - lib/var_block/globals.rb
+- lib/var_block/var_array.rb
 - lib/var_block/var_hash.rb
 homepage: http://rubygems.org/gems/var_block
 licenses: