array_logic 0.2.1 → 0.2.2

data/lib/array_logic/rule.rb

@@ -52,7 +52,11 @@ module ArrayLogic
     
     private
     def logic
-      eval(expression)  
+      begin
+        eval(expression)
+      rescue SyntaxError
+        raise "Unable to determine logic from this expression : #{expression}"
+      end
     end
     
     def match_ids(ids)
@@ -82,9 +86,9 @@ module ArrayLogic
     end
 
     def rule_processing_steps
-      replace_item(function_pattern, value_of_function_called_on_id_objects)
       add_space_around_puctuation_characters
       make_everything_lower_case
+      replace_item(function_pattern, build_logic_from_function_statement)
       replace_logic_words_with_operators
       replace_item(thing_id_pattern, ids_include_this_id)
       replace_item(number_in_set_pattern, comparison_of_number_with_true_count)
@@ -117,34 +121,29 @@ module ArrayLogic
     end
         
     def function_pattern
-      /(#{array_functions.keys.join('|')})\(\s*\:(\w+[\?\!]?)\s*\)\s*((==|[\<\>\!]=?)\s*\d+(\.\d+)?)/
+      function_name_pattern = array_functions.keys.join('|')
+      instance_function_pattern = '\w+[\?\!]?'               # e.g. 'id', 'this!', 'that?', 'foo_bar'
+      comparison_pattern ='(==|[\<\>]=?|!=)\s*\d+(\.\d+)?'  # e.g. '== 4.3', '> 4'
+      /(#{function_name_pattern})\(\s*\:(#{instance_function_pattern})\s*\)\s*(#{comparison_pattern})/
     end
     
     def array_functions
       {
-        :sum => 'inject(:+)',
-        :average => 'reduce(:+) / size.to_f',
+        :sum => 'reduce(0){|sum,x| x.respond_to?(:to_f) ? sum + x.to_f : sum }',
+        :average => 'reduce(0){|sum,x| x.respond_to?(:to_f) ? sum + x.to_f : sum } / size',
         :count => 'compact.size'
       }
     end
     
-    def value_of_function_called_on_id_objects
+    def build_logic_from_function_statement
       lambda do |string|
-        all, array_function, function, operator = function_pattern.match(string).to_a
-        values = things.collect &function.to_sym
-        numbers_booleans_or_nils?(values)
+        array_function, instance_function, comparison = function_pattern.match(string).to_a[1, 3]
+        values = things.collect &instance_function.to_sym
         result = values.instance_eval(array_functions[array_function.to_sym])
-        "( #{result} #{operator} )"
+        "( #{result} #{comparison} )"
       end
     end
     
-    def numbers_booleans_or_nils?(values)
-      errors = values.reject{|v| v.nil? || v.is_a?(Numeric) ||  !!v == v}
-      unless errors.empty?
-        raise "Values must be numbers or nils. The problem is here: #{errors.join(", ")}"
-      end
-    end
-
     def processed_rule
       @processed_rule ||= rule.clone
     end
@@ -200,13 +199,13 @@ module ArrayLogic
     def allowed_characters
       {
         :brackets => ['\(', '\)'],
-        :in_pattern => ['\d+\s+in'],
+        :in_pattern => '\d+\s+in',
         :ids => [thing_id_pattern],
         :logic_words => %w{and or not},
         :logic_chrs => ['&&', '\|\|', '!'],
-        :commas => ['\,'],
-        :white_space => ['\s'],
-        :function_pattern => [function_pattern]
+        :commas => '\,',
+        :white_space => '\s',
+        :function_pattern => function_pattern
       }
     end
     

data/lib/array_logic/version.rb

@@ -1,24 +1,29 @@
 module ArrayLogic
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
 
 # History
 # =======
 # 
+# Version 0.2.2
+# -------------
+# Refactor to allow functions to be more flexible. That's is, to handle unexpected
+# input, rather than just rejecting it.
+# 
 # Version 0.2.1
-# =============
+# -------------
 # Improved handling of errors in functions and add != operator
 # 
 # Version 0.2.0
-# =============
+# -------------
 # Adds functions: sum, count and average
 # 
 # Version 0.1.2
-# =============
+# -------------
 # Refactor to tidy up code and make private, rule methods that don't need exposing
 # 
 # 
 # Version 0.1.1
-# =============
+# -------------
 # Working version. No history before this point
 #

data/test/array_logic/rule_test.rb

@@ -298,10 +298,12 @@ module ArrayLogic
     end
     
     def test_function_with_object_method_that_does_not_return_number
-      @rule.rule = 'sum(:methods) == 1'
-      assert_raise RuntimeError do
-        @rule.match(get_things([1, 2]))
-      end        
+      @rule.rule = 'average(:methods) == 0'
+      assert @rule.match(get_things([1, 2])) 
+      @rule.rule = 'sum(:methods) == 0'
+      assert @rule.match(get_things([1, 2]))  
+      @rule.rule = 'count(:methods) == 2'
+      assert @rule.match(get_things([1, 2]))  
     end
     
     def test_match_without_rule

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: array_logic
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies: []
 description: Allow a user to define a set of rules, and then test to see if an array
   of object match those rules.