jaro_winkler 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6c09b6eb84b074ba116e7a986660665da7948ee55e655c0515137e2e717a6d
-  data.tar.gz: cd8276983e8a4af489da885caa2e57fc954476d475e4d3b5a0a52ad5c561369d
+  metadata.gz: a54cd261b2f561005020139db57b155c402b572f66d665ed20e7f24eeeb4c2bf
+  data.tar.gz: 461c6ca244424f65a1d37525d4f65e498b99153aea3726c6207f7fe00a406495
 SHA512:
-  metadata.gz: bd00297dd0d4ba66fa0210712c304c5f1f85df7a694148d9fdfaf0c9d0ec8f29544490f55340229b23b3f333b68bdb41b8e5d877af55502da65e85d160422c01
-  data.tar.gz: 6477366a7cdf3079537654b65253a26e116a303fce88501df94a7a827d1b66e0d39e1918e0498f1f13c0349e407ec2040c002c321844a416b50ae1dbf2f499bd
+  metadata.gz: 763dc827330ddffabc653c4025f0612f0da0c401af61b64edca89a14089378088a65a2458cfbdfa0861fd88733ef517ad00a9f048cfe6c0ff9f2c230ccfbf97c
+  data.tar.gz: 8c688332177a4aef85f39868b8f030623cf41b71befff5ea103bdf5e69e79ec0579e1c99286e08e877c59778196d9b11c4b701d05dd84198881a339d1237e5f3

data/ext/jaro_winkler/extconf.rb

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-if RUBY_ENGINE == 'ruby'
-  require 'mkmf'
-  $CFLAGS << ' -std=c99 '
-  create_makefile('jaro_winkler/jaro_winkler_ext')
-else
-  open('Makefile', 'wb') do |file|
-    file.write <<-MAKEFILE
-.PHONY: install
-install:
-\techo "Cannot compile C Extension, fall back to pure Ruby version."
-clean:
-    MAKEFILE
-  end
-end
+require 'mkmf'
+$CFLAGS << ' -std=c99 '
+create_makefile('jaro_winkler/jaro_winkler_ext')

data/ext/jaro_winkler/jaro_winkler.c

@@ -27,12 +27,11 @@ VALUE distance(size_t argc, VALUE *argv, VALUE self,
                                      uint32_t *codepoints2, size_t len2,
                                      Options *)) {
   VALUE s1, s2, opt;
-  CodePoints cp1, cp2;
 
   rb_scan_args((int32_t)argc, argv, "2:", &s1, &s2, &opt);
-  codepoints_init(&cp1, s1);
-  codepoints_init(&cp2, s2);
 
+  Check_Type(s1, T_STRING);
+  Check_Type(s2, T_STRING);
   Options c_opt = DEFAULT_OPTIONS;
   if (TYPE(opt) == T_HASH) {
     VALUE weight = rb_hash_aref(opt, ID2SYM(rb_intern("weight"))),
@@ -54,6 +53,9 @@ VALUE distance(size_t argc, VALUE *argv, VALUE self,
       c_opt.adj_table =
           (TYPE(adj_table) == T_FALSE || NIL_P(adj_table)) ? 0 : 1;
   }
+  CodePoints cp1, cp2;
+  codepoints_init(&cp1, s1);
+  codepoints_init(&cp2, s2);
   VALUE ret = rb_float_new(
       (*distance_fn)(cp1.data, cp1.length, cp2.data, cp2.length, &c_opt));
   codepoints_free(&cp1);

data/lib/jaro_winkler/jaro_winkler_pure.rb

@@ -14,10 +14,12 @@ module JaroWinkler
 
   class << self
     def distance(str1, str2, options = {})
+      validate!(str1, str2)
       _distance str1.codepoints.to_a, str2.codepoints.to_a, options
     end
 
     def jaro_distance(str1, str2, options = {})
+      validate!(str1, str2)
       _jaro_distance str1.codepoints.to_a, str2.codepoints.to_a, options
     end
 
@@ -125,5 +127,9 @@ module JaroWinkler
       m = similar_count / 10.0 + m if options[:adj_table]
       (m / len1 + m / len2 + (m - t) / m) / 3
     end
+
+    def validate!(str1, str2)
+      raise TypeError unless str1.is_a?(String) && str2.is_a?(String)
+    end
   end
 end

data/lib/jaro_winkler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JaroWinkler
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaro_winkler
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Jian Weihang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler