jaro_winkler 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84ae47f4c9a9afe40e7b01c7d49359dd6986009
-  data.tar.gz: 6994fd05b085d89e203f1c5663915bdc9ce88735
+  metadata.gz: 5ca8266cce395bbcf2b425545e7a426110ef2601
+  data.tar.gz: 23689730155a05387f5908b4661271f20aa118af
 SHA512:
-  metadata.gz: b2bf1f5c392750f82e203aafed8264eaa79750b9a3a11209cc221d8506cbf8b1840cd8822b631f0d5de5c6b8bd2c2c471b0992c55986918b81b9e4ef5236e072
-  data.tar.gz: c02296f3c27531a518f752177cca86c7e00670a1c3e7566bb6c3b499f7f676148a44fd3ec6848eedd50072bcd94a2c4781d9667440b44cd4032e24570f10a862
+  metadata.gz: 67661a5f12b0204e76cf50fc44bad3a912b3a570602d18402e29065a6d75455cf7666b439f1aecb8b4d8f77b380cc5af8ff0b7c1f143b557b6fb4488198c19cf
+  data.tar.gz: cb172f54e6ac951d068ad805e157d31c233335e50ecf81c89c15d7cdf50b3b092cbfda044b962639b8e0f48d760bcddfb2277893d70a83b018e63cad97084e0f

data/jaro_winkler.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = JaroWinkler::VERSION
   spec.authors       = ["Jian Weihang"]
   spec.email         = ["tonytonyjan@gmail.com"]
-  spec.extensions    = ["ext/jaro_winkler/extconf.rb"]
+  spec.extensions    = ["ext/jaro_winkler/extconf.rb"] unless RUBY_PLATFORM == 'java'
   spec.summary       = %q{Pure Ruby implementation of Jaro-Winkler distance algorithm.}
   spec.description   = %q{Pure Ruby implementation of Jaro-Winkler distance algorithm.}
   spec.homepage      = "https://github.com/tonytonyjan/jaro_winkler"

data/lib/jaro_winkler.rb

@@ -1,15 +1,19 @@
-require 'jaro_winkler/jaro_winkler.so'
+require 'jaro_winkler/jaro_winkler.so' unless RUBY_PLATFORM == 'java'
 module JaroWinkler
   module_function
   def jaro_distance s1, s2
     return 0.0 if s1.empty? || s2.empty?
+    # Guarantee the length order
+    if s1.length > s2.length
+      tmp = s1; s1 = s2; s2 = tmp
+    end
     length1, length2 = s1.length, s2.length
-    window_size      = ([length1, length2].max / 2) - 1
+    window_size      = (s2.length / 2) - 1
     matches          = 0.0
     transpositions   = 0
     previous_index   = -1
+    max_index = length2 - 1
     s1.chars.each_with_index do |c1, i|
-      max_index = length2 - 1
       left      = i - window_size
       right     = i + window_size
       left      = 0         if left  < 0
@@ -39,7 +43,7 @@ module JaroWinkler
 
   def distance s1, s2, options = {}
     options = {weight: 0.1, threshold: 0.7, case_match: false, native: false}.merge options
-    return c_distance(s1, s2) if options[:native]
+    return c_distance(s1, s2) if RUBY_PLATFORM != 'java' && options[:native]
     weight, threshold, case_match = options[:weight], options[:threshold], options[:case_match]
     raise 'Scaling factor should not exceed 0.25, otherwise the distance can become larger than 1' if weight > 0.25
     s1, s2 = s1.downcase, s2.downcase if case_match

data/lib/jaro_winkler/version.rb

@@ -1,3 +1,3 @@
 module JaroWinkler
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/jaro_winkler_spec.rb

@@ -15,7 +15,9 @@ describe JaroWinkler do
       ['tonytonyjan', 'tonytonyjan', 1.0],
       ['', '', 0.0],
       ['tony', '', 0.0],
-      ['', 'tony', 0.0]
+      ['', 'tony', 0.0],
+      ['tonytonyjan', 'tony', 0.8727],
+      ['tony', 'tonytonyjan', 0.8727]
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jaro_winkler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jian Weihang