multi_string_replace 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475f85424faff8b9059d92aa706fd613f62947684f583b3ecfe893aeac995c90
-  data.tar.gz: 771f516436986b6a75d94ab7d68037742cabc346c4c9c9673610af80df00971b
+  metadata.gz: b380199fa7395925c1c6e6b2c6db5d67f6f5588d81e1af62ecff883a8866cfcd
+  data.tar.gz: 12f94ee8b8f68535b9eacba3db28bab0a008de85148269cf6cee64a9ab8beabc
 SHA512:
-  metadata.gz: d2e795cc477087170a4f68f0a0d8da58040eee092af9d24b16421580b79e4362f2cf52749dd88cf738bf1f59cee40f733d8413c92b94d6d44f2447633ce1522e
-  data.tar.gz: 231caecb64e33c2e15b9ce48a0557bd2aa261657de9e4b9a34d9a552c66ec779a75bdab62e7b0e541c092be7a1dcf52331df4736fce12d8b85b37940da0830d6
+  metadata.gz: c8248181f107f7bf4d28859374255d4802728795ff7b0e7308f3dcf68a326d133fd45e1041fe01ea043d5934e38e5fca83b67465f2cdae8c7c79b280a8fdffb8
+  data.tar.gz: eedeec0d330d5e82e48205424f09e2b9fe165dcc0791e8715abce83dcd0519bbcc535c72986b6ee989b9878d3809beaaa25ef7560d97f24efcc7d9f89893ed49

data/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+#  schedule:
+#    - cron: '42 5 * * *'
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.0' ]
+
+    runs-on: ubuntu-latest
+    name: Ruby ${{matrix.ruby}}
+    container: ruby:${{matrix.ruby}}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Show ruby Version
+      run: |
+        ruby -v
+
+    - name: Install Modules
+      run: ./bin/setup
+
+    - name: Compile
+      run: rake compile
+
+    - name: Run tests
+      run: rake spec
+

data/Gemfile.lock

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

data/README.md

@@ -40,8 +40,18 @@ You can also pass in a Proc, these will only get evaluated when the token is enc
 
 ```ruby
 MultiStringReplace.replace("The quick brown fox jumps over the lazy dog brown", {'brown' => 'black', 'fox' => ->(s, e) { "cat" }})
+# => "The quick black cat jumps over the lazy dog black"
+
+# returning nil will cause the substitution to be ignored.
+MultiStringReplace.replace("The quick brown fox jumps over the lazy dog brown", {'brown' => 'black', 'fox' => ->(s, e) { nil }})
+# => "The quick black fox jumps over the lazy dog black"
+
+MultiStringReplace.replace("The quick brown fox jumps over the lazy dog brown", {'brown' => 'black', 'fox' => ->(s, e) { "" }})
+# => "The quick black  jumps over the lazy dog black"
 ```
 
+This should allow for very fast and simple templating systems.
+
 Also adds a mreplace method to String which does the same thing:
 
 ```ruby
@@ -63,13 +73,13 @@ Benchmark sources can be found here: <https://github.com/jedld/multi_word_replac
 
 ## 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.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake compile` followed by run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/multi_string_replace. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jedld/multi_string_replace. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -77,4 +87,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the MultiStringReplace project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/multi_string_replace/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the MultiStringReplace project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/jedld/multi_string_replace/blob/master/CODE_OF_CONDUCT.md).

data/ext/multi_string_replace/aho_trie.c

@@ -29,7 +29,7 @@ bool aho_add_trie_node(struct aho_trie * restrict t, struct aho_text_t * restric
 
     for (int text_idx = 0; text_idx < text->len; text_idx++)
     {
-        unsigned int node_text = text->text[text_idx];
+        unsigned char node_text = text->text[text_idx];
         bool find_node = false;
         int child_idx = 0;
 

data/ext/multi_string_replace/ahocorasick.c

@@ -218,13 +218,21 @@ VALUE aho_replace_text(struct ahocorasick * restrict aho, const char* data,
             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"), 2, LONG2NUM(pos), LONG2NUM(pos + result->len));
-            value_sizes[result->id] = RSTRING_LEN(proc_result);
-            values[result->id] = StringValuePtr(proc_result);
+            if (RB_TYPE_P(proc_result, T_NIL)) {
+                rb_str_cat(main_result, &data[pos], result->len);
+                last_concat_pos = i + 1;
+                continue;
+            } else if (RB_TYPE_P(proc_result, T_STRING)) {
+                value_sizes[result->id] = RSTRING_LEN(proc_result);
+                values[result->id] = StringValuePtr(proc_result);
+            } else {
+                VALUE string_result = rb_funcall(proc_result, rb_intern("to_s"), 0);
+                value_sizes[result->id] = RSTRING_LEN(string_result);
+                values[result->id] = StringValuePtr(string_result);
+            }
         }
 
         rb_str_cat(main_result, values[result->id], value_sizes[result->id]); 

data/ext/multi_string_replace/multi_string_replace.c

@@ -93,10 +93,18 @@ VALUE multi_string_replace(VALUE self, VALUE body, VALUE replace)
       values[idx] = StringValuePtr(value);
       value_sizes[idx] = RSTRING_LEN(value);
     } else {
-      values[idx] = NULL;
-      ruby_val[idx] = value;
+     
+      VALUE responds_value = rb_funcall(value, rb_intern("respond_to?"), 1, rb_str_new_cstr("call"));
+      if (RB_TYPE_P(responds_value, T_TRUE)) {
+        values[idx] = NULL;
+        ruby_val[idx] = value;
+      } else {
+        VALUE value_as_string = rb_funcall(value, rb_intern("to_s"), 0);
+        values[idx] = StringValuePtr(value_as_string);
+        value_sizes[idx] = RSTRING_LEN(value_as_string);
+      }
     }
-    
+
    aho_add_match_text(&aho, StringValuePtr(entry), RSTRING_LEN(entry));
   }
   aho_create_trie(&aho);

data/lib/multi_string_replace/version.rb

@@ -1,3 +1,3 @@
 module MultiStringReplace
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_string_replace
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Joseph Dayo
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ extensions:
 - ext/multi_string_replace/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -107,7 +108,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: A fast multiple string replace library for ruby. Uses a C implementation
   of the Aho–Corasick Algorithm