array_logic 0.2.0 → 0.2.1

data/README.rdoc

@@ -69,7 +69,7 @@ where:
 
 [function]       One of the functions listed below
 [object_method]  A method that can be called on all of the objects in the array
-[operator]       one of: <, <=, >, >=, ==
+[operator]       one of: <, <=, >, >=, ==, !=
 [number]         a number to compare with the result
 
 Using this array as an example:

data/lib/array_logic/rule.rb

@@ -117,7 +117,7 @@ module ArrayLogic
     end
         
     def function_pattern
-      /(#{array_functions.keys.join('|')})\(\s*\:(\w+[\?\!]?)\s*\)\s*((==|[\<\>]=?)\s*\d+(\.\d+)?)/
+      /(#{array_functions.keys.join('|')})\(\s*\:(\w+[\?\!]?)\s*\)\s*((==|[\<\>\!]=?)\s*\d+(\.\d+)?)/
     end
     
     def array_functions
@@ -132,10 +132,18 @@ module ArrayLogic
       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)
         result = values.instance_eval(array_functions[array_function.to_sym])
         "( #{result} #{operator} )"
       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

data/lib/array_logic/version.rb

@@ -1,10 +1,14 @@
 module ArrayLogic
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 
 # History
 # =======
 # 
+# Version 0.2.1
+# =============
+# Improved handling of errors in functions and add != operator
+# 
 # Version 0.2.0
 # =============
 # Adds functions: sum, count and average

data/test/array_logic/rule_test.rb

@@ -238,6 +238,14 @@ module ArrayLogic
       assert_no_thing_match([4], @rule) 
     end
     
+    def test_count_with_not_equal_operator
+      @rule.rule = 'count(:id_odd?) != 1'
+      assert_no_thing_match([1, 2], @rule)
+      assert_thing_match([1, 2, 3], @rule)
+      assert_no_thing_match([3], @rule)
+      assert_thing_match([4], @rule) 
+    end
+    
     def test_function_with_other_rule
       @rule.rule = 'sum(:id) >= 3 and t3'
       assert_no_thing_match([1, 2], @rule)
@@ -254,6 +262,48 @@ module ArrayLogic
       assert_no_thing_match([4], @rule) 
     end
     
+    def test_function_with_non_existent_object_method
+      @rule.rule = 'sum(:something) > 3'
+      assert_raise NoMethodError do
+        @rule.match(get_things([1, 2]))
+      end
+    end
+    
+    def test_function_with_unsupported_function
+      @rule.rule = 'hat_stand(:id) > 3'
+      assert_raise RuntimeError do
+        @rule.match(get_things([1, 2]))
+      end      
+    end
+    
+    def test_function_with_unsupported_operator
+      @rule.rule = 'sum(:id) || 3'
+      assert_raise RuntimeError do
+        @rule.match(get_things([1, 2]))
+      end      
+    end
+    
+    def test_function_with_single_equals
+      @rule.rule = 'sum(:id) = 3'
+      assert_raise RuntimeError do
+        @rule.match(get_things([1, 2]))
+      end      
+    end    
+    
+    def test_function_without_number
+      @rule.rule = 'sum(:id) == a1'
+      assert_raise RuntimeError do
+        @rule.match(get_things([1, 2]))
+      end       
+    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        
+    end
+    
     def test_match_without_rule
       assert_raise RuntimeError do
         @rule.match([1, 2])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: array_logic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-27 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.