fuzzy_match 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.0.2 / 2013-08-11
+
+* Enhancements
+
+  * You can pass identity rules as procs that take record1 and record2 in their original forms (note they should return nil if not sure)
+
 2.0.1 / 2013-06-06
 
 * Bug fixes

data/lib/fuzzy_match/rule/identity.rb

@@ -3,15 +3,36 @@ class FuzzyMatch
     # Identities take effect when needle and haystack both match a regexp
     # Then the captured part of the regexp has to match exactly
     class Identity < Rule
+      attr_reader :proc
+
+      def initialize(regexp_or_proc)
+        case regexp_or_proc
+        when Regexp
+          @regexp = regexp_or_proc
+        when Proc
+          @proc = regexp_or_proc
+        else
+          raise ArgumentError, "[FuzzyMatch] Identity must be set with either Regexp objects or Procs, but got #{regexp_or_proc.inspect} (#{regexp_or_proc.class.name})"
+        end
+      end
+
+      def ==(other)
+        other.class == self.class and (regexp ? regexp == other.regexp : proc == other.proc)
+      end
+
       # Two strings are "identical" if they both match this identity and the captures are equal.
       #
       # Only returns true/false if both strings match the regexp.
       # Otherwise returns nil.
       def identical?(record1, record2)
-        if str1_match_data = regexp.match(record1.whole) and str2_match_data = regexp.match(record2.whole)
-          str1_match_data.captures.join.downcase == str2_match_data.captures.join.downcase
+        if regexp
+          if (str1_match_data = regexp.match(record1.whole)) and (str2_match_data = regexp.match(record2.whole))
+            str1_match_data.captures.join.downcase == str2_match_data.captures.join.downcase
+          else
+            nil
+          end
         else
-          nil
+          proc.call record1.original, record2.original
         end
       end
     end

data/lib/fuzzy_match/version.rb

@@ -1,3 +1,3 @@
 class FuzzyMatch
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/fuzzy_match_spec.rb

@@ -96,12 +96,17 @@ describe FuzzyMatch do
     it %{sometimes gets false results without them} do
       # false positive without identity
       d = FuzzyMatch.new %w{ foo bar }
+      d.find('bar').should == 'bar'
+      d.find('bare').should == 'bar'
       d.find('baz').should == 'bar'
     end
 
     it %{can be used to improve results} do
       d = FuzzyMatch.new %w{ foo bar }, :identities => [ /ba(.)/ ]
+      d.find('bar').should == 'bar'
+      d.find('bare').should == 'bar'
       d.find('baz').should be_nil
+      d.find('baze').should be_nil
     end
 
     it %{is sort of like backreferences} do
@@ -112,6 +117,14 @@ describe FuzzyMatch do
       d = FuzzyMatch.new([one, two], :identities => [/\A(\d+)\s+(\w+)/])
       d.find('1 sauk TWOTWOTWOTWO').should == one # correct
     end
+
+    it %{has a proc form} do
+      d = FuzzyMatch.new %w{ foo bar }, :identities => [ lambda { |a, b| (a.start_with?('ba') and b.start_with?('ba') ? a[2] == b[2] : nil) } ]
+      d.find('bar').should == 'bar'
+      d.find('bare').should == 'bar'
+      d.find('baz').should be_nil
+      d.find('baze').should be_nil
+    end
   end
 
   describe 'groupings' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy_match
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_inline_schema