var_block 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec18c7b8c88fd11fd894afb5dba8de1a30652dd7
-  data.tar.gz: 664f35c4cc983eb19392e8296bb23c286dc2068f
+  metadata.gz: 670353916ff8b708f40b2e7eb3f9926fe2b732d9
+  data.tar.gz: 9bb7c2702a1a245f54250d7b2dccdb31a5b7aea6
 SHA512:
-  metadata.gz: 9ceb5af0b5a1a1de6b6fa9ff8c5e35d48f83892f79e89c1c5abb7703531798e1b576fe774a8b8684f7abd1912f1a738b912bbf4e92ad9906d9d27183b4d4a14b
-  data.tar.gz: 6258fc4ecd37a473f79f89d8c874911b3b9577565bba50450382f7dffd11dd96513520e10fbc67e240991683d0312a21e3df14990aefe844d7d98785ddf7c125
+  metadata.gz: 8cd81d7830bf189729010967b12ff753efb15bacf5fa0d224da528a49312586eef2ca834c41ce26ac3b2288d7cf6046001e9f5f0a9fc777ddb024be7f9011b79
+  data.tar.gz: 6e0cdfbb063eb895632d8c3fc06d9f917bf98b98b5800efa6b0f2dd0f18ad9bb47e7c9d6a247c71cd963fa6d9f7cb7e6520af7c2dc29638870399fc65ee579ad

data/lib/var_block/getvar_handlers.rb

@@ -2,46 +2,51 @@ require 'var_block/support'
 
 module VarBlock
   module GetvarHandlers
+
+    SUPPORTED_OPTIONS = [:truthy?].freeze
+
     class << self
       include VarBlock::Support
 
-      def handle_var_array(value, context)
-        merged_values = []
+      def handle_var_array(value, context, options)
+        # if :truthy?, we need to check each item in the array, and return false immediately if at least one is found to be not "truthy", else return true
+        if options.any? && options.include?(:truthy?)
+          is_truthy = true
+
+          value.each do |v|
+            if v.is_a? Proc
+              is_truthy = handle_proc(v, context)
+            else
+              is_truthy = handle_default(v)
+            end
+            break unless is_truthy
+          end
+
+          return is_truthy
+
+        # else, if no options, defaults to return as a wrapped Array
+        else
+          merged_values = []
 
-        value.each do |v|
-          if v.is_a? Proc
-            merged_values = merged_values + array_wrap(handle_proc(v, context))
-          else
-            merged_values = merged_values + array_wrap(handle_default(v, context))
+          value.each do |v|
+            if v.is_a? Proc
+              merged_values = merged_values + array_wrap(handle_proc(v, context))
+            else
+              merged_values = merged_values + array_wrap(handle_default(v))
+            end
           end
-        end
 
-        merged_values
+          return merged_values
+        end
       end
 
       def handle_proc(value, context)
-        context.instance_exec &value
+        context.instance_exec(&value)
       end
 
-      def handle_default(value, context)
+      def handle_default(value)
         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

@@ -1,3 +1,5 @@
+require 'var_block/getvar_handlers'
+
 module VarBlock
   module Globals
     def self.included(base)
@@ -10,23 +12,22 @@ module VarBlock
     end
 
     def getvar(var_hash, index, *options)
-      raise ArgumentError, '1st argument should be a VarHash object!' unless var_hash.is_a? VarHash
+      unsupported_options = (options - VarBlock::GetvarHandlers::SUPPORTED_OPTIONS)
+      raise ArgumentError, "3rd argument options Array only supports #{VarBlock::GetvarHandlers::SUPPORTED_OPTIONS}. Does not support #{unsupported_options.map(&:inspect).join(', ')}" if unsupported_options.any?
+      raise ArgumentError, "1st argument should be a VarHash object, but is found to be a #{var_hash.class}" unless var_hash.is_a? VarHash
+      raise ArgumentError, "2nd argument :#{index} is not defined. Defined are #{var_hash.keys.map(&:inspect).join(', ')}" unless var_hash.keys.include?(index)
 
       value = var_hash[index]
 
       return_value = case value
                      when VarArray
-                       VarBlock::GetvarHandlers.handle_var_array(value, self)
+                       VarBlock::GetvarHandlers.handle_var_array(value, self, options)
                      when Proc
                        VarBlock::GetvarHandlers.handle_proc(value, self)
                      else
-                       VarBlock::GetvarHandlers.handle_default(value, self)
+                       VarBlock::GetvarHandlers.handle_default(value)
                      end
 
-      unless options.empty?
-        return_value = VarBlock::GetvarHandlers.handle_options(return_value, self, options)
-      end
-
       return_value
     end
 

data/lib/var_block/var_hash.rb

@@ -19,6 +19,8 @@ module VarBlock
     end
 
     def merge(variables)
+      raise ArgumentError, '`merge` does not accept a block. Are you looking for `merged_with` instead?' if block_given?
+      
       variables.each do |key, value|
         current_value = self[key]
 

data/lib/var_block/version.rb

@@ -1,3 +1,3 @@
 module VarBlock
-	VERSION = '0.0.7'.freeze
+	VERSION = '0.0.8'.freeze
 end

data/lib/var_block.rb

@@ -1,4 +1,4 @@
-files = Dir[__dir__ + '/var_block/*.rb'].each {|file| require file }
+Dir[__dir__ + '/var_block/*.rb'].each {|file| require file }
 
 module VarBlock
 end

metadata

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