array_logic 0.1.1 → 0.1.2

data/README.rdoc

@@ -1,9 +1,11 @@
 == array_logic
 
-A system that allows me to define the logic for comparing arrays.
+A system that allows me to define the logic for comparing arrays of objects.
 
-The logic for an active record model Answer, looks like this:
+One prerequisite for the comparison is that the objects have an id method that
+returns a unique (within the set of objects) integer.
 
+The logic for an active record model Answer, looks like this:
 
     a1 = Answer.find(1)
     a2 = Answer.find(2)

data/lib/array_logic/rule.rb

@@ -18,18 +18,13 @@ module ArrayLogic
     def match(things)
       check_rule
       @things = things
-      @thing_ids = things.collect(&:id)
-      logic
+      match_ids things.collect(&:id)
     end
     
     def block(things)
       ! match(things)
     end
 
-    def logic
-      eval(expression)  
-    end
-
     def rule_valid?
       check_rule
       !rule.empty?
@@ -37,10 +32,6 @@ module ArrayLogic
       return false
     end
 
-    def replace_item(pattern, processor)
-      @processed_rule = processed_rule.gsub(pattern) {|x| processor.call(x)}
-    end
-    
     def object_ids_used
       chrs_after_first = 1..-1
       @object_ids_used ||= objects_identifiers_in_rule.collect{|i| i[chrs_after_first].to_i}.uniq
@@ -60,6 +51,10 @@ module ArrayLogic
     end
     
     private
+    def logic
+      eval(expression)  
+    end
+    
     def match_ids(ids)
       @thing_ids = ids
       logic
@@ -90,9 +85,13 @@ module ArrayLogic
       add_space_around_puctuation_characters
       make_everything_lower_case
       replace_logic_words_with_operators
-      replace_item(thing_id_pattern, true_or_false_for_thing_id_in_thing_ids)
+      replace_item(thing_id_pattern, ids_include_this_id)
       replace_item(number_in_set_pattern, comparison_of_number_with_true_count)
     end
+    
+    def replace_item(pattern, processor)
+      @processed_rule = processed_rule.gsub(pattern) {|x| processor.call(x)}
+    end
 
     # for example: 2 in t1, t2, t3
     def number_in_set_pattern
@@ -112,7 +111,7 @@ module ArrayLogic
       /\w\d+/
     end
 
-    def true_or_false_for_thing_id_in_thing_ids
+    def ids_include_this_id
       lambda {|s| thing_ids.include?(s[/\d+/].to_i)}
     end
 

data/lib/array_logic/version.rb

@@ -1,3 +1,16 @@
 module ArrayLogic
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
+
+# History
+# =======
+# 
+# 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

@@ -187,7 +187,7 @@ module ArrayLogic
     def test_replace_item
       @rule.rule = 't1 or ( t2 and t3 )'
       process = lambda {|s| [1, 2].include?(s[/\d+/].to_i)}
-      result = @rule.replace_item(/\w\d+/, process)
+      result = @rule.send(:replace_item, /\w\d+/, process)
       assert_equal('true or ( true and false )', result)
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: array_logic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-02-22 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.