fuzzy-string-match 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b354a1f27f7029336168498837d8437b0affd8bc
-  data.tar.gz: b925921e5ef9e99fc21e72d256411769406de2ec
+  metadata.gz: e6c482cde7e2c3ed8adf5e868574d23505f6c11b
+  data.tar.gz: dba293a5c00ba813c05c41e3029b00de4213b917
 SHA512:
-  metadata.gz: 4d926213cf459a40ce0f0c2eeaab879f6f962816486719e1a29f6b06ef03c32a5f47e788a4fc0f1f0e2ff6a13e45b090ed1ddface8aa988d04dce7e1a92380cb
-  data.tar.gz: 593964ef2f4c325214ebc49c1f3db29667dbce5ec50d05dad2071f24e45f65a83cc753720372f3c0c495839bd7c90816daec803cdd2ace062866154f514b8d62
+  metadata.gz: 078f094e32f22a4a832cf424d93538613c570bb5bc7151f3689edebc0b7c8c8f4051c2897e2f244d7a0b0e5dbcf018c062dcd65f476d9e231a2311499ed77392
+  data.tar.gz: c27ff9107753139c648832c5ec4f06d701d128b7117b0ea1da42e770021a2946d1245e65f96a79ab2e9b7cf672c20a66113e57012a2b80e68e45388402ec70c4

data/README.md

@@ -96,6 +96,12 @@
 
 ## ChangeLog
 
+### 0.9.7 / Oct  15, 2014
+
+* Use rspec 3.1 syntax.
+* Fixed: issue #12 `Using stack allocated memory`.
+* Fixed: remove duplicated dependency of gem package.
+
 ### 0.9.6 / Dec  21, 2013
 
 * New feature: fuzzy-string-match falls back into pure ruby mode when c-compile fails.

data/Rakefile

@@ -1,51 +1,19 @@
 #-*- mode: ruby; -*-
 #
 # Release Engineering
-#   1. edit the VERSION.yml file
-#   2. rake test
-#   3. rake gemspec  &&   gem build fuzzy-string-match.gemspec
-#      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 )
+#   1. edit the "s.version = " line of fuzzy-string-match.gemspec
+#   2. rake  &&  rake build
+#      to generate pkg/fuzzy-string-match-x.x.x.gem
+#   3. install fuzzy-string-match-x.x.x.gem to clean environment and test
+#   4. rake release
+#   5. 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 'jeweler2'
-
-  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.license = 'Apache-2.0'
-    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_development_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
+require 'bundler/gem_tasks'
 
 task :default => [:test] do
 end

data/lib/fuzzystringmatch/inline/jarowinkler.rb

@@ -22,8 +22,17 @@ module FuzzyStringMatch
       false
     end
 
+    def getDistance(s1,s2)
+      result = getDistanceInternal(s1,s2)
+      if result.nan?
+        raise NoMemoryError.new( "failed to allocate memory. string argument s1 or s2 is too large." )
+      end
+      return result
+    end
+
     inline do |builder|
       builder.include '<iostream>'
+      builder.include '<math.h>'
       builder.add_compile_flags %q(-x c++)
       builder.add_link_flags %q(-lstdc++)
       builder.c_raw 'int max( int a, int b ) { return ((a)>(b)?(a):(b)); }'
@@ -32,7 +41,7 @@ module FuzzyStringMatch
       builder.c '
 
 
-double getDistance( char *s1, char *s2 )
+double getDistanceInternal( char *s1, char *s2 )
 {
   char *_max;
   char *_min;
@@ -48,12 +57,22 @@ double getDistance( char *s1, char *s2 )
   }
   int range = max( _max_length / 2 - 1, 0 );
 
-  int indexes[_min_length];
+  int *indexes = NULL;
+  indexes = (int *)malloc(_min_length * sizeof(int));
+  if( NULL == indexes ) {
+    return nanl("");
+  }
+
+  int *flags = NULL;
+  flags = (int *)malloc(_max_length * sizeof(int));
+  if( NULL == flags ) {
+    free(indexes);
+    return nanl("");
+  }
+
   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;
   }
@@ -70,8 +89,22 @@ double getDistance( char *s1, char *s2 )
     }
   }
 
-  char ms1[matches];
-  char ms2[matches];
+  char *ms1 = NULL;
+  ms1 = (char *)malloc(matches * sizeof(char));
+  if( NULL == ms1 ) {
+    free(indexes);
+    free(flags);
+    return nanl("");
+  }
+  char *ms2 = NULL;
+  ms2 = (char *)malloc(matches * sizeof(char));
+  if( NULL == ms2 ) {
+    free(indexes);
+    free(flags);
+    free(ms1);
+    return nanl("");
+  } 
+
   int ms1_length = matches;
 
   for (int i = 0, si = 0; i < _min_length; i++) {
@@ -103,12 +136,21 @@ double getDistance( char *s1, char *s2 )
 
   double m = (double) matches;
   if (matches == 0) {
+    free(indexes);
+    free(flags);
+    free(ms1);
+    free(ms2);
     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);
+
+  free(indexes);
+  free(flags);
+  free(ms1);
+  free(ms2);
   return jw;
 }'
     end

data/test/basic_native_spec.rb

@@ -28,31 +28,22 @@ describe FuzzyStringMatch, "when some string distances (Native) are" 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")
+    expect( @jarow.getDistance( "henka",     "henkan"    )).to be_within(0.0001).of(0.9722)
+    expect( @jarow.getDistance( "al",        "al"        )).to be_within(0.0001).of(1.0)
+    expect( @jarow.getDistance( "martha",    "marhta"    )).to be_within(0.0001).of(0.9611)
+    expect( @jarow.getDistance( "jones",     "johnson"   )).to be_within(0.0001).of(0.8323)
+    expect( @jarow.getDistance( "abcvwxyz",  "cabvwxyz"  )).to be_within(0.0001).of(0.9583)
+    expect( @jarow.getDistance( "dwayne",    "duane"     )).to be_within(0.0001).of(0.8400)
+    expect( @jarow.getDistance( "dixon",     "dicksonx"  )).to be_within(0.0001).of(0.8133)
+    expect( @jarow.getDistance( "fvie",      "ten"       )).to be_within(0.0001).of(0.0)
+    expect( @jarow.getDistance("zac ephron", "zac efron" )).to be > ( @jarow.getDistance("zac ephron", "kai ephron" ))
+    expect( @jarow.getDistance("brittney spears", "britney spears" )).to be > ( @jarow.getDistance("brittney spears", "brittney startzman" ))
+    expect( @jarow.pure?( )).to be == (RUBY_PLATFORM == "java")
   end
 end
 
 describe FuzzyStringMatch, "when older factory method was called, (Native) are" do
   it "should" do
-    lambda { FuzzyStringMatch::JaroWinkler.new.create( :native ) }.should    raise_error(NoMethodError)
+    expect { FuzzyStringMatch::JaroWinkler.new.create( :native ) }.to   raise_error(NoMethodError)
   end
 end

data/test/basic_pure_spec.rb

@@ -28,32 +28,23 @@ describe FuzzyStringMatch, "when some string distances (Pure) are" 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
+    expect( @jarow.getDistance( "henka",     "henkan"    )).to be_within(0.0001).of(0.9722)
+    expect( @jarow.getDistance( "al",        "al"        )).to be_within(0.0001).of(1.0)
+    expect( @jarow.getDistance( "martha",    "marhta"    )).to be_within(0.0001).of(0.9611)
+    expect( @jarow.getDistance( "jones",     "johnson"   )).to be_within(0.0001).of(0.8323)
+    expect( @jarow.getDistance( "abcvwxyz",  "cabvwxyz"  )).to be_within(0.0001).of(0.9583)
+    expect( @jarow.getDistance( "dwayne",    "duane"     )).to be_within(0.0001).of(0.8400)
+    expect( @jarow.getDistance( "dixon",     "dicksonx"  )).to be_within(0.0001).of(0.8133)
+    expect( @jarow.getDistance( "fvie",      "ten"       )).to be_within(0.0001).of(0.0)
+    expect( @jarow.getDistance("zac ephron", "zac efron" )).to be > ( @jarow.getDistance("zac ephron", "kai ephron" ))
+    expect( @jarow.getDistance("brittney spears", "britney spears" )).to be > ( @jarow.getDistance("brittney spears", "brittney startzman" ))
+    expect( @jarow.pure?( )).to be true
   end
 end
 
 describe FuzzyStringMatch, "when older factory method was called, (Native) are" do
   it "should" do
-    lambda { FuzzyStringMatch::JaroWinkler.new.create( :pure ) }.should    raise_error(NoMethodError)
+    expect { FuzzyStringMatch::JaroWinkler.new.create( :pure ) }.to    raise_error(NoMethodError)
   end
 end
 

data/test/mutibyte_spec.rb

@@ -28,31 +28,22 @@ describe FuzzyStringMatch, "when some UTF8 string distances (Pure) are" 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
+    expect( @jarow.getDistance( "ａｌ",              "ａｌ"             )).to be_within(0.0001).of(1.0)
+    expect( @jarow.getDistance( "ｍａｒｔｈａ",      "ｍａｒｈｔａ"     )).to be_within(0.0001).of(0.9611)
+    expect( @jarow.getDistance( "ｊｏｎｅｓ",        "ｊｏｈｎｓｏｎ"   )).to be_within(0.0001).of(0.8323)
+    expect( @jarow.getDistance( "ａｂｃｖｗｘｙｚ",  "ｃａｂｖｗｘｙｚ" )).to be_within(0.0001).of(0.9583)
+    expect( @jarow.getDistance( "ｄｗａｙｎｅ",      "ｄｕａｎｅ"       )).to be_within(0.0001).of(0.8400)
+    expect( @jarow.getDistance( "ｄｉｘｏｎ",        "ｄｉｃｋｓｏｎｘ" )).to be_within(0.0001).of(0.8133)
+    expect( @jarow.getDistance( "ｆｖｉｅ",          "ｔｅｎ"           )).to be_within(0.0001).of(0.0)
+    expect( @jarow.getDistance("ｚａｃ　ｅｐｈｒｏｎ", "ｚａｃ　ｅｆｒｏｎ")).to be > ( @jarow.getDistance("ｚａｃ　ｅｐｈｒｏｎ", "ｋａｉ　ｅｐｈｒｏｎ" ))
+    expect( @jarow.getDistance("ｂｒｉｔｔｎｅｙ　ｓｐｅａｒｓ", "ｂｒｉｔｎｅｙ　ｓｐｅａｒｓ")).to be > ( @jarow.getDistance("ｂｒｉｔｔｎｅｙ　ｓｐｅａｒｓ", "ｂｒｉｔｔｎｅｙ　ｓｔａｒｔｚｍａｎ" ))
+    expect( @jarow.getDistance( "スパゲティー",              "スパゲッティー"             )).to be_within(0.0001).of(0.9666)
+    expect( @jarow.getDistance( "スパゲティー",              "スパゲティ"                 )).to be_within(0.0001).of(0.9722)
+    expect( @jarow.getDistance( "スティービー・ワンダー",    "スピーディー・ワンダー"     )).to be_within(0.0001).of(0.8561)
+    expect( @jarow.getDistance( "マイケル・ジャクソン",      "ジャイケル・マクソン"       )).to be_within(0.0001).of(0.8000)
+    expect( @jarow.getDistance( "まつもとゆきひろ",          "まつもとひろゆき"           )).to be_within(0.0001).of(0.9500)
+    expect( @jarow.getDistance( "クライエント",              "クライアント"               )).to be_within(0.0001).of(0.9222)
+    expect( @jarow.getDistance( "サーバー",                  "サーバ"                     )).to be_within(0.0001).of(0.9416)
+    expect( @jarow.pure?( )).to be true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-string-match
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Kiyoka Nishiyama
@@ -14,56 +14,28 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: RubyInline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: RubyInline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.8.6
 description: calculate Jaro Winkler distance.
@@ -74,11 +46,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".gemtest"
+- .gemtest
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION.yml
 - lib/fuzzystringmatch.rb
 - lib/fuzzystringmatch/inline.rb
 - lib/fuzzystringmatch/inline/jarowinkler.rb
@@ -97,12 +68,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/VERSION.yml

@@ -1,5 +0,0 @@
----
-:major: 0
-:minor: 9
-:patch: 6
-