amatch 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb10a4b272e6f2e89cc6f4c977abce874a4a6928
-  data.tar.gz: d930f2f6cab0e80f90713debdf62bbb3c2b09c93
+  metadata.gz: 33e953d1d1503a26b79e67192fd2f1016c8cd7cc
+  data.tar.gz: 81e4d93466bc5c7fbc547734f2019728f89b6ad9
 SHA512:
-  metadata.gz: 340b43efe94c76b98c4b68a5feb182a114c1a93576a5704a2af758f6ba867798d391d34e7ed4f7b0f4b22c931e2f763da124ddc4c75acdb1c13da218d5a1047f
-  data.tar.gz: d48f7d50cd00ab6b81145e7b419580c486ea852072687d10448f117775756993ff7ae62c85209ad616f2141a74006cec3b3737699130e479c05c04dd917c44a2
+  metadata.gz: 725523e6d78bfdcd30b1ab6d3f0670dd4212f02985011e16fbef62bb5c5529d72f184d3187777d34b1c3d0a4bc51c33015c8fad45f972aaa043e1ff552064a0f
+  data.tar.gz: 8bae2f8aaf65b75b113f3cf2e25c6363b5794d63f0b4688dc325939d1684fba99a863ec46d04f1369e2e3d4ae516b91554945cbd904ccc45b568dd966fb0eddf

data/.travis.yml

@@ -1,10 +1,10 @@
 rvm:
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.1
   - ruby-head
-  - rbx-18mode
-  - rbx-19mode
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
+    - rvm: ruby-head

data/CHANGES

@@ -1,3 +1,7 @@
+2017-05-23 (0.3.1)
+   * Include PairDistance fix from dominikgrygiel, Thx.
+2017-03-27 (0.3.0)
+   * Update some dependencies
 2013-10-14 (0.2.12)
    * Include test fix from Juanito Fatas <katehuang0320@gmail.com>. Thx!
 2013-01-16 (0.2.11)

data/Rakefile

@@ -21,9 +21,8 @@ EOT
   readme      'README.rdoc'
   require_paths %w[lib ext]
   dependency             'tins',      '~>1.0'
-  development_dependency 'test-unit', '~>2.3'
-  development_dependency 'utils'
-  development_dependency 'rake',      '~>10', '<11.0'
+  development_dependency 'test-unit', '~>3.0'
+  licenses << 'GPL'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/ext/amatch_ext.c

@@ -470,34 +470,32 @@ static VALUE Sellers_search(Sellers *amatch, VALUE string)
 static VALUE PairDistance_match(PairDistance *amatch, VALUE string, VALUE regexp, int use_regexp)
 {
     double result;
-    VALUE tokens;
-    PairArray *pair_array;
-    
+    VALUE tokens, string_tokens;
+    PairArray *pattern_pair_array, *pair_array;
+
     Check_Type(string, T_STRING);
     if (!NIL_P(regexp) || use_regexp) {
         tokens = rb_funcall(
             rb_str_new(amatch->pattern, amatch->pattern_len),
             id_split, 1, regexp
         );
-        if (!amatch->pattern_pair_array) {
-            amatch->pattern_pair_array = PairArray_new(tokens);
-        } else {
-            pair_array_reactivate(amatch->pattern_pair_array);
-        }
-        tokens = rb_funcall(string, id_split, 1, regexp);
-        pair_array = PairArray_new(tokens);
+        string_tokens = rb_funcall(string, id_split, 1, regexp);
     } else {
         VALUE tmp = rb_str_new(amatch->pattern, amatch->pattern_len);
         tokens = rb_ary_new4(1, &tmp);
-        if (!amatch->pattern_pair_array) {
-            amatch->pattern_pair_array = PairArray_new(tokens);
-        } else {
-            pair_array_reactivate(amatch->pattern_pair_array);
-        }
-        tokens = rb_ary_new4(1, &string);
-        pair_array = PairArray_new(tokens);
+        string_tokens = rb_ary_new4(1, &string);
     }
-    result = pair_array_match(amatch->pattern_pair_array, pair_array);
+
+    if (!amatch->pattern_pair_array) {
+        pattern_pair_array = PairArray_new(tokens);
+        amatch->pattern_pair_array = pattern_pair_array;
+    } else {
+        pattern_pair_array = amatch->pattern_pair_array;
+        pair_array_reactivate(amatch->pattern_pair_array);
+    }
+    pair_array = PairArray_new(string_tokens);
+
+    result = pair_array_match(pattern_pair_array, pair_array);
     pair_array_destroy(pair_array);
     return rb_float_new(result);
 }

data/ext/pair.c

@@ -72,6 +72,8 @@ void pair_print(Pair pair)
 
 void pair_array_destroy(PairArray *pair_array)
 {
-    xfree(pair_array->pairs);
+    if (pair_array->pairs) {
+        xfree(pair_array->pairs);
+    }
     xfree(pair_array);
 }

data/lib/amatch/version.rb

@@ -1,6 +1,6 @@
 module Amatch
   # Amatch version
-  VERSION         = '0.3.0'
+  VERSION         = '0.3.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amatch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,62 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: utils
-  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: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +100,8 @@ files:
 - tests/test_pair_distance.rb
 - tests/test_sellers.rb
 homepage: http://github.com/flori/amatch
-licenses: []
+licenses:
+- GPL
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -157,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Approximate String Matching library