loose_tight_dictionary 0.0.3 → 0.0.4

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/seamusabshere/loose_tight_dictionary"
     gem.authors = ["Seamus Abshere"]
     gem.add_development_dependency "shoulda"
-    gem.add_development_dependency "remote_table", ">=0.2.16"
+    gem.add_development_dependency "remote_table", ">=0.2.19"
     gem.add_dependency 'activesupport', '>=2.3.4'
     gem.add_dependency 'fastercsv', '>=1.5.3'
     gem.add_dependency 'andand', '>=1.3.1'

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/loose_tight_dictionary.rb

@@ -114,7 +114,7 @@ class LooseTightDictionary
       begin
         right_record = left_to_right left_record
       ensure
-        tee.andand.puts [ read_left(left_record), read_right(right_record), $ltd_1 ].flatten.to_csv
+        tee.andand.puts [ read_left(left_record), read_right($ltd_0), $ltd_1 ].flatten.to_csv
       end
     end
   end
@@ -125,7 +125,13 @@ class LooseTightDictionary
     blocking_left = blocking left
     t_options_left = t_options left
     history = Hash.new
-    right_record = right_records.select { |record| blocking_left.nil? or blocking_left.match(read_right(record)) }.max do |a_record, b_record|
+    right_record = right_records.select do |right_record|
+      right = read_right right_record
+      blocking_right = blocking right
+      (not blocking_left and not blocking_right) or
+        (blocking_right and blocking_right.match(left)) or
+        (blocking_left and blocking_left.match(right))
+    end.max do |a_record, b_record|
       a = read_right a_record
       b = read_right b_record
       i_options_a = i_options a
@@ -176,7 +182,12 @@ class LooseTightDictionary
     z = 1
     debugger if $ltd_left.andand.match(left) or $ltd_right.andand.match(right)
     z = 1
-    return if collision? i_options_left, i_options_right
+    if collision? i_options_left, i_options_right
+      $ltd_0 = nil
+      return
+    else
+      $ltd_0 = right_record
+    end
     inline_check left_record, right_record
     right_record
   end

data/test/test_loose_tight_dictionary.rb

@@ -68,17 +68,6 @@ class TestLooseTightDictionary < Test::Unit::TestCase
   end
   
   if ENV['OLD'] == 'true' or ENV['ALL'] == 'true'
-    should "only use identities if they stem from the same regexp" do
-      @identities.push @r_1
-      @identities.push [ '/(cessna)(?:.*?)(citation)/i' ]
-      @identities.push [ '/(cessna)(?:.*?)(\d\d\d)/i' ]
-      x_left = [ 'CESSNA D-333 CITATION V']
-      x_right = [ 'CESSNA D-333' ]
-      @right.push x_right
-      
-      assert_equal x_right, ltd.left_to_right(x_left)
-    end
-    
     should "have a false match without blocking" do
       # @d_left will be our victim
       @right.push @d_lookalike
@@ -96,11 +85,23 @@ class TestLooseTightDictionary < Test::Unit::TestCase
       assert_equal @d_right, ltd.left_to_right(@d_left)
     end
     
-    should "not do blocking if the left doesn't match any blockings" do
+    should "treat blocks as exclusive" do
+      @right = [ @d_left ]
       @tightenings.push @t_1
       @blockings.push ['/(bombardier|de ?havilland)/i']
+
+      assert_equal nil, ltd.left_to_right(@d_lookalike)
+    end
+    
+    should "only use identities if they stem from the same regexp" do
+      @identities.push @r_1
+      @identities.push [ '/(cessna)(?:.*?)(citation)/i' ]
+      @identities.push [ '/(cessna)(?:.*?)(\d\d\d)/i' ]
+      x_left = [ 'CESSNA D-333 CITATION V']
+      x_right = [ 'CESSNA D-333' ]
+      @right.push x_right
       
-      assert_equal @d_right, ltd.left_to_right(@d_lookalike)
+      assert_equal x_right, ltd.left_to_right(x_left)
     end
     
     should "use the best score from all of the tightenings" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -04:00
+date: 2010-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,8 +39,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 16
-        version: 0.2.16
+        - 19
+        version: 0.2.19
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency