var_block 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54f547c317f7e4e0e1b6250f1567d240fc27939
-  data.tar.gz: 9e02a66cc863bb96b82db8aeb0cf6c0d86ae48dc
+  metadata.gz: 1558d1459d0a4c2e35d2310b99f8477f04b5b92d
+  data.tar.gz: bcc50d0ccb6d7d08f2569f428c2ba88e94c9f751
 SHA512:
-  metadata.gz: 4667d1bfc1f5cdb2d18ac34e0907d4f494d25ae17fbb65c3a33dad0da430b8f108c2c473cab281372f81a640b27c8e9447c80bfe3c9b5567f57f9f3f017f5f03
-  data.tar.gz: 41e1f9c0fd07c1c07f4b78997fa23725850f772c744a455266d40f18deb003f88c9da1e9746fad1a496e9ed0394d475c676f61da893e1fb190509954e7c56dfa
+  metadata.gz: 7dd24620dd90615fb567107d70507b8e15531a45f7b7acec06951e53a05fb287f424e8b8eec5c2a86076c69ba9f6fef28bb9740495f308f4f7d078aa9d2c6738
+  data.tar.gz: b677a48857503d2201933ca60f1a9224375e6bb1eb59970534162f6d47d70ca53f2d7e6686e7d50131523e2c64f8596601319b8a6e87d14a6342267bc899054b

data/lib/var_block/getvar_handlers.rb

@@ -3,81 +3,94 @@ require 'var_block/support'
 module VarBlock
   module GetvarHandlers
 
-    SUPPORTED_OPTIONS = [:truthy?, :any?].freeze
+    OPTIONS = [:truthy?, :any?].freeze
 
-    class << self
-      include VarBlock::Support
-
-      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? 
-          return handle_options(value, options)
-
-        # 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))
-            end
-          end
-
-          return merged_values
-        end
+    module DefaultHandler
+      def self.handle(value, options = [])
+        supported_options = []
+        unsupported_options = options - supported_options
+        raise ArgumentError, "#{unsupported_options.map(&:inspect).join(', ')} option(s) are not supported on non-merged variables" if unsupported_options.any?
+        value
       end
+    end
 
-      def handle_proc(value, context)
+    module ProcHandler
+      def self.handle(value, context, options = [])
+        supported_options = []
+        unsupported_options = options - supported_options
+        raise ArgumentError, "#{unsupported_options.map(&:inspect).join(', ')} option(s) are not supported on non-merged variables" if unsupported_options.any?
         context.instance_exec(&value)
       end
+    end
 
-      def handle_default(value)
-        value
-      end
-
-      private
+    module VarArrayHandler
+      class << self
+        include VarBlock::Support
 
-      def handle_options(value, options)
-        options.each do |option|
-          case option
+        def handle(value, context, options)
+          if options.any? 
+            return handle_options(value, options)
 
-          when :truthy?
-            return handle_option_truthy(value)
+          # 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(ProcHandler.handle(v, context))
+              else
+                merged_values = merged_values + array_wrap(DefaultHandler.handle(v))
+              end
+            end
 
-          when :any?
-            return handle_option_any(value)
+            return merged_values
           end
         end
-      end
 
-      def handle_option_truthy(values)
-        is_truthy = true
+        private
 
-        values.each do |value|
-          if value.is_a? Proc
-            is_truthy = handle_proc(value, context)
-          else
-            is_truthy = handle_default(value)
+        def handle_options(value, options)
+          options.each do |option|
+            case option
+
+            when :truthy?
+              return handle_option_truthy(value)
+
+            when :any?
+              return handle_option_any(value)
+            end
           end
-          break unless is_truthy
         end
 
-        return is_truthy
-      end
+        def handle_option_truthy(values)
+          is_truthy = true
 
-      def handle_option_any(values)
-        values.each do |value|
-          if value.is_a? Proc
-            is_truthy = handle_proc(value, context)
-          else
-            is_truthy = handle_default(value)
+          values.each do |value|
+            if value.is_a? Proc
+              evaluated_value = ProcHandler.handle(value, context)
+            else
+              evaluated_value = DefaultHandler.handle(value)
+            end
+            is_truthy = !!evaluated_value
+            break unless is_truthy
           end
-          return true if is_truthy
+
+          return is_truthy
         end
 
-        return false
+        def handle_option_any(values)
+          values.each do |value|
+            if value.is_a? Proc
+              evaluated_value = ProcHandler.handle(value, context)
+            else
+              evaluated_value = DefaultHandler.handle(value)
+            end
+            is_truthy = !!evaluated_value
+            return true if is_truthy
+          end
+
+          return false
+        end
       end
     end
   end

data/lib/var_block/globals.rb

@@ -12,7 +12,7 @@ module VarBlock
     end
 
     def getvar(var_hash, index, *options)
-      unsupported_options = (options - VarBlock::GetvarHandlers::SUPPORTED_OPTIONS)
+      unsupported_options = (options - VarBlock::GetvarHandlers::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)
@@ -21,11 +21,11 @@ module VarBlock
 
       return_value = case value
                      when VarArray
-                       VarBlock::GetvarHandlers.handle_var_array(value, self, options)
+                       VarBlock::GetvarHandlers::VarArrayHandler.handle(value, self, options)
                      when Proc
-                       VarBlock::GetvarHandlers.handle_proc(value, self)
+                       VarBlock::GetvarHandlers::ProcHandler.handle(value, self, options)
                      else
-                       VarBlock::GetvarHandlers.handle_default(value)
+                       VarBlock::GetvarHandlers::DefaultHandler.handle(value, options)
                      end
 
       return_value

data/lib/var_block/var_array.rb

@@ -1,2 +1,3 @@
+# VarArray objects are only created when using `merge` or `merge_with`. Do not initialise them manually.
 class VarBlock::VarArray < Array
 end

data/lib/var_block/version.rb

@@ -1,3 +1,3 @@
 module VarBlock
-	VERSION = '1.0.3'.freeze
+	VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: var_block
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jules Roman B. Polidario
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec