amatch 0.2.10 → 0.2.11

data/.gitignore

@@ -1,3 +1,4 @@
 .*.sw[pon]
+.AppleDouble
 Gemfile.lock
 pkg

data/CHANGES

@@ -1,3 +1,6 @@
+2013-01-16 (0.2.11)
+   * Include some fixes from Jason Colburne <jason@redbeardenterprises.com>.
+     Thx!
 2012-02-06 (0.2.10)
    * Use xfree instead of free to avoid (possible) problems.
 2011-11-14 (0.2.9)

data/Rakefile

@@ -16,12 +16,13 @@ EOT
   executables << 'agrep.rb'
   bindir      'bin'
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.AppleDouble'
   title       "#{name.camelize} - Approximate Matching"
   readme      'README.rdoc'
   require_paths %w[lib ext]
   dependency             'tins',      '~>0.3'
   development_dependency 'test-unit', '~>2.3'
+  development_dependency 'utils'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/amatch.gemspec

@@ -2,39 +2,42 @@
 
 Gem::Specification.new do |s|
   s.name = "amatch"
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-02-06"
+  s.date = "2013-01-16"
   s.description = "Amatch is a library for approximate string matching and searching in strings.\nSeveral algorithms can be used to do this, and it's also possible to compute a\nsimilarity metric number between 0.0 and 1.0 for two given strings.\n"
   s.email = "flori@ping.de"
   s.executables = ["agrep.rb"]
   s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["README.rdoc", "lib/amatch.rb", "lib/amatch/version.rb", "lib/amatch/rude.rb", "lib/amatch/polite.rb", "ext/amatch_ext.c", "ext/pair.c"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/amatch.rb", "lib/amatch/polite.rb", "lib/amatch/rude.rb", "lib/amatch/version.rb", "ext/amatch_ext.c", "ext/pair.c"]
   s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "amatch.gemspec", "bin/agrep.rb", "ext/amatch_ext.c", "ext/common.h", "ext/extconf.rb", "ext/pair.c", "ext/pair.h", "install.rb", "lib/amatch.rb", "lib/amatch/.keep", "lib/amatch/polite.rb", "lib/amatch/rude.rb", "lib/amatch/version.rb", "tests/test_hamming.rb", "tests/test_jaro.rb", "tests/test_jaro_winkler.rb", "tests/test_levenshtein.rb", "tests/test_longest_subsequence.rb", "tests/test_longest_substring.rb", "tests/test_pair_distance.rb", "tests/test_sellers.rb"]
   s.homepage = "http://github.com/flori/amatch"
   s.rdoc_options = ["--title", "Amatch - Approximate Matching", "--main", "README.rdoc"]
   s.require_paths = ["lib", "ext"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Approximate String Matching library"
-  s.test_files = ["tests/test_sellers.rb", "tests/test_jaro.rb", "tests/test_longest_subsequence.rb", "tests/test_longest_substring.rb", "tests/test_hamming.rb", "tests/test_pair_distance.rb", "tests/test_levenshtein.rb", "tests/test_jaro_winkler.rb"]
+  s.test_files = ["tests/test_hamming.rb", "tests/test_jaro.rb", "tests/test_jaro_winkler.rb", "tests/test_levenshtein.rb", "tests/test_longest_subsequence.rb", "tests/test_longest_substring.rb", "tests/test_pair_distance.rb", "tests/test_sellers.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
       s.add_development_dependency(%q<test-unit>, ["~> 2.3"])
+      s.add_development_dependency(%q<utils>, [">= 0"])
       s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
       s.add_dependency(%q<test-unit>, ["~> 2.3"])
+      s.add_dependency(%q<utils>, [">= 0"])
       s.add_dependency(%q<tins>, ["~> 0.3"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
     s.add_dependency(%q<test-unit>, ["~> 2.3"])
+    s.add_dependency(%q<utils>, [">= 0"])
     s.add_dependency(%q<tins>, ["~> 0.3"])
   end
 end

data/ext/amatch_ext.c

@@ -661,8 +661,8 @@ static VALUE LongestSubstring_similar(General *amatch, VALUE string)
     m = 0;                                                                          \
     for (i = 0; i < a_len; i++) {                                                   \
         low = (i > max_dist ? i - max_dist : 0);                                     \
-        high = (i + max_dist < b_len ? i + max_dist : b_len);                       \
-        for (j = low; j <= high; j++) {                                              \
+        high = (i + max_dist < b_len ? i + max_dist : b_len - 1);                   \
+        for (j = low; j <= high; j++) {                                             \
             if (!l[1][j] && a_ptr[i] == b_ptr[j]) {                                 \
                 l[0][i] = 1;                                                        \
                 l[1][j] = 1;                                                        \
@@ -710,10 +710,6 @@ static VALUE LongestSubstring_similar(General *amatch, VALUE string)
          if (islower(b_ptr[i])) b_ptr[i] = toupper(b_ptr[i]);   \
      }
 
-#define FREE_STRINGS \
-     xfree(a_ptr);   \
-     xfree(b_ptr);
-
 static VALUE Jaro_match(Jaro *amatch, VALUE string)
 {
     char *a_ptr, *b_ptr;
@@ -730,7 +726,8 @@ static VALUE Jaro_match(Jaro *amatch, VALUE string)
     }
     COMPUTE_JARO
     if (amatch->ignore_case) {
-        FREE_STRINGS
+        xfree(a_ptr);
+        xfree(b_ptr);
     }
     return rb_float_new(result);
 }
@@ -764,7 +761,8 @@ static VALUE JaroWinkler_match(JaroWinkler *amatch, VALUE string)
     }
     result = result + n*amatch->scaling_factor*(1-result);
     if (amatch->ignore_case) {
-        FREE_STRINGS
+        xfree(a_ptr);
+        xfree(b_ptr);
     }
     return rb_float_new(result);
 }

data/ext/extconf.rb

@@ -1,6 +1,21 @@
 require 'mkmf'
 require 'rbconfig'
-if CONFIG['CC'] == 'gcc'
-  CONFIG['CC'] = 'gcc -Wall '
+
+if CONFIG['CC'] =~ /gcc/
+  $CFLAGS << ' -Wall'
+  if ENV['DEBUG']
+    $CFLAGS << ' -O0 -ggdb'
+  else
+    $CFLAGS << ' -O3'
+  end
+else
+  $CFLAGS << ' -O3'
+end
+create_makefile 'amatch_ext'
+
+# WTF, is this really the only way to get a decent output out of mkmf?
+mf = File.read 'Makefile'
+if mf.sub!(/V = 0/, 'V = 1')
+  warn "Rewriting the generated Makefile to get my compiler output displayed..."
+  File.open('Makefile', 'w') { |f| f.write mf }
 end
-create_makefile 'amatch_ext' 

data/lib/amatch/version.rb

@@ -1,6 +1,6 @@
 module Amatch
   # Amatch version
-  VERSION         = '0.2.10'
+  VERSION         = '0.2.11'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_sellers.rb

@@ -1,10 +1,9 @@
 require 'test/unit'
 require 'amatch'
-require 'test_levenshtein'
 
-class TestSellers < TestLevenshtein
+class TestSellers < Test::Unit::TestCase
   include Amatch
-  
+
   def setup
     @d        = 0.000001
     @empty    = Sellers.new('')
@@ -69,7 +68,7 @@ class TestSellers < TestLevenshtein
     assert_in_delta 0.75, @simple.pattern.levenshtein_similar('est'), @d
   end
 
-  def test_similar
+  def test_similar2
     assert_in_delta 1, @empty.similar(''), @d
     assert_in_delta 0, @empty.similar('not empty'), @d
     assert_in_delta 0.0, @simple.similar(''), @d

metadata

@@ -1,71 +1,101 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: amatch
-version: !ruby/object:Gem::Version
-  version: 0.2.10
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 11
+  version: 0.2.11
 platform: ruby
-authors:
+authors: 
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: gem_hadar
-  requirement: &70350437582780 !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 1
+        - 8
+        version: 0.1.8
   prerelease: false
-  version_requirements: *70350437582780
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: test-unit
-  requirement: &70350437581920 !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  prerelease: false
   type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: utils
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70350437581920
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: tins
-  requirement: &70350437581240 !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
   prerelease: false
-  version_requirements: *70350437581240
-description: ! 'Amatch is a library for approximate string matching and searching
-  in strings.
-
-  Several algorithms can be used to do this, and it''s also possible to compute a
-
+  type: :runtime
+  requirement: *id004
+description: |
+  Amatch is a library for approximate string matching and searching in strings.
+  Several algorithms can be used to do this, and it's also possible to compute a
   similarity metric number between 0.0 and 1.0 for two given strings.
 
-'
 email: flori@ping.de
-executables:
+executables: 
 - agrep.rb
-extensions:
+extensions: 
 - ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - README.rdoc
 - lib/amatch.rb
-- lib/amatch/version.rb
-- lib/amatch/rude.rb
 - lib/amatch/polite.rb
+- lib/amatch/rude.rb
+- lib/amatch/version.rb
 - ext/amatch_ext.c
 - ext/pair.c
-files:
+files: 
 - .gitignore
 - .travis.yml
 - CHANGES
@@ -97,42 +127,47 @@ files:
 - tests/test_sellers.rb
 homepage: http://github.com/flori/amatch
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - Amatch - Approximate Matching
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -987218193532166989
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Approximate String Matching library
-test_files:
-- tests/test_sellers.rb
+test_files: 
+- tests/test_hamming.rb
 - tests/test_jaro.rb
+- tests/test_jaro_winkler.rb
+- tests/test_levenshtein.rb
 - tests/test_longest_subsequence.rb
 - tests/test_longest_substring.rb
-- tests/test_hamming.rb
 - tests/test_pair_distance.rb
-- tests/test_levenshtein.rb
-- tests/test_jaro_winkler.rb
+- tests/test_sellers.rb