emiler 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8779ed5ed7a15142398296cbd9c4338c768a7f
-  data.tar.gz: e8290f544838222b96e34bbcccd4b58af982ba28
+  metadata.gz: 88c02b12935d6916f9499df2a434905469268109
+  data.tar.gz: 60f9eb13edbbaf3fd9dec3726840fad647a6dd38
 SHA512:
-  metadata.gz: 645a20b05c46357a5b91e22aae4e6ae93c8ea6d1ffed6d4a922ccfb958720ba8919a554a630028003be97fbe9517fb44c4407003b220cc0c39399bf4ed1949d3
-  data.tar.gz: 3c69442320ddb491a659e384c09e2218ca6ce4980ec47234bcb374027cb2f195dc62e3ec92448f726a4c00e440218709eedde135e0d2fc2ff10738e3afdf0212
+  metadata.gz: f382fcf45028650029f23230dd8f1f9445d21394fcdb8f49e252ed067cbf55876ec78f386002cad7acd0e7000fbbc36b59cdde84b5b9c05eb7470a2ebe0aa86e
+  data.tar.gz: c23d478e3b23404e8dfb408f62df2a5db66c65a2c9b003de02d879940ee2a259c75e4035ee27781a35cf4138c555be2aaf44865e53c83f2f54575ce48eae2757

data/emiler.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry', '~> 0.10'

data/lib/emiler.rb

@@ -1,24 +1,21 @@
 require 'emiler/version'
-require 'fuzzystringmatch'
+require 'emiler/jarowinkler'
 
 module Emiler
-  USE_PURE = ENV['USE_PURE_JW']
   INEXACT_MATCH_COEFFICIENT = ENV['INEXACT_MATCH_COEFFICIENT'] || 0.8
   RAISE_ON_MALFORMED_EMAIL = ENV['RAISE_ON_MALFORMED_EMAIL']
 
   class JW
     attr_reader :jw
-    def initialize matcher = :native
-      @jw = FuzzyStringMatch::JaroWinkler.create(matcher)
+    def initialize
+      @jw = FuzzyStringMatch::JaroWinklerPure.new
     end
 
     def distance s1, s2
       @jw.getDistance s1, s2
     end
 
-    NATIVE = JW.new
-    PURE = USE_PURE ? JW.new(:pure) : nil
-    MATCHER = PURE || NATIVE
+    MATCHER = JW.new
     DUMMY = { jw: 0, full: 0, name: 0, domain: 0, result: false }.freeze
 
     private :initialize
@@ -32,7 +29,7 @@ module Emiler
 
   # rubocop:disable Metrics/AbcSize
   def similarity e1, e2
-    e1, e2 = [e1, e2].map(&:downcase)
+    e1, e2 = [e1, e2].map(&:to_s).map(&:downcase)
     em1, em2 = [e1, e2].map { |e| e.split '@' }
 
     if em1.size != 2 || em2.size != 2

data/lib/emiler/jarowinkler.rb

@@ -0,0 +1,101 @@
+#
+#                            Fuzzy String Match
+#
+#   Copyright 2010-2011 Kiyoka Nishiyama
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+module FuzzyStringMatch
+  class JaroWinklerPure
+    THRESHOLD = 0.7
+
+    def pure?
+      true
+    end
+
+    def getDistance( s1, s2 )
+      a1 = s1.split( // )
+      a2 = s2.split( // )
+
+      if s1.size > s2.size
+        (max,min) = a1,a2
+      else
+        (max,min) = a2,a1
+      end
+
+      range = [ (max.size / 2 - 1), 0 ].max
+      indexes = Array.new( min.size, -1 )
+      flags   = Array.new( max.size, false )
+
+      matches = 0;
+      (0 ... min.size).each { |mi|
+        c1 = min[mi]
+        xi = [mi - range, 0].max
+        xn = [mi + range + 1, max.size].min
+
+        (xi ... xn).each { |i|
+          if (not flags[i]) && ( c1 == max[i] )
+            indexes[mi] = i
+            flags[i] = true
+            matches += 1
+            break
+          end
+        }
+      }
+
+      ms1 = Array.new( matches, nil )
+      ms2 = Array.new( matches, nil )
+
+      si = 0
+      (0 ... min.size).each { |i|
+        if (indexes[i] != -1)
+          ms1[si] = min[i]
+          si += 1
+        end
+      }
+
+      si = 0
+      (0 ... max.size).each { |i|
+        if flags[i]
+          ms2[si] = max[i]
+          si += 1
+        end
+      }
+
+      transpositions = 0
+      (0 ... ms1.size).each { |mi|
+        if ms1[mi] != ms2[mi]
+          transpositions += 1
+        end
+      }
+
+      prefix = 0
+      (0 ... min.size).each { |mi|
+        if s1[mi] == s2[mi]
+          prefix += 1
+        else
+          break
+        end
+      }
+
+      if 0 == matches
+        0.0
+      else
+        m = matches.to_f
+        t = (transpositions/ 2)
+        j = ((m / s1.size) + (m / s2.size) + ((m - t) / m)) / 3.0;
+        return j < THRESHOLD ? j : j + [0.1, 1.0 / max.size].min * prefix * (1 - j)
+      end
+    end
+  end
+end

data/lib/emiler/version.rb

@@ -1,3 +1,3 @@
 module Emiler
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Aleksei Matiushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ files:
 - bin/setup
 - emiler.gemspec
 - lib/emiler.rb
+- lib/emiler/jarowinkler.rb
 - lib/emiler/version.rb
 homepage: https://kantox.com
 licenses: