efficient_join 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8cde6fa3699cd119df8e7fa7b7b3167977eeef1db13ff2c16a03a8787333d9
-  data.tar.gz: e8c10cb18adf55851f1da719dd8f5e70ac1f8d8f7975978abb79f8f22eef83d3
+  metadata.gz: 7e939e7d2de4992664e192b1b2851c81931023d49038d0533d8f065379260004
+  data.tar.gz: 48183fea3587d9d415256797baa343aefef074970d8f0813d1fa98aecab00bc1
 SHA512:
-  metadata.gz: 6f938000b41839c14d1b3e05b52acaddbf9639bb0469af3af5cb537edc37ab3e339782ed9c8183ac2553bdb3aec39f0faefbc1c5a3f52bbe789205edf130e043
-  data.tar.gz: 5874883b14afc5b575239e20727adfaedc828839edf1117d3b5982490efb7fc11cf748198bf05ceafa6e46d250042f48e61b2766048c0a75e7f21a1cbdf0027f
+  metadata.gz: 1b5a44b860c8ccb7f1f005c9766cd11ff44878efcc8b7121e115df32b30fc78d472b594c852d7428335164c97680bbf954fd6da0be207f8096ae60ae7353b943
+  data.tar.gz: 4e8cf6f00b49f3046037425bca7963d641c09d69fb277a0e1703ee3b07075fc3358847340a936075b3aea74002eae4100a03e2934e333b5013e8a45a4ed26cd4

data/README.md

@@ -64,6 +64,13 @@ EfficientJoin.join_pg_array([1,2,3,4])
  => "{1,2,3,4}"
 ```
 
+Which is equivalent to:
+
+```
+EfficientJoin.join([1,2,3,4], header: '{', footer: '}')
+ => "{1,2,3,4}"
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/ext/efficient_join/efficient_join.c

@@ -54,15 +54,15 @@ static VALUE _join(const char *header, const char *footer, const char *item_pref
     const size_t suffix_len = strlen(item_suffix);
     const size_t join_len = strlen(join);
 
-    // build joining string
     struct strbuf_t join_buf = strbuf_new(suffix_len + join_len + prefix_len);
+    // estimate likely maximum buffer size, to avoid reallocs
+    struct strbuf_t buf = strbuf_new((array_len + 1) * (join_buf.pos + 10));
+
+    // build joining string
     strbuf_write_str(&join_buf, item_suffix, suffix_len);
     strbuf_write_str(&join_buf, join, join_len);
     strbuf_write_str(&join_buf, item_prefix, prefix_len);
 
-    // estimate likely maximum buffer size, to avoid reallocs
-    struct strbuf_t buf = strbuf_new((array_len + 1) * (join_buf.pos + 10));
-
     strbuf_write_str(&buf, header, strlen(header));
     strbuf_write_str(&buf, item_prefix, prefix_len);
 
@@ -101,9 +101,10 @@ static VALUE _join(const char *header, const char *footer, const char *item_pref
     return out;
 }
 
-VALUE rb_efficient_join(VALUE self, VALUE prefix, VALUE suffix, VALUE join, VALUE number_array) {
+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),
@@ -111,14 +112,9 @@ VALUE rb_efficient_join(VALUE self, VALUE prefix, VALUE suffix, VALUE join, VALU
     );
 }
 
-VALUE rb_efficient_join_pg_array(VALUE self, VALUE number_array) {
-    return _join("{", "}", "", "", ",", number_array);
-}
-
 void Init_efficient_join()
 {
     VALUE mod = rb_define_module("EfficientJoinCExt");
 
-    rb_define_method(mod, "_join", rb_efficient_join, 4);
-    rb_define_method(mod, "_join_pg_array", rb_efficient_join_pg_array, 1);
+    rb_define_method(mod, "_join", rb_efficient_join, 6);
 }

data/lib/efficient_join/version.rb

@@ -1,3 +1,3 @@
 module EfficientJoin
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/efficient_join.rb

@@ -7,12 +7,12 @@ module EfficientJoin
   class << self
     include EfficientJoinCExt
 
-    def join(array, separator: ',', item_prefix: '', item_suffix: '')
-      _join(item_prefix, item_suffix, separator, array)
+    def join(array, header: '', footer: '', separator: ',', item_prefix: '', item_suffix: '')
+      _join(header, footer, item_prefix, item_suffix, separator, array)
     end
 
     def join_pg_array(array)
-      _join_pg_array(array)
+      _join('{', '}', '', '', ',', array)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: efficient_join
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Tom Morton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler