multi_string_replace 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7df96929960d7cc7880414e1f4e42f288e905878
-  data.tar.gz: 6c5668af300849f038a8d26af55d1da7062e73aa
+SHA256:
+  metadata.gz: 3c5074c0fbcc2384a188df631c14c47759bda65a435c3414095068fa77681952
+  data.tar.gz: 8c93d10f3b3e4f04a5316cc39a784933d307e7ebec29f624efc19c0d06a59db6
 SHA512:
-  metadata.gz: b7a4437b7b187c37f10cca9f11c6a872d019a146c7438336432de35d8adffc5da03fcb0e4569b3c84b959029365e0c96997171d3b77a024b429e99bbe400131f
-  data.tar.gz: 9615bd748ec7f2d76f3f55ad9b41069931136e5c9ffdabd2dfead2855bc1752df994d2d0085f842090a1d1935eba9112973dce4a6fe7188e082c66c41f5c7b72
+  metadata.gz: 2e94c9f113f6bbdaac2b1e0d4e94d7a21cd0cfe95ec88e26c0bad4aa277560c0df3ec109e5426316d7dff46e651ac652fa69f87c09a1a6a46c257d8c4654e948
+  data.tar.gz: 47f44d101bc6885d24ef617b073d85204540c8c3e2edbdf0e08d1e041bf32fc435f051d6e12b154565422f2f32575c91692b93a073899180d727a52d2cefacfc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    multi_string_replace (1.0.0)
+    multi_string_replace (1.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,3 +1,7 @@
+
+[![Gem](https://img.shields.io/gem/v/multi_string_replace.svg)](https://rubygems.org/gems/multi_string_replace)
+
+
 # MultiStringReplace
 
 A fast multiple string replace library for ruby. Uses a C implementation of the Aho–Corasick Algorithm based
@@ -53,6 +57,8 @@ MultiStringReplace   0.260000   0.010000   0.270000 (  0.277135)
 mreplace             0.260000   0.020000   0.280000 (  0.281935)
 ```
 
+Benchmark sources can be found here: <https://github.com/jedld/multi_word_replace/blob/master/bin/benchmark.rb>
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/ext/multi_string_replace/aho_trie.c

@@ -43,7 +43,7 @@ bool aho_add_trie_node(struct aho_trie * restrict t, struct aho_text_t * restric
             __aho_trie_node_init(travasal_node->child_list[0]);
             travasal_node->child_list[0]->text = node_text;
             travasal_node->child_list[0]->parent = travasal_node;
-
+            travasal_node->child_list[0]->failure_link = &(t->root);
             travasal_node = travasal_node->child_list[0];
             continue;
         }
@@ -81,7 +81,7 @@ bool aho_add_trie_node(struct aho_trie * restrict t, struct aho_text_t * restric
             __aho_trie_node_init(child_node);
             child_node->text = node_text;
             child_node->parent = travasal_node;
-
+            child_node->failure_link = &(t->root);
             travasal_node = child_node;
         }
     }
@@ -99,7 +99,6 @@ bool __aho_connect_link(struct aho_trie_node* p, struct aho_trie_node* q)
 {
     struct aho_trie_node *pf = NULL;
     int i = 0;
-
     /* is root node */
     if (p->parent == NULL)
     {
@@ -108,6 +107,7 @@ bool __aho_connect_link(struct aho_trie_node* p, struct aho_trie_node* q)
     }
 
     pf = p->failure_link;
+
     for (i=0; i < pf->child_count; i++)
     {
         /* check child node of failure link(p) */
@@ -161,7 +161,6 @@ void aho_connect_link(struct aho_trie * restrict t)
         for (i=0; i < p->child_count; i++)
         {
             struct aho_trie_node *pf = p;
-
             aho_queue_enqueue(&queue, p->child_list[i]);
             q = p->child_list[i];
 
@@ -169,9 +168,9 @@ void aho_connect_link(struct aho_trie * restrict t)
             {
                 pf = pf->failure_link;
             }
+
         }
     }
-
     aho_queue_destroy(&queue);
 }
 

data/ext/multi_string_replace/ahocorasick.c

@@ -32,6 +32,7 @@ void aho_destroy(struct ahocorasick * restrict aho)
 int aho_add_match_text(struct ahocorasick * restrict aho, const char* text, unsigned int len)
 {
     struct aho_text_t* a_text = NULL;
+
     if (aho->accumulate_text_id == AHO_MAX_TEXT_ID)
     {
         return -1;
@@ -42,11 +43,14 @@ int aho_add_match_text(struct ahocorasick * restrict aho, const char* text, unsi
         goto lack_free_mem;
 
     a_text->text = (char*) malloc(sizeof(char)*len);
+
     if (!a_text->text)
         goto lack_free_mem;
 
     a_text->id = aho->accumulate_text_id++;
+
     memcpy(a_text->text, text, len);
+
     a_text->len = len;
     a_text->prev = NULL;
     a_text->next = NULL;
@@ -66,6 +70,7 @@ int aho_add_match_text(struct ahocorasick * restrict aho, const char* text, unsi
     return a_text->id;
 
 lack_free_mem:
+    
     return -1;
 }
 
@@ -122,7 +127,9 @@ void aho_create_trie(struct ahocorasick * restrict aho)
 
     for (iter = aho->text_list_head; iter != NULL; iter = iter->next)
     {
+
         aho_add_trie_node(&(aho->trie), iter);
+
     }
 
     aho_connect_link(&(aho->trie));
@@ -204,7 +211,10 @@ VALUE aho_replace_text(struct ahocorasick * restrict aho, const char* data,
         }
 
         // concatenate from last_concat_pos
-        rb_str_cat(main_result, &data[last_concat_pos], pos - last_concat_pos);
+        if (pos > last_concat_pos) {
+            rb_str_cat(main_result, &data[last_concat_pos], pos - last_concat_pos);
+        }
+
         // concatenate replace
         if (values[result->id] == NULL) {
             VALUE proc_result = rb_funcall(ruby_values[result->id], rb_intern("call"), 0);

data/ext/multi_string_replace/multi_string_replace.c

@@ -65,7 +65,6 @@ VALUE multi_string_replace(VALUE self, VALUE body, VALUE replace)
   int state;
 
   struct ahocorasick aho;
-  aho_init(&aho);
 
   char *target = StringValuePtr(body);
   VALUE keys = rb_funcall(replace, rb_intern("keys"), 0);
@@ -75,6 +74,8 @@ VALUE multi_string_replace(VALUE self, VALUE body, VALUE replace)
   long value_sizes[size];
   char *values[size];
   VALUE ruby_val[size];
+  
+  aho_init(&aho);
 
   for(long idx = 0; idx < size; idx++) {
     VALUE entry = rb_ary_entry(keys, idx);
@@ -94,9 +95,8 @@ VALUE multi_string_replace(VALUE self, VALUE body, VALUE replace)
       ruby_val[idx] = value;
     }
     
-    aho_add_match_text(&aho, StringValuePtr(entry), RSTRING_LEN(entry));
+   aho_add_match_text(&aho, StringValuePtr(entry), RSTRING_LEN(entry));
   }
-
   aho_create_trie(&aho);
 
   VALUE result = aho_replace_text(&aho, target, RSTRING_LEN(body), values, value_sizes, ruby_val);

data/lib/multi_string_replace/version.rb

@@ -1,3 +1,3 @@
 module MultiStringReplace
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/multi_string_replace.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A fast multiple string replace library for ruby. Uses a C implementation of the Aho–Corasick Algorithm}
   spec.description   = %q{A fast multiple string replace library for ruby. Uses a C implementation of the Aho–Corasick Algorithm}
-  spec.homepage      = "https://github.com/jedld/mutli_word_replace"
+  spec.homepage      = "https://github.com/jedld/multi_string_replace"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_string_replace
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Joseph Dayo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ files:
 - multi_string_replace.gemspec
 - replaced.txt
 - replaced2.txt
-homepage: https://github.com/jedld/mutli_word_replace
+homepage: https://github.com/jedld/multi_string_replace
 licenses:
 - MIT
 metadata:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A fast multiple string replace library for ruby. Uses a C implementation