array_logic 0.0.3 → 0.0.4

data/lib/array_logic/rule.rb

@@ -37,11 +37,11 @@ module ArrayLogic
     end
     
     def combinations_that_match
-      combinations_of_identifiers_in_rule.delete_if{|ids| ! match_ids(ids)}
+      combinations_of_identifiers_in_rule.delete_if{|ids| ! match_ids(ids)} if rule and !rule.empty?
     end
     
     def combinations_that_do_not_match
-      combinations_of_identifiers_in_rule.delete_if{|ids| match_ids(ids)}
+      combinations_of_identifiers_in_rule.delete_if{|ids| match_ids(ids)} if rule and !rule.empty?
     end
 
     private

data/lib/array_logic/version.rb

@@ -1,3 +1,3 @@
 module ArrayLogic
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/array_logic/rule_test.rb

@@ -234,6 +234,13 @@ module ArrayLogic
       assert_equal([[1,2]], @rule.combinations_that_match)
     end
     
+    def test_combinations_that_match_without_rule
+      @rule.rule = nil
+      assert_nil(@rule.combinations_that_match, "combinations_that_match should return nil if there is no rule")
+      @rule.rule = ""
+      assert_nil(@rule.combinations_that_match, "combinations_that_match should return nil if the rule is blank")
+    end
+    
     def test_combinations_that_do_not_match
       @rule.rule = 't1 or t2'
       assert_equal([], @rule.combinations_that_do_not_match)
@@ -241,5 +248,17 @@ module ArrayLogic
       assert_equal([[1],[2]], @rule.combinations_that_do_not_match)
     end
     
+    def test_combinations_that_do_not_match_without_rule
+      @rule.rule = nil
+      assert_nil(@rule.combinations_that_do_not_match, "combinations_that_do_not_match should return nil if there is no rule")
+      @rule.rule = ""
+      assert_nil(@rule.combinations_that_do_not_match, "combinations_that_do_not_match should return nil if the rule is blank")      
+    end
+    
+    def test_combinations_that_do_not_match_when_none_returned
+      @rule.rule = 't1'
+      assert_equal([], @rule.combinations_that_do_not_match)
+    end
+    
   end
 end

metadata

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