fuzzy_match 2.0.4 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a33310fff722b4e0b2a80880e980564712a7ab6a
+  data.tar.gz: 4d21b8246e9773529b286c2a81ba7380d40f61e3
+SHA512:
+  metadata.gz: 2b6444fe73846bb0c1c088a54ac5c500ce80689d6a29e6ed29a68860cfe9a5ad856e98090118d6a6e3ac8dfb4ea474d8315d0ca55ba35b503456c9bb499754a5
+  data.tar.gz: a22014027c0c5d37c52fb12d6667e02ab7d92b083a2ca0478fb3a463a8c765e3efd9e64ff355ebf8b0fbcbe94b1a0de39257ec6ac511181110d25ca9fd22f73b

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.1.0 / 2014-07-14
+
+* Breaking changes
+
+  * Ignore single word matches if threshold is non-nil - thanks @lukeasrodgers ! https://github.com/seamusabshere/fuzzy_match/pull/14
+
 2.0.4 / 2013-09-19
 
 * Bug fixes

data/Gemfile

@@ -1,5 +1,4 @@
-source :rubygems
-
+source 'https://rubygems.org'
 gemspec
 
 # bin/fuzzy_match development

data/README.markdown

@@ -180,11 +180,12 @@ We often combine it with [`remote_table`](https://github.com/seamusabshere/remot
 - correct serious or repeated errors with `errata`
 - `fuzzy_match` the rest
 
-## Authors
+## Contributors
 
 * Seamus Abshere <seamus@abshere.net>
 * Ian Hough <ijhough@gmail.com>
 * Andy Rossmeissl <andy@rossmeissl.net>
+* Luke Rodgers [@lukeasrodgers](https://github.com/lukeasrodgers)
 
 ## Copyright
 

data/lib/fuzzy_match.rb

@@ -38,7 +38,7 @@ class FuzzyMatch
     :gather_last_result => false,
     :find_all => false,
     :find_all_with_score => false,
-    :threshold => 0,
+    :threshold => nil,
     :find_best => false,
     :find_with_score => false,
   }

data/lib/fuzzy_match/similarity.rb

@@ -22,9 +22,9 @@ class FuzzyMatch
     end
 
     def satisfy?(needle, threshold)
-      best_score.dices_coefficient_similar > threshold or
+      best_score.dices_coefficient_similar > (threshold || 0) or
         ((record2.clean.length < 3 or needle.clean.length < 3) and best_score.levenshtein_similar > 0) or
-        (needle.words & record2.words).any?
+        (threshold.nil? && (needle.words & record2.words).any?)
     end
 
     def inspect

data/lib/fuzzy_match/version.rb

@@ -1,3 +1,3 @@
 class FuzzyMatch
-  VERSION = '2.0.4'
+  VERSION = '2.1.0'
 end

data/spec/fuzzy_match_spec.rb

@@ -319,6 +319,15 @@ describe FuzzyMatch do
       d.find('Y bar').should be_nil
     end
 
+    it %{should not return false positives because of one-letter similarities if a threshold is used} do
+      # dices coefficient doesn't think these two are similar at all because it looks at pairs
+      FuzzyMatch.score_class.new('X foo', 'X bar').dices_coefficient_similar.should == 0
+      # so we must compensate for that somewhere
+      d = FuzzyMatch.new ['A great place to go for a drink is a bar', 'Some people enjoy congregating at their local bar, or "watering hole"']
+      d.find('chinup bar').should_not be_nil
+      d.find('chinup bar', threshold: 0.5).should be_nil
+    end
+
     it %{finds possible matches even when pair distance fails} do
       d = FuzzyMatch.new ['XX', '2 A']
       d.find('2A').should == '2 A'

metadata

@@ -1,190 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy_match
 version: !ruby/object:Gem::Version
-  version: 2.0.4
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_inline_schema
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cohort_analysis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: weighted_average
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Find a needle in a haystack using string similarity and (optionally)
@@ -196,8 +173,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -235,27 +212,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/seamusabshere/fuzzy_match
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fuzzy_match
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Find a needle in a haystack using string similarity and (optionally) regexp
   rules. Replaces loose_tight_dictionary.
 test_files: []