fuzzy-string-match 0.9.1 → 0.9.2

data/.gemtest

@@ -0,0 +1 @@
+

data/README.md

@@ -1,51 +1,54 @@
 # What is fuzzy-string-match
+  [![Build Status](https://secure.travis-ci.org/kiyoka/fuzzy-string-match.png)](http://travis-ci.org/kiyoka/fuzzy-string-match)
 
 * fuzzy-string-match is a fuzzy string matching library for ruby.
 * It is fast. ( written in C with RubyInline )
 * It supports only Jaro-Winkler distance algorithm.
 * This program was ported by hand from lucene-3.0.2. (lucene is Java product)
-* If you want to add another string distance algorithm, please port by yourself and contact me <kiyoka@sumibi.org>.
+* If you want to add another string distance algorithm, please fork it on github and port by yourself.
 
 ## The reason why i developed fuzzy-string-match
 * I tried amatch-0.2.5, but it contains some issues.
-  1. Some memory leaks.
+  1. memory leaks.
   2. I felt difficult to maintain it.
 * So, I decide to create another gem by porting lucene-3.0.x.
 
-## Installing 
-  1. gem install fuzzy-string-match
+## Installing
+
+    gem install fuzzy-string-match
+
+## Installing (pure ruby version)
+
+    gem install fuzzy-string-match_pure
 
 ## Features
 * Calculate Jaro-Winkler distance of two strings.
   * Pure ruby version can handle both ASCII and UTF8 strings. (and slow)
-  * Native version can only ASCII strings. (and fast)
+  * Native version can only ASCII strings. (but it is fast)
 
 ## Sample code 
-  * Native version
 
-<code>
+### Native version
+
     require 'fuzzystringmatch'
-    jarow = FuzzyStringMatch::JaroWinkler.new.create( :native )
+    jarow = FuzzyStringMatch::JaroWinkler.create( :native )
     p jarow.getDistance(  "jones",      "johnson" )
-</code>
 
-  * Pure ruby version
+### Pure ruby version
 
-<code>
     require 'fuzzystringmatch'
-    jarow = FuzzyStringMatch::JaroWinkler.new.create( :pure )
-    p jarow.getDistance( "ああ",        "あい"        )
-</code>
+    jarow = FuzzyStringMatch::JaroWinkler.create( :pure )
+    p jarow.getDistance(  "jones",      "johnson" )
+    p jarow.getDistance(  "ああ",        "あい"        )
 
 ## Sample on irb
 
-<code>
     irb(main):001:0> require 'fuzzystringmatch'
     require 'fuzzystringmatch'
     => true
 
-    irb(main):002:0> jarow = FuzzyStringMatch::JaroWinkler.new.create( :native )
-    jarow = FuzzyStringMatch::JaroWinkler.new.create( :native )
+    irb(main):002:0> jarow = FuzzyStringMatch::JaroWinkler.create( :native )
+    jarow = FuzzyStringMatch::JaroWinkler.create( :native )
     => #<FuzzyStringMatch::JaroWinklerNative:0x000001011b0010>
 
     irb(main):003:0> jarow.getDistance( "al",        "al"        )
@@ -55,11 +58,9 @@
     irb(main):004:0> jarow.getDistance( "dixon",     "dicksonx"  )
     jarow.getDistance( "dixon",     "dicksonx"  )
     => 0.8133333333333332
-</code>
 
 ## Benchmarks
 
-<console>
     $ rake bench
     ruby ./benchmark/vs_amatch.rb
      --- 
@@ -74,12 +75,16 @@
     [this Module (native)]
           user     system      total        real
       0.480000   0.000000   0.480000 (  0.484187)
-</console>
 
 ## Requires
+
+### for CRuby
  - RubyInline
  - Ruby 1.9.1 or higher
 
+### for JRuby
+ - JRuby 1.6.6 or higher
+
 ## Author
  - Copyright (C) Kiyoka Nishiyama <kiyoka@sumibi.org>
  - I ported from java source code of lucene-3.0.2.

data/Rakefile

@@ -0,0 +1,87 @@
+#-*- mode: ruby; -*-
+#
+# Release Engineering
+#   1. edit the VERSION.yml file
+#   2. rake test
+#   3. rake gemspec  &&   rake build
+#      to generate fuzzy-string-match-x.x.x.gem
+#   4. install fuzzy-string-match-x.x.x.gem to clean environment and test
+#   5. rake release
+#   6. gem push pkg/fuzzy-string-match-x.x.x.gem   ( need gem version 1.3.6 or higer. Please "gem update --system" to update )
+#
+# for Development
+#   rake test_dev
+#   rake benchmark
+
+require 'rake'
+begin
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "fuzzy-string-match_pure"
+    gemspec.summary = "fuzzy string matching library (Pure ruby version)"
+    gemspec.description = "calculate Jaro Winkler distance."
+    gemspec.email = "kiyoka@sumibi.org"
+    gemspec.homepage = "http://github.com/kiyoka/fuzzy-string-match"
+    gemspec.authors = ["Kiyoka Nishiyama"]
+    gemspec.files = FileList['.gemtest',
+                             'Rakefile',
+                             'VERSION.yml',
+                             'lib/fuzzystringmatch/pure/jarowinkler.rb',
+                             'lib/fuzzystringmatch/pure.rb',
+                             'lib/fuzzystringmatch.rb',
+                             'lib/*.rb',
+                             'test/basic_pure_spec.rb',
+                             'test/mutibyte_spec.rb',
+                             'LICENSE.txt',
+                             'README.md'].to_a
+    gemspec.add_dependency( "rspec" )
+    gemspec.required_ruby_version = '>= 1.9.1'
+  end
+
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "fuzzy-string-match"
+    gemspec.summary = "fuzzy string matching library"
+    gemspec.description = "calculate Jaro Winkler distance."
+    gemspec.email = "kiyoka@sumibi.org"
+    gemspec.homepage = "http://github.com/kiyoka/fuzzy-string-match"
+    gemspec.authors = ["Kiyoka Nishiyama"]
+    gemspec.files = FileList['.gemtest',
+                             'Rakefile',
+                             'VERSION.yml',
+                             'lib/fuzzystringmatch/inline/jarowinkler.rb',
+                             'lib/fuzzystringmatch/inline.rb',
+                             'lib/fuzzystringmatch/pure/jarowinkler.rb',
+                             'lib/fuzzystringmatch/pure.rb',
+                             'lib/fuzzystringmatch.rb',
+                             'test/basic_native_spec.rb',
+                             'test/basic_pure_spec.rb',
+                             'test/mutibyte_spec.rb',
+                             'LICENSE.txt',
+                             'README.md'].to_a
+    gemspec.add_dependency( "rspec" )
+    gemspec.add_dependency( 'RubyInline', '>= 3.8.6')
+    gemspec.required_ruby_version = '>= 1.9.1'
+  end
+
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end
+
+task :default => [:test] do
+end
+
+task :test do
+  sh "ruby -I ./lib `which rspec` -b ./test/basic_native_spec.rb"   if File.exist?( "./test/basic_native_spec.rb" )
+  sh "ruby -I ./lib `which rspec` -b ./test/basic_pure_spec.rb"
+  sh "ruby -I ./lib `which rspec` -b ./test/mutibyte_spec.rb"
+end
+
+task :test_dev do
+  sh "ruby -I ./lib `which rspec` -b ./test/verify_with_amatch_spec.rb"
+end
+
+task :bench do
+  sh "ruby ./benchmark/vs_amatch.rb"
+end
+

data/VERSION.yml

@@ -0,0 +1,4 @@
+---
+:major: 0
+:minor: 9
+:patch: 2

data/lib/fuzzystringmatch.rb

@@ -1,7 +1,7 @@
 #
 #                            Fuzzy String Match
 #
-#   Copyright 2010 Kiyoka Nishiyama
+#   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.
@@ -15,187 +15,34 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-module FuzzyStringMatch
+require 'fuzzystringmatch/pure'
+begin
+  if RUBY_PLATFORM == "java"
+    STDERR.puts "fuzzy-string-match Warning: native version is disabled on java platform. falled back to pure ruby version..."
+  else
+    require 'fuzzystringmatch/inline'
+  end
+rescue LoadError
+end
 
+module FuzzyStringMatch
   class JaroWinkler
-    def create( type = :pure )     # factory method
+    def self.create( type = :pure )     # factory method
       case type
       when :pure
-        JaroWinklerPure.new
+        FuzzyStringMatch::JaroWinklerPure.new
       when :native
-        JaroWinklerNative.new
-      end
-    end
-  end
-
-  class JaroWinklerPure
-    THRESHOLD = 0.7
-
-    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
+        begin
+          FuzzyStringMatch::JaroWinklerInline.new
+        rescue NameError
+          STDERR.puts "fuzzy-string-match Warning: native version is disabled. falled back to pure ruby version..."
+          FuzzyStringMatch::JaroWinklerPure.new
         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
-
-  require 'inline'
-  class JaroWinklerNative
-    inline do |builder|
-      builder.include '<iostream>'
-      builder.add_compile_flags '-x c++', '-lstdc++'
-      builder.c_raw 'int max( int a, int b ) { return ((a)>(b)?(a):(b)); }'
-      builder.c_raw 'int min( int a, int b ) { return ((a)<(b)?(a):(b)); }'
-      builder.c_raw 'double double_min( double a, double b ) { return ((a)<(b)?(a):(b)); }'
-      builder.c '
-double getDistance( char *s1, char *s2 )
-{
-  char *_max;
-  char *_min;
-  int _max_length = 0;
-  int _min_length = 0;
-  if ( strlen(s1) > strlen(s2) ) {
-    _max = s1; _max_length = strlen(s1);
-    _min = s2; _min_length = strlen(s2);
-  }
-  else {
-    _max = s2; _max_length = strlen(s2);
-    _min = s1; _min_length = strlen(s1);
-  }
-  int range = max( _max_length / 2 - 1, 0 );
-
-  int indexes[_min_length];
-  for( int i = 0 ; i < _min_length ; i++ ) {
-    indexes[i] = -1;
-  }
-
-  int flags[_max_length];
-  for( int i = 0 ; i < _max_length ; i++ ) {
-    flags[i] = 0;
-  }
-  int matches = 0;
-  for (int mi = 0; mi < _min_length; mi++) {
-    char c1 = _min[mi];
-    for (int xi = max(mi - range, 0), xn = min(mi + range + 1, _max_length); xi < xn; xi++ ) {
-      if (!flags[xi] && (c1 == _max[xi])) {
-	indexes[mi] = xi;
-	flags[xi] = 1;
-	matches++;
-	break;
-      }
-    }
-  }
-
-  char ms1[matches];
-  char ms2[matches];
-  int ms1_length = matches;
-
-  for (int i = 0, si = 0; i < _min_length; i++) {
-    if (indexes[i] != -1) {
-      ms1[si] = _min[i];
-      si++;
-    }
-  }
-  for (int i = 0, si = 0; i < _max_length; i++) {
-    if (flags[i]) {
-      ms2[si] = _max[i];
-      si++;
-    }
-  }
-  int transpositions = 0;
-  for (int mi = 0; mi < ms1_length; mi++) {
-    if (ms1[mi] != ms2[mi]) {
-      transpositions++;
-    }
-  }
-  int prefix = 0;
-  for (int mi = 0; mi < _min_length; mi++) {
-    if (s1[mi] == s2[mi]) {
-      prefix++;
-    } else {
-      break;
-    }
-  }
-
-  double m = (double) matches;
-  if (matches == 0) {
-    return 0.0;
-  }
-  int t = transpositions / 2;
-  double j = ((m / strlen(s1) + m / strlen(s2) + (m - t) / m)) / 3;
-  double jw = j < 0.7 ? j : j + double_min(0.1, 1.0 / _max_length) * prefix
-    * (1 - j);
-  return jw;
-}'
+    def create( type = :pure )         # this is obsolute
+      STDERR.puts "fuzzy-string-match Warning: FuzzyStringMatch.new.create() is obsolute, please use FuzzyStringMatch.create() ..."
+      FuzzyStringMatch::JaroWinkler.create( type )
     end
   end
-
 end

data/lib/fuzzystringmatch/inline.rb

@@ -0,0 +1,18 @@
+#
+#                            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.
+#
+require 'fuzzystringmatch/inline/jarowinkler'

data/lib/fuzzystringmatch/inline/jarowinkler.rb

@@ -0,0 +1,113 @@
+#
+#                            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
+  require 'inline'
+  class JaroWinklerInline
+    def pure?
+      false
+    end
+
+    inline do |builder|
+      builder.include '<iostream>'
+      builder.add_compile_flags '-x c++', '-lstdc++'
+      builder.c_raw 'int max( int a, int b ) { return ((a)>(b)?(a):(b)); }'
+      builder.c_raw 'int min( int a, int b ) { return ((a)<(b)?(a):(b)); }'
+      builder.c_raw 'double double_min( double a, double b ) { return ((a)<(b)?(a):(b)); }'
+      builder.c '
+double getDistance( char *s1, char *s2 )
+{
+  char *_max;
+  char *_min;
+  int _max_length = 0;
+  int _min_length = 0;
+  if ( strlen(s1) > strlen(s2) ) {
+    _max = s1; _max_length = strlen(s1);
+    _min = s2; _min_length = strlen(s2);
+  }
+  else {
+    _max = s2; _max_length = strlen(s2);
+    _min = s1; _min_length = strlen(s1);
+  }
+  int range = max( _max_length / 2 - 1, 0 );
+
+  int indexes[_min_length];
+  for( int i = 0 ; i < _min_length ; i++ ) {
+    indexes[i] = -1;
+  }
+
+  int flags[_max_length];
+  for( int i = 0 ; i < _max_length ; i++ ) {
+    flags[i] = 0;
+  }
+  int matches = 0;
+  for (int mi = 0; mi < _min_length; mi++) {
+    char c1 = _min[mi];
+    for (int xi = max(mi - range, 0), xn = min(mi + range + 1, _max_length); xi < xn; xi++ ) {
+      if (!flags[xi] && (c1 == _max[xi])) {
+	indexes[mi] = xi;
+	flags[xi] = 1;
+	matches++;
+	break;
+      }
+    }
+  }
+
+  char ms1[matches];
+  char ms2[matches];
+  int ms1_length = matches;
+
+  for (int i = 0, si = 0; i < _min_length; i++) {
+    if (indexes[i] != -1) {
+      ms1[si] = _min[i];
+      si++;
+    }
+  }
+  for (int i = 0, si = 0; i < _max_length; i++) {
+    if (flags[i]) {
+      ms2[si] = _max[i];
+      si++;
+    }
+  }
+  int transpositions = 0;
+  for (int mi = 0; mi < ms1_length; mi++) {
+    if (ms1[mi] != ms2[mi]) {
+      transpositions++;
+    }
+  }
+  int prefix = 0;
+  for (int mi = 0; mi < _min_length; mi++) {
+    if (s1[mi] == s2[mi]) {
+      prefix++;
+    } else {
+      break;
+    }
+  }
+
+  double m = (double) matches;
+  if (matches == 0) {
+    return 0.0;
+  }
+  int t = transpositions / 2;
+  double j = ((m / strlen(s1) + m / strlen(s2) + (m - t) / m)) / 3;
+  double jw = j < 0.7 ? j : j + double_min(0.1, 1.0 / _max_length) * prefix
+    * (1 - j);
+  return jw;
+}'
+    end
+  end
+end

data/lib/fuzzystringmatch/pure.rb

@@ -0,0 +1,18 @@
+#
+#                            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.
+#
+require 'fuzzystringmatch/pure/jarowinkler'

data/lib/fuzzystringmatch/pure/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/test/basic_native_spec.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+#
+# basic_spec.rb -  "Basic test-cases for FuzzyStringMatch module "
+#  
+#   Copyright (c) 2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+#
+#  
+require 'fuzzystringmatch'
+
+describe FuzzyStringMatch, "when some string distances (Native) are" do
+  before do
+    @jarow = FuzzyStringMatch::JaroWinkler.create( :native )
+  end
+  it "should" do
+    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
+    @jarow.getDistance( "al",        "al"        ).should == 1.0
+    @jarow.getDistance( "martha",    "marhta"    ).should be_within(0.0001).of(0.9611)
+    @jarow.getDistance( "jones",     "johnson"   ).should be_within(0.0001).of(0.8323)
+    @jarow.getDistance( "abcvwxyz",  "cabvwxyz"  ).should be_within(0.0001).of(0.9583)
+    @jarow.getDistance( "dwayne",    "duane"     ).should be_within(0.0001).of(0.8400)
+    @jarow.getDistance( "dixon",     "dicksonx"  ).should be_within(0.0001).of(0.8133)
+    @jarow.getDistance( "fvie",      "ten"       ).should == 0.0
+    lambda {
+      d1 = @jarow.getDistance("zac ephron", "zac efron")
+      d2 = @jarow.getDistance("zac ephron", "kai ephron")
+      d1 > d2
+    }.should be_true
+    lambda {
+      d1 = @jarow.getDistance("brittney spears", "britney spears")
+      d2 = @jarow.getDistance("brittney spears", "brittney startzman")
+      d1 > d2
+    }.should be_true
+
+    @jarow.pure?( ).should == (RUBY_PLATFORM == "java")
+  end
+end
+
+describe FuzzyStringMatch, "when older factory method was called, (Pure) are" do
+  before do
+    @jarow = FuzzyStringMatch::JaroWinkler.new.create
+  end
+  it "should" do
+    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
+    @jarow.pure?( ).should be_true
+  end
+end

data/test/basic_pure_spec.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+#
+# basic_pure_spec.rb -  "Basic test-cases for FuzzyStringMatch module "
+#  
+#   Copyright (c) 2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+#
+#  
+require 'fuzzystringmatch'
+
+describe FuzzyStringMatch, "when some string distances (Pure) are" do
+  before do
+    @jarow = FuzzyStringMatch::JaroWinkler.create
+  end
+  it "should" do
+    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
+    @jarow.getDistance( "al",        "al"        ).should == 1.0
+    @jarow.getDistance( "martha",    "marhta"    ).should be_within(0.0001).of(0.9611)
+    @jarow.getDistance( "jones",     "johnson"   ).should be_within(0.0001).of(0.8323)
+    @jarow.getDistance( "abcvwxyz",  "cabvwxyz"  ).should be_within(0.0001).of(0.9583)
+    @jarow.getDistance( "dwayne",    "duane"     ).should be_within(0.0001).of(0.8400)
+    @jarow.getDistance( "dixon",     "dicksonx"  ).should be_within(0.0001).of(0.8133)
+    @jarow.getDistance( "fvie",      "ten"       ).should == 0.0
+    lambda {
+      d1 = @jarow.getDistance("zac ephron", "zac efron")
+      d2 = @jarow.getDistance("zac ephron", "kai ephron")
+      d1 > d2
+    }.should be_true
+    lambda {
+      d1 = @jarow.getDistance("brittney spears", "britney spears")
+      d2 = @jarow.getDistance("brittney spears", "brittney startzman")
+      d1 > d2
+    }.should be_true
+
+    @jarow.pure?( ).should be_true
+  end
+end
+
+describe FuzzyStringMatch, "when older factory method was called, (Pure) are" do
+  before do
+    @jarow = FuzzyStringMatch::JaroWinkler.new.create
+  end
+  it "should" do
+    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
+    @jarow.pure?( ).should be_true
+  end
+end

data/test/mutibyte_spec.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+#
+# mutibyte_spec.rb -  "Multibyte test-cases for FuzzyStringMatch module "
+#  
+#   Copyright (c) 2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+#
+#  
+require 'fuzzystringmatch'
+
+describe FuzzyStringMatch, "when some UTF8 string distances (Pure) are" do
+  before do
+    @jarow = FuzzyStringMatch::JaroWinkler.create
+  end
+  it "should" do
+    @jarow.getDistance( "ａｌ",              "ａｌ"             ).should == 1.0
+    @jarow.getDistance( "ｍａｒｔｈａ",      "ｍａｒｈｔａ"     ).should be_within(0.0001).of(0.9611)
+    @jarow.getDistance( "ｊｏｎｅｓ",        "ｊｏｈｎｓｏｎ"   ).should be_within(0.0001).of(0.8323)
+    @jarow.getDistance( "ａｂｃｖｗｘｙｚ",  "ｃａｂｖｗｘｙｚ" ).should be_within(0.0001).of(0.9583)
+    @jarow.getDistance( "ｄｗａｙｎｅ",      "ｄｕａｎｅ"       ).should be_within(0.0001).of(0.8400)
+    @jarow.getDistance( "ｄｉｘｏｎ",        "ｄｉｃｋｓｏｎｘ" ).should be_within(0.0001).of(0.8133)
+    @jarow.getDistance( "ｆｖｉｅ",          "ｔｅｎ"           ).should == 0.0
+    lambda {
+      d1 = @jarow.getDistance("ｚａｃ　ｅｐｈｒｏｎ", "ｚａｃ　ｅｆｒｏｎ")
+      d2 = @jarow.getDistance("ｚａｃ　ｅｐｈｒｏｎ", "ｋａｉ　ｅｐｈｒｏｎ")
+      d1 > d2
+    }.should be_true
+    lambda {
+      d1 = @jarow.getDistance("ｂｒｉｔｔｎｅｙ　ｓｐｅａｒｓ", "ｂｒｉｔｎｅｙ　ｓｐｅａｒｓ")
+      d2 = @jarow.getDistance("ｂｒｉｔｔｎｅｙ　ｓｐｅａｒｓ", "ｂｒｉｔｔｎｅｙ　ｓｔａｒｔｚｍａｎ")
+      d1 > d2
+    }.should be_true
+    @jarow.getDistance( "スパゲティー",              "スパゲッティー"             ).should be_within(0.0001).of(0.9666)
+    @jarow.getDistance( "スパゲティー",              "スパゲティ"                 ).should be_within(0.0001).of(0.9722)
+    @jarow.getDistance( "スティービー・ワンダー",    "スピーディー・ワンダー"     ).should be_within(0.0001).of(0.8561)
+    @jarow.getDistance( "マイケル・ジャクソン",      "ジャイケル・マクソン"       ).should be_within(0.0001).of(0.8000)
+    @jarow.getDistance( "まつもとゆきひろ",          "まつもとひろゆき"           ).should be_within(0.0001).of(0.9500)
+    @jarow.getDistance( "クライエント",              "クライアント"               ).should be_within(0.0001).of(0.9222)
+    @jarow.getDistance( "サーバー",                  "サーバ"                     ).should be_within(0.0001).of(0.9416)
+
+    @jarow.pure?( ).should be_true
+  end
+end

metadata

@@ -1,115 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fuzzy-string-match
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 0.9.2
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
 platform: ruby
-authors: 
+authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2156958320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2156958320
+- !ruby/object:Gem::Dependency
+  name: RubyInline
+  requirement: &2156957800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: amatch
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.8.6
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156957800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156957320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: RubyInline
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156957320
+- !ruby/object:Gem::Dependency
+  name: RubyInline
+  requirement: &2156956840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 3
-        - 8
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.8.6
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2156956840
 description: calculate Jaro Winkler distance.
 email: kiyoka@sumibi.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
+- .gemtest
 - LICENSE.txt
 - README.md
-- benchmark/vs_amatch.rb
+- Rakefile
+- VERSION.yml
 - lib/fuzzystringmatch.rb
-- test/fuzzystringmatch_spec.rb
+- lib/fuzzystringmatch/inline.rb
+- lib/fuzzystringmatch/inline/jarowinkler.rb
+- lib/fuzzystringmatch/pure.rb
+- lib/fuzzystringmatch/pure/jarowinkler.rb
+- test/basic_native_spec.rb
+- test/basic_pure_spec.rb
+- test/mutibyte_spec.rb
 homepage: http://github.com/kiyoka/fuzzy-string-match
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 49
-      segments: 
-      - 1
-      - 9
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: fuzzy string matching library
 test_files: []
-

data/benchmark/vs_amatch.rb

@@ -1,54 +0,0 @@
-#!/usr/local/bin/ruby
-#
-# http://www.ruby-lang.org/ja/man/html/benchmark.html
-#
-require 'benchmark'
-require 'amatch'
-require './lib/fuzzystringmatch'
-
-looptimes = 10000
-
-names50 = [ "Aichi",     "Akita",    "Aomori", "Chiba",    "Ehime",    "Fukui",     "Fukuoka",   "Fukushima", "Gifu",      "Gunma",
-            "Hiroshima", "Hokkaido", "Hyogo",  "Ibaraki",  "Ishikawa", "Iwate",     "Kagawa",    "Kagoshima", "Kanagawa",  "Kochi",
-            "Kumamoto",  "Kyoto",    "Mie",    "Miyagi",   "Miyazaki", "Nagano",    "Nagasaki",  "Nara",      "Niigata",   "Oita",
-            "Okayama",   "Okinawa",  "Osaka",  "Saga",     "Saitama",  "Shiga",     "Shimane",   "Shizuoka",  "Tochigi",   "Tokushima",
-            "Tokyo",     "Tottori",  "Toyama", "Wakayama", "Yamagata", "Yamaguchi", "Yamanashi", "Dummy1",    "Dummy2",    "Dummy3" ]
-names = names50 + names50
-
-keyword = "Tokyo"
-
-printf( " --- \n" )
-printf( " --- Each match functions will be called %dMega times. --- \n", (names.size * looptimes) / (1000.0 * 1000.0) )
-printf( " --- \n" )
-
-puts "[Amatch]"
-puts Benchmark::CAPTION
-puts Benchmark.measure {
-  jarow = Amatch::JaroWinkler.new keyword
-  looptimes.times { |n|
-    names.map { |x|
-      jarow.match( x )
-    }
-  }
-}
-
-puts "[this Module (pure)]"
-puts Benchmark::CAPTION
-puts Benchmark.measure {
-  jarow = FuzzyStringMatch::JaroWinkler.new.create
-  looptimes.times { |n|
-    names.map { |x|
-      jarow.getDistance( keyword, x )
-    }
-  }
-}
-puts "[this Module (native)]"
-puts Benchmark::CAPTION
-puts Benchmark.measure {
-  jarow = FuzzyStringMatch::JaroWinkler.new.create( :native )
-  looptimes.times { |n|
-    names.map { |x|
-      jarow.getDistance( keyword, x )
-    }
-  }
-}

data/test/fuzzystringmatch_spec.rb

@@ -1,139 +0,0 @@
-#!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
-#
-# fuzzystringmatch_spec.rb -  "RSpec file for FuzzyStringMatch module "
-#  
-#   Copyright (c) 2010  Kiyoka Nishiyama  <kiyoka@sumibi.org>
-#
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You 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.
-#
-#  
-require 'fuzzystringmatch'
-require 'amatch'
-
-describe FuzzyStringMatch, "when some string distances (Pure) are" do
-  before do
-    @jarow = FuzzyStringMatch::JaroWinkler.new.create
-  end
-  it "should" do
-    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
-    @jarow.getDistance( "al",        "al"        ).should == 1.0
-    @jarow.getDistance( "martha",    "marhta"    ).should be_within(0.0001).of(0.9611)
-    @jarow.getDistance( "jones",     "johnson"   ).should be_within(0.0001).of(0.8323)
-    @jarow.getDistance( "abcvwxyz",  "cabvwxyz"  ).should be_within(0.0001).of(0.9583)
-    @jarow.getDistance( "dwayne",    "duane"     ).should be_within(0.0001).of(0.8400)
-    @jarow.getDistance( "dixon",     "dicksonx"  ).should be_within(0.0001).of(0.8133)
-    @jarow.getDistance( "fvie",      "ten"       ).should == 0.0
-    lambda {
-      d1 = @jarow.getDistance("zac ephron", "zac efron")
-      d2 = @jarow.getDistance("zac ephron", "kai ephron")
-      d1 > d2
-    }.should be_true
-    lambda {
-      d1 = @jarow.getDistance("brittney spears", "britney spears")
-      d2 = @jarow.getDistance("brittney spears", "brittney startzman")
-      d1 > d2
-    }.should be_true
-  end
-end
-
-describe FuzzyStringMatch, "when some string distances (Native) are" do
-  before do
-    @jarow = FuzzyStringMatch::JaroWinkler.new.create( :native )
-  end
-  it "should" do
-    @jarow.getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9722)
-    @jarow.getDistance( "al",        "al"        ).should == 1.0
-    @jarow.getDistance( "martha",    "marhta"    ).should be_within(0.0001).of(0.9611)
-    @jarow.getDistance( "jones",     "johnson"   ).should be_within(0.0001).of(0.8323)
-    @jarow.getDistance( "abcvwxyz",  "cabvwxyz"  ).should be_within(0.0001).of(0.9583)
-    @jarow.getDistance( "dwayne",    "duane"     ).should be_within(0.0001).of(0.8400)
-    @jarow.getDistance( "dixon",     "dicksonx"  ).should be_within(0.0001).of(0.8133)
-    @jarow.getDistance( "fvie",      "ten"       ).should == 0.0
-    lambda {
-      d1 = @jarow.getDistance("zac ephron", "zac efron")
-      d2 = @jarow.getDistance("zac ephron", "kai ephron")
-      d1 > d2
-    }.should be_true
-    lambda {
-      d1 = @jarow.getDistance("brittney spears", "britney spears")
-      d2 = @jarow.getDistance("brittney spears", "brittney startzman")
-      d1 > d2
-    }.should be_true
-  end
-end
-
-def amatch_getDistance( s1, s2 )
-  @jarow = Amatch::JaroWinkler.new( s1 )
-  @jarow.match( s2 )
-end
-
-
-describe FuzzyStringMatch, "when some UTF8 string distances (Pure) are" do
-  before do
-    @jarow = FuzzyStringMatch::JaroWinkler.new.create
-  end
-  it "should" do
-    @jarow.getDistance( "ａｌ",              "ａｌ"             ).should == 1.0
-    @jarow.getDistance( "ｍａｒｔｈａ",      "ｍａｒｈｔａ"     ).should be_within(0.0001).of(0.9611)
-    @jarow.getDistance( "ｊｏｎｅｓ",        "ｊｏｈｎｓｏｎ"   ).should be_within(0.0001).of(0.8323)
-    @jarow.getDistance( "ａｂｃｖｗｘｙｚ",  "ｃａｂｖｗｘｙｚ" ).should be_within(0.0001).of(0.9583)
-    @jarow.getDistance( "ｄｗａｙｎｅ",      "ｄｕａｎｅ"       ).should be_within(0.0001).of(0.8400)
-    @jarow.getDistance( "ｄｉｘｏｎ",        "ｄｉｃｋｓｏｎｘ" ).should be_within(0.0001).of(0.8133)
-    @jarow.getDistance( "ｆｖｉｅ",          "ｔｅｎ"           ).should == 0.0
-    lambda {
-      d1 = @jarow.getDistance("ｚａｃ　ｅｐｈｒｏｎ", "ｚａｃ　ｅｆｒｏｎ")
-      d2 = @jarow.getDistance("ｚａｃ　ｅｐｈｒｏｎ", "ｋａｉ　ｅｐｈｒｏｎ")
-      d1 > d2
-    }.should be_true
-    lambda {
-      d1 = @jarow.getDistance("ｂｒｉｔｔｎｅｙ　ｓｐｅａｒｓ", "ｂｒｉｔｎｅｙ　ｓｐｅａｒｓ")
-      d2 = @jarow.getDistance("ｂｒｉｔｔｎｅｙ　ｓｐｅａｒｓ", "ｂｒｉｔｔｎｅｙ　ｓｔａｒｔｚｍａｎ")
-      d1 > d2
-    }.should be_true
-    @jarow.getDistance( "スパゲティー",              "スパゲッティー"             ).should be_within(0.0001).of(0.9666)
-    @jarow.getDistance( "スパゲティー",              "スパゲティ"                 ).should be_within(0.0001).of(0.9722)
-    @jarow.getDistance( "スティービー・ワンダー",    "スピーディー・ワンダー"     ).should be_within(0.0001).of(0.8561)
-    @jarow.getDistance( "マイケル・ジャクソン",      "ジャイケル・マクソン"       ).should be_within(0.0001).of(0.8000)
-    @jarow.getDistance( "まつもとゆきひろ",          "まつもとひろゆき"           ).should be_within(0.0001).of(0.9500)
-    @jarow.getDistance( "クライエント",              "クライアント"               ).should be_within(0.0001).of(0.9222)
-    @jarow.getDistance( "サーバー",                  "サーバ"                     ).should be_within(0.0001).of(0.9416)
-  end
-end
-
-
-describe Amatch, "when use Amatch gem, results are" do
-  it "should" do
-    amatch_getDistance( "henka",     "henkan"    ).should be_within(0.0001).of(0.9666)  ## amatch's result value is different from lucene version.
-    amatch_getDistance( "al",        "al"        ).should == 1.0
-    amatch_getDistance( "martha",    "marhta"    ).should be_within(0.0001).of(0.9611)
-    amatch_getDistance( "jones",     "johnson"   ).should be_within(0.0001).of(0.8323)
-    amatch_getDistance( "abcvwxyz",  "cabvwxyz"  ).should be_within(0.0001).of(0.9583)
-    amatch_getDistance( "dwayne",    "duane"     ).should be_within(0.0001).of(0.8400)
-    amatch_getDistance( "dixon",     "dicksonx"  ).should be_within(0.0001).of(0.8133)
-    amatch_getDistance( "fvie",      "ten"       ).should == 0.0
-    lambda {
-      d1 = amatch_getDistance("zac ephron", "zac efron")
-      d2 = amatch_getDistance("zac ephron", "kai ephron")
-      d1 > d2
-    }.should be_true
-    lambda {
-      d1 = amatch_getDistance("brittney spears", "britney spears")
-      d2 = amatch_getDistance("brittney spears", "brittney startzman")
-      d1 > d2
-    }.should be_true
-  end
-end