loose_tight_dictionary 1.0.3 → 1.0.4

data/lib/loose_tight_dictionary.rb

@@ -71,6 +71,7 @@ class LooseTightDictionary
       last_result.tighteners = tighteners
       last_result.identities = identities
       last_result.blockings = blockings
+      last_result.stop_words = stop_words
     end
     
     needle = Wrapper.new self, needle
@@ -89,7 +90,7 @@ class LooseTightDictionary
 
     candidates = if must_match_at_least_one_word
       haystack.select do |straw|
-        needle.words.any? { |w| straw.render.include? w }
+        (needle.words & straw.words).any?
       end
     else
       haystack
@@ -172,9 +173,12 @@ class LooseTightDictionary
     log "-" * 150
     log last_result.needle.render
     log
-    log "Haystack"
+    log "Stop words"
+    log last_result.stop_words.blank? ? '(none)' : last_result.stop_words.map { |stop_word| stop_word.inspect }.join("\n")
+    log
+    log "Candidates"
     log "-" * 150
-    log last_result.haystack.map { |record| record.render }.join("\n")
+    log last_result.candidates.map { |record| record.render }.join("\n")
     log
     log "Tighteners"
     log "-" * 150
@@ -223,16 +227,8 @@ class LooseTightDictionary
   
   def free
     free_last_result
-    @options.try :clear
-    @options = nil
     @haystack.try :clear
     @haystack = nil
-    @tighteners.try :clear
-    @tighteners = nil
-    @identities.try :clear
-    @identities = nil
-    @blockings.try :clear
-    @blockings = nil
   ensure
     @freed = true
   end
@@ -240,7 +236,6 @@ class LooseTightDictionary
   private
   
   def free_last_result
-    @last_result.try :free
-    @last_result = nil
+    @last_result = nil    
   end
 end

data/lib/loose_tight_dictionary/result.rb

@@ -4,6 +4,7 @@ class LooseTightDictionary
     attr_accessor :tighteners
     attr_accessor :blockings
     attr_accessor :identities
+    attr_accessor :stop_words
     attr_accessor :candidates
     attr_accessor :joint
     attr_accessor :disjoint
@@ -12,13 +13,5 @@ class LooseTightDictionary
     attr_accessor :similarities
     attr_accessor :record
     attr_accessor :score
-    
-    def haystack
-      joint + disjoint
-    end
-    
-    def free
-      # nothing to see here
-    end
   end
 end

data/lib/loose_tight_dictionary/version.rb

@@ -1,3 +1,3 @@
 class LooseTightDictionary
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/test/test_loose_tight_dictionary.rb

@@ -2,15 +2,6 @@
 require 'helper'
 
 class TestLooseTightDictionary < Test::Unit::TestCase
-  # in case i start doing something with the log
-  # def setup
-  #   @log = StringIO.new
-  # end
-  # 
-  # def teardown
-  #   @log.close
-  # end
-  
   def test_001_find
     d = LooseTightDictionary.new %w{ RATZ CATZ }
     assert_equal 'RATZ', d.find('RITZ')
@@ -168,4 +159,25 @@ class TestLooseTightDictionary < Test::Unit::TestCase
     d = LooseTightDictionary.new [ 'A HOTEL', 'B HTL' ], :must_match_at_least_one_word => true, :stop_words => [ %r{HO?TE?L} ]
     assert_equal 'A HOTEL', d.find('A HTL')
   end
+  
+  def test_021_explain
+    require 'stringio'
+    capture = StringIO.new
+    begin
+      old_stderr = $stderr
+      $stderr = capture
+      d = LooseTightDictionary.new %w{ RATZ CATZ }
+      d.explain('RITZ')
+    ensure
+      $stderr = old_stderr
+    end
+    capture.rewind
+    assert capture.read.include?('CATZ')
+    capture.close
+  end
+  
+  def test_022_compare_words_with_words
+    d = LooseTightDictionary.new [ 'PENINSULA HOTELS' ], :must_match_at_least_one_word => true
+    assert_equal nil, d.find('DOLCE LA HULPE BXL FI')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loose_tight_dictionary
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2185313400 !ruby/object:Gem::Requirement
+  requirement: &2177777000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185313400
+  version_requirements: *2177777000
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2185284260 !ruby/object:Gem::Requirement
+  requirement: &2177776540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185284260
+  version_requirements: *2177776540
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2185283700 !ruby/object:Gem::Requirement
+  requirement: &2177776000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2185283700
+  version_requirements: *2177776000
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2185283260 !ruby/object:Gem::Requirement
+  requirement: &2177775560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185283260
+  version_requirements: *2177775560
 - !ruby/object:Gem::Dependency
   name: cohort_scope
-  requirement: &2185282760 !ruby/object:Gem::Requirement
+  requirement: &2177775060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185282760
+  version_requirements: *2177775060
 - !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &2185282340 !ruby/object:Gem::Requirement
+  requirement: &2177774620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185282340
+  version_requirements: *2177774620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2185281880 !ruby/object:Gem::Requirement
+  requirement: &2177774160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185281880
+  version_requirements: *2177774160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2185281260 !ruby/object:Gem::Requirement
+  requirement: &2177773620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2185281260
+  version_requirements: *2177773620
 - !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &2185280640 !ruby/object:Gem::Requirement
+  requirement: &2177773100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2185280640
+  version_requirements: *2177773100
 description: Create dictionaries that link rows between two tables using loose matching
   (string similarity) by default and tight matching (regexp) by request.
 email: