loose_tight_dictionary 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/loose_tight_dictionary.rb

@@ -82,26 +82,26 @@ class LooseTightDictionary
     left = read_left left_record
     right = read_right right_record
     
-    if p = positives.andand.detect { |record| record[0] == left }
-      correct_right = p[1]
-    else
-      correct_right = :ignore
-    end
-    
-    if n = negatives.andand.detect { |record| record[0] == left }
-      incorrect_right = n[1]
-    else
-      incorrect_right = :ignore
-    end
-    
-    if correct_right != :ignore and right != correct_right
-      logger.andand.debug "  Mismatch! (should be #{correct_right})"
-      raise Mismatch
+    if positive_record = positives.andand.detect { |record| record[0] == left }
+      correct_right = positive_record[1]
+      if correct_right.blank? and right.present?
+        logger.andand.debug "  Mismatch! (should match SOMETHING)"
+        raise Mismatch
+      elsif right != correct_right
+        logger.andand.debug "  Mismatch! (should be #{correct_right})"
+        raise Mismatch
+      end
     end
     
-    if incorrect_right != :ignore and right == incorrect_right
-      logger.andand.debug "  False positive! (should NOT be #{incorrect_right})"
-      raise FalsePositive
+    if negative_record = negatives.andand.detect { |record| record[0] == left }
+      incorrect_right = negative_record[1]
+      if incorrect_right.blank? and right.present?
+        logger.andand.debug "  False positive! (should NOT match ANYTHING)"
+        raise FalsePositive
+      elsif right == incorrect_right
+        logger.andand.debug "  False positive! (should NOT be #{incorrect_right})"
+        raise FalsePositive
+      end
     end
   end
 

data/test/test_loose_tight_dictionary.rb

@@ -68,6 +68,20 @@ class TestLooseTightDictionary < Test::Unit::TestCase
   end
   
   if ENV['OLD'] == 'true' or ENV['ALL'] == 'true'
+    should "call it a mismatch if you hit a blank positive" do
+      @positives.push [@a_left[0], '']
+      assert_raises(LooseTightDictionary::Mismatch) do
+        ltd.left_to_right @a_left
+      end
+    end
+
+    should "call it a false positive if you hit a blank negative" do
+      @negatives.push [@a_left[0], '']
+      assert_raises(LooseTightDictionary::FalsePositive) do
+        ltd.left_to_right @a_left
+      end
+    end
+    
     should "have a false match without blocking" do
       # @d_left will be our victim
       @right.push @d_lookalike

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency