fix: raises TypeError when input type is not string

closes #24
tonytonyjan · Jan 4, 2019 · c146491 · c146491
1 parent e1b9add
commit c146491
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/ext/jaro_winkler/jaro_winkler.c b/ext/jaro_winkler/jaro_winkler.c
@@ -30,6 +30,8 @@ VALUE distance(size_t argc, VALUE *argv, VALUE self,
 
   rb_scan_args((int32_t)argc, argv, "2:", &s1, &s2, &opt);
 
+  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"))),

diff --git a/lib/jaro_winkler/jaro_winkler_pure.rb b/lib/jaro_winkler/jaro_winkler_pure.rb
@@ -14,10 +14,12 @@ class InvalidWeightError < Error; end
 
   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 @@ def _jaro_distance(codes1, codes2, options = {})
       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
diff --git a/test/tests.rb b/test/tests.rb
@@ -98,6 +98,15 @@ def test_encoding
     assert_distance 1.0, "\xe8".force_encoding('iso8859-1'), 'è'
   end
 
+  def test_raises_type_error
+    assert_raises(TypeError){ JaroWinkler.distance 'MARTHA', nil }
+    assert_raises(TypeError){ JaroWinkler.distance nil, 'MARTHA' }
+    assert_raises(TypeError){ JaroWinkler.distance nil, nil }
+    assert_raises(TypeError){ JaroWinkler.distance 'MARTHA', :non_string }
+    assert_raises(TypeError){ JaroWinkler.distance :non_string, 'MARTHA' }
+    assert_raises(TypeError){ JaroWinkler.distance :non_string, :non_string }
+  end
+
 private
 
   def assert_distance score, str1, str2, options={}