multi_string_replace 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475f85424faff8b9059d92aa706fd613f62947684f583b3ecfe893aeac995c90
-  data.tar.gz: 771f516436986b6a75d94ab7d68037742cabc346c4c9c9673610af80df00971b
+  metadata.gz: 1485ddac5f7139a2f9f5161625aa14a2c375f08f995c9d996022a1c7b2c57384
+  data.tar.gz: 94943343da93436f1be137e7ceb38f68a53ff81bacc8b5954997ad0c4d25b777
 SHA512:
-  metadata.gz: d2e795cc477087170a4f68f0a0d8da58040eee092af9d24b16421580b79e4362f2cf52749dd88cf738bf1f59cee40f733d8413c92b94d6d44f2447633ce1522e
-  data.tar.gz: 231caecb64e33c2e15b9ce48a0557bd2aa261657de9e4b9a34d9a552c66ec779a75bdab62e7b0e541c092be7a1dcf52331df4736fce12d8b85b37940da0830d6
+  metadata.gz: 522e1a14c9430326bfa7aeffab8a484f334eed80123361cd039152ba47ada0bc362a10b42953b25abab4987ebdc73f4ae7c9964972390d5c2b01c601bb935239
+  data.tar.gz: dd9d77326cc78330a021294a1364d270f22f4aee96d5621ca09df2476e06feca3c9207a6965a9b775db117585b4f53d6a8d4bda6052c3f9d1f7b2549fdc8d0e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    multi_string_replace (2.0.0)
+    multi_string_replace (2.0.1)
 
 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

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.1"
 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.1
 platform: ruby
 authors:
 - Joseph Dayo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler