amatch 0.2.6 → 0.2.7

data/.gitignore

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

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ruby-head
+  - ree
+  - rbx

data/CHANGES

@@ -1,3 +1,5 @@
+2011-08-06 (0.2.7)
+    * Fix some violations of ISO C90 standard.
 2011-07-16 (0.2.6)
     * Applied patch by Kevin J. Lynagh <kevin@keminglabs.com> fixing memory
       leak in Jaro match.

data/Rakefile

@@ -13,7 +13,6 @@ 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.
 EOT
-  description 'Library to tail files in Ruby'
   executables << 'agrep.rb'
   bindir      'bin'
   test_dir    'tests'

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/amatch.gemspec

@@ -2,37 +2,39 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amatch}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Florian Frank"]
-  s.date = %q{2011-07-16}
-  s.default_executable = %q{agrep.rb}
-  s.description = %q{Library to tail files in Ruby}
+  s.authors = [%q{Florian Frank}]
+  s.date = %q{2011-08-05}
+  s.description = %q{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.
+}
   s.email = %q{flori@ping.de}
-  s.executables = ["agrep.rb"]
-  s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["README.rdoc", "lib/amatch/version.rb", "ext/amatch.c", "ext/pair.c"]
-  s.files = [".gitignore", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "amatch.gemspec", "bin/agrep.rb", "ext/amatch.c", "ext/common.h", "ext/extconf.rb", "ext/pair.c", "ext/pair.h", "install.rb", "lib/amatch/.keep", "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.executables = [%q{agrep.rb}]
+  s.extensions = [%q{ext/extconf.rb}]
+  s.extra_rdoc_files = [%q{README.rdoc}, %q{lib/amatch/version.rb}, %q{ext/amatch.c}, %q{ext/pair.c}]
+  s.files = [%q{.gitignore}, %q{.travis.yml}, %q{CHANGES}, %q{COPYING}, %q{Gemfile}, %q{README.rdoc}, %q{Rakefile}, %q{VERSION}, %q{amatch.gemspec}, %q{bin/agrep.rb}, %q{ext/amatch.c}, %q{ext/common.h}, %q{ext/extconf.rb}, %q{ext/pair.c}, %q{ext/pair.h}, %q{install.rb}, %q{lib/amatch/.keep}, %q{lib/amatch/version.rb}, %q{tests/test_hamming.rb}, %q{tests/test_jaro.rb}, %q{tests/test_jaro_winkler.rb}, %q{tests/test_levenshtein.rb}, %q{tests/test_longest_subsequence.rb}, %q{tests/test_longest_substring.rb}, %q{tests/test_pair_distance.rb}, %q{tests/test_sellers.rb}]
   s.homepage = %q{http://github.com/flori/amatch}
-  s.rdoc_options = ["--title", "Amatch - Approximate Matching", "--main", "README.rdoc"]
-  s.require_paths = ["lib", "ext"]
-  s.rubygems_version = %q{1.6.2}
+  s.rdoc_options = [%q{--title}, %q{Amatch - Approximate Matching}, %q{--main}, %q{README.rdoc}]
+  s.require_paths = [%q{lib}, %q{ext}]
+  s.rubygems_version = %q{1.8.7}
   s.summary = %q{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 = [%q{tests/test_sellers.rb}, %q{tests/test_jaro.rb}, %q{tests/test_longest_subsequence.rb}, %q{tests/test_longest_substring.rb}, %q{tests/test_hamming.rb}, %q{tests/test_pair_distance.rb}, %q{tests/test_levenshtein.rb}, %q{tests/test_jaro_winkler.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.0.3"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.0.11"])
       s.add_runtime_dependency(%q<spruz>, ["~> 0.2"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.0.3"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.0.11"])
       s.add_dependency(%q<spruz>, ["~> 0.2"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.0.3"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.0.11"])
     s.add_dependency(%q<spruz>, ["~> 0.2"])
   end
 end

data/ext/amatch.c

@@ -89,9 +89,10 @@ static VALUE type##_iterate_strings(type *amatch, VALUE strings,    \
     if (TYPE(strings) == T_STRING) {                                \
         return match_function(amatch, strings);                     \
     } else {                                                        \
-        Check_Type(strings, T_ARRAY);                               \
         int i;                                                      \
-        VALUE result = rb_ary_new2(RARRAY_LEN(strings));            \
+        VALUE result;                                               \
+        Check_Type(strings, T_ARRAY);                               \
+        result = rb_ary_new2(RARRAY_LEN(strings));                  \
         for (i = 0; i < RARRAY_LEN(strings); i++) {                 \
             VALUE string = rb_ary_entry(strings, i);                \
             if (TYPE(string) != T_STRING) {                         \
@@ -696,10 +697,11 @@ static VALUE LongestSubstring_similar(General *amatch, VALUE string)
 
 
 #define LOWERCASE_STRINGS                                       \
-     char *ying = ALLOC_N(char, a_len);                         \
+     char *ying, *yang;                                         \
+     ying = ALLOC_N(char, a_len);                               \
      MEMCPY(ying, a_ptr, char, a_len);                          \
      a_ptr = ying;                                              \
-     char *yang = ALLOC_N(char, b_len);                         \
+     yang = ALLOC_N(char, b_len);                               \
      MEMCPY(yang, b_ptr, char, b_len);                          \
      b_ptr = yang;                                              \
      for (i = 0; i < a_len; i++) {                              \
@@ -1101,8 +1103,8 @@ static VALUE rb_PairDistance_match(int argc, VALUE *argv, VALUE self)
     if (TYPE(strings) == T_STRING) {
         result = PairDistance_match(amatch, strings, regexp, use_regexp);
     } else {
-        Check_Type(strings, T_ARRAY);
         int i;
+        Check_Type(strings, T_ARRAY);
         result = rb_ary_new2(RARRAY_LEN(strings));
         for (i = 0; i < RARRAY_LEN(strings); i++) {
             VALUE string = rb_ary_entry(strings, i);

data/lib/amatch/version.rb

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

metadata

@@ -1,67 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amatch
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.7
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
 platform: ruby
-authors: 
+authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-16 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gem_hadar
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153302580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
+      - !ruby/object:Gem::Version
+        version: 0.0.11
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: spruz
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153302580
+- !ruby/object:Gem::Dependency
+  name: spruz
+  requirement: &2153302020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id002
-description: Library to tail files in Ruby
+  prerelease: false
+  version_requirements: *2153302020
+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/version.rb
 - ext/amatch.c
 - ext/pair.c
-files: 
+files:
 - .gitignore
+- .travis.yml
 - CHANGES
 - COPYING
 - Gemfile
@@ -86,45 +78,36 @@ files:
 - tests/test_longest_substring.rb
 - tests/test_pair_distance.rb
 - tests/test_sellers.rb
-has_rdoc: true
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+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.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Approximate String Matching library
-test_files: 
+test_files:
 - tests/test_sellers.rb
 - tests/test_jaro.rb
 - tests/test_longest_subsequence.rb