efficient_join 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38066756028c4a6647c608fbf307c70a3ea725cc608cfd6286f030da352a9288
-  data.tar.gz: d75193ef5828362ec8251cbb1be0d1475caa33415f8b50ce844bdbc45be2c9b4
+  metadata.gz: 5901b92dc6e259cbf76193da6107a3c3dde02c6dddcf66812e9d449322eae6fc
+  data.tar.gz: d9f11fbf636346979abc3654cdfb1e7518b9891532732905404ab2ca08e4617c
 SHA512:
-  metadata.gz: a494b8dab0c78407baa0318cd7d7b3ce8da4c4b4d1a25d74c2776f78d0af3ba47a001a7d527aba5850e6c8570e073b622ddb8b4e1df4e7ced07de09e35ab51b8
-  data.tar.gz: 8ef13b2edcf66858d6815e9a46911caf79f2a16aa7f169677e70567aa1ec49ad959347f4ecd513eb505efb783c1ab356c8f0f82ffe3cedf52e2cc80e73e30ded
+  metadata.gz: f7d39e4ad25fb936ab6213e8d582f2bd9fd3e2a53bf7f24c33452839e473dc984773b8998d880db1a89d602ddd4fc9d45e47eafc39d202b579fad234a2231b8a
+  data.tar.gz: 0c90ce377ad5ed1bd0483cdaaef14702bd743005052833d120f9c813445ff2b92fbfdd204aed18c0576e8b05fb359e6b1e3515b3a9fbdf43c5d35ea12548e85f

data/ext/efficient_join/efficient_join.c

@@ -46,13 +46,18 @@ static inline void strbuf_write_int64(struct strbuf_t *strbuf, int64_t value)
     strbuf->pos += bytes_written;
 }
 
-static VALUE _join(const char *header, const char *footer, const char *item_prefix, const char *item_suffix, const char *join, VALUE array) {
+VALUE rb_efficient_join(VALUE self, VALUE _header, VALUE _footer, VALUE _item_prefix, VALUE _item_suffix, VALUE _join, VALUE number_array) {
     VALUE out;
-    const long array_len = RARRAY_LEN(array);
-    VALUE *c_array = RARRAY_PTR(array);
-    const size_t prefix_len = strlen(item_prefix);
-    const size_t suffix_len = strlen(item_suffix);
-    const size_t join_len = strlen(join);
+    const long array_len = RARRAY_LEN(number_array);
+    const char* header = StringValuePtr(_header);
+    const char* footer = StringValuePtr(_footer);
+    const char* item_prefix = StringValuePtr(_item_prefix);
+    const char* item_suffix = StringValuePtr(_item_suffix);
+    const char* join = StringValuePtr(_join);
+    VALUE *c_array = RARRAY_PTR(number_array);
+    const size_t prefix_len = RSTRING_LEN(_item_prefix);
+    const size_t suffix_len = RSTRING_LEN(_item_suffix);
+    const size_t join_len = RSTRING_LEN(_join);
 
     struct strbuf_t join_buf = strbuf_new(suffix_len + join_len + prefix_len);
     // estimate likely maximum buffer size, to avoid reallocs
@@ -63,7 +68,7 @@ static VALUE _join(const char *header, const char *footer, const char *item_pref
     strbuf_write_str(&join_buf, join, join_len);
     strbuf_write_str(&join_buf, item_prefix, prefix_len);
 
-    strbuf_write_str(&buf, header, strlen(header));
+    strbuf_write_str(&buf, header, RSTRING_LEN(_header));
     strbuf_write_str(&buf, item_prefix, prefix_len);
 
     for (long i=0; i<array_len; ++i) {
@@ -91,7 +96,7 @@ static VALUE _join(const char *header, const char *footer, const char *item_pref
         }
     }
     strbuf_write_str(&buf, item_suffix, suffix_len);
-    strbuf_write_str(&buf, footer, strlen(footer));
+    strbuf_write_str(&buf, footer, RSTRING_LEN(_footer));
 
     out = rb_str_new(buf.buf, buf.pos);
 
@@ -101,17 +106,6 @@ static VALUE _join(const char *header, const char *footer, const char *item_pref
     return out;
 }
 
-VALUE rb_efficient_join(VALUE self, VALUE header, VALUE footer, VALUE prefix, VALUE suffix, VALUE join, VALUE number_array) {
-    return _join(
-        StringValueCStr(header),
-        StringValueCStr(footer),
-        StringValueCStr(prefix),
-        StringValueCStr(suffix),
-        StringValueCStr(join),
-        number_array
-    );
-}
-
 void Init_efficient_join()
 {
     VALUE mod = rb_define_module("EfficientJoinCExt");

data/lib/efficient_join/version.rb

@@ -1,3 +1,3 @@
 module EfficientJoin
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efficient_join
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Tom Morton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: "."