fuzzy_string 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd20e09ff3e7e38a255c27b9780e08f0c2022e96
-  data.tar.gz: b15e19a162affbf1b33c3b2d70488d938fcdc35b
+  metadata.gz: a5d68f53a424798e82ac70ebee25bcf4dcf53c8d
+  data.tar.gz: 8fea39a1b1b91cced44e8cb9989f654e71b22322
 SHA512:
-  metadata.gz: a87e478b2ca14088b9b6878097f30e843a24e24edb2a30766774b6e60e9342b2ecdf3a6faa816a22d1065f4af9b0c1b8349a311bcafe0a8dd951ff6249a7300f
-  data.tar.gz: 32fb2af62beb4459061dca962cc40c437642a1b838c7e30dfc63e1daa908004786c6e06df5981426f2470528acc74f1b4d7e6eb2861e8ec16a69b49eee15de93
+  metadata.gz: c9b072391bbf522beacbded105d568abe1769a2dbb25b7bcebb6162f91bf4b07be4ec22f1294c1c484b9fce2716f5a072e7ec7305b98980137252a26f44b9461
+  data.tar.gz: 0a40442e1950284d8751415df9277c25d6b339c285f1fb0b3407fe226b9c9bbdbebfe7e01df550f985d446cbe8769d1facb741dd89fe7a6bc3b7371efb372cdf

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    fuzzy_string (0.0.2)
+    fuzzy_string (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    awesome_print (1.6.1)
-    builder (3.2.2)
-    minitest (5.6.1)
-    minitest-reporters (1.0.14)
+    awesome_print (1.7.0)
+    builder (3.2.3)
+    minitest (5.10.1)
+    minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    rake (10.4.2)
-    ruby-progressbar (1.7.5)
+    rake (10.5.0)
+    ruby-progressbar (1.8.1)
 
 PLATFORMS
   ruby
@@ -28,3 +28,6 @@ DEPENDENCIES
   minitest
   minitest-reporters (>= 1.0.1)
   rake (~> 10.0)
+
+BUNDLED WITH
+   1.14.6

data/lib/fuzzy_string/adjusted_score.rb

@@ -1,24 +1,27 @@
 class FuzzyString::AdjustedScore
   def self.rank(first,second) new(first,second).rank end
   def initialize(first,second)
-    @first  = first.length < second.length ? first  : second
-    @second = first.length < second.length ? second : first
+    @long  = first.length > second.length ? first  : second
+    @short = first.length > second.length ? second : first
   end
   def rank
-    return 0              if (@first == @second)
-    return @second.length if (@first.length == 0)
-    return @first.length  if (@second.length == 0)
+    return 0             if (@long == @short)
+    return @short.length if (@long.length  == 0)
+    return @long.length  if (@short.length == 0)
     adjusted_levenschtein_distance
   end
   def adjusted_levenschtein_distance
     special_chars = [")", "(", "]", "[", "}", "{", ".", "?", "+", "*"]
-    regex = /#{@second.chars.to_a.map{|el| special_chars.includes?(el) ? "\\"+el : el}.join('(.*?)')}/i
-    pieces = @first.split(regex)
-    score  = pieces[0][-1] == ' ' ? -1 : 0
-    score += pieces[0..@second.length - 1].uniq == [''] ? -@first.length.to_f / 2 : 0
-    score += (pieces[@second.length] || [])[0] == ' ' ? -@first.length.to_f / 2 : 0
-    score += cost(pieces.shift,0.5) + cost(pieces.pop,0.25) + cost(pieces.join,1)
-    score += FuzzyString::Levenshtein.distance(@first,@second)
+    regex = /#{@short.chars.to_a.map{|el| special_chars.include?(el) ? "\\"+el : el}.join('(.*?)')}/i
+    pieces = @long.split(regex)
+    score = FuzzyString::Levenshtein.distance(@short,@long)
+    score *= pieces[0..@short.length - 1].uniq == [''] ? 0.75 : 1
+    letter_ratio = score.to_f / @long.length
+    score -= pieces[0][-1] == ' ' ? letter_ratio * 0.75 : 0
+    score -= (pieces[@short.length] || [])[0]  == ' '  ? letter_ratio * @short.length * 0.75 : 0
+    score -= letter_ratio * cost(pieces.shift,0.5)
+    score -= letter_ratio * cost(pieces.pop,  0.9)
+    score -= letter_ratio * cost(pieces.join, 0.1)
   end
   private
   def cost(piece,multiplier) piece.length * multiplier rescue(0) end

data/lib/fuzzy_string/version.rb

@@ -1,3 +1,3 @@
 module FuzzyString
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/fuzzy_string_test.rb

@@ -39,5 +39,7 @@ class FuzzyStringTest < MiniTest::Unit::TestCase
   def test_prioritizes_string_starting_with_match
     assert 'escreens are' ^ 'escreen' < 'I am a n escreen' ^ 'escreen'
   end
-
+  def test_prioritizes_exact_sub_strings
+    assert 'ACME' ^ 'ACME Utility' < 'ACME' ^ 'ACT Me 2'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy_string
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Relative ranking system for strings.