efficient_join 2.0.0 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8cde6fa3699cd119df8e7fa7b7b3167977eeef1db13ff2c16a03a8787333d9
-  data.tar.gz: e8c10cb18adf55851f1da719dd8f5e70ac1f8d8f7975978abb79f8f22eef83d3
+  metadata.gz: d76d30fa5be5263c9d28faa2cb320dc4a3c61d9baf1fbefcc7cab69564bdc1cf
+  data.tar.gz: 7f4a5598aa3ed81761842bdaf0f92614c33108ecda16617453284fee1e4848d0
 SHA512:
-  metadata.gz: 6f938000b41839c14d1b3e05b52acaddbf9639bb0469af3af5cb537edc37ab3e339782ed9c8183ac2553bdb3aec39f0faefbc1c5a3f52bbe789205edf130e043
-  data.tar.gz: 5874883b14afc5b575239e20727adfaedc828839edf1117d3b5982490efb7fc11cf748198bf05ceafa6e46d250042f48e61b2766048c0a75e7f21a1cbdf0027f
+  metadata.gz: f546d93a65ee3158bc1ff764d6b9af90b37250ce25eff8dbc44928720a48eee0b7a3c1a3606efd809fddea0fe6e0df205b224e11114f135ddf8f065aa60fea44
+  data.tar.gz: b76e0dd48ba2100e0d2903852ded4242a2adcebec7273b8c6ac72d1c9c87f1e91c6cccee5a45063c1b4a81b0231c4a1566285cd3a4214bec2a2a9cb9ec9b2378

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/efficient_join.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tomm8086@googlemail.com"]
 
   spec.summary       = %q{.}
-  spec.description   = %q{Very fast and memory-efficient way to join a list of ruby numbers.}
+  spec.description   = %q{Very fast and memory-efficient way to join ruby lists of numbers and strings.}
   spec.homepage      = "https://github.com/tomm/efficient_join"
   spec.license       = "MIT"
 
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/efficient_join/extconf.rb"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "rake", "~> 12.3.3"
+  spec.add_development_dependency "rake-compiler", "~> 1.0"
 end

data/ext/efficient_join/efficient_join.c

@@ -18,15 +18,15 @@ static void strbuf_free(struct strbuf_t *strbuf) {
     free(strbuf->buf);
 }
 
-static inline void strbuf_expand(struct strbuf_t *strbuf) {
-    strbuf->buf = (char *)realloc(strbuf->buf, strbuf->len * 2);
+static inline void strbuf_expand(struct strbuf_t *strbuf, size_t min_size) {
+    strbuf->buf = (char *)realloc(strbuf->buf, min_size > strbuf->len * 2 ? min_size : strbuf->len * 2);
     strbuf->len *= 2;
 }
 
 static inline void strbuf_write_str(struct strbuf_t *strbuf, const char *str, size_t len)
 {
     if (strbuf->len < strbuf->pos + len) {
-        strbuf_expand(strbuf);
+        strbuf_expand(strbuf, strbuf->pos + len);
     }
 
     memcpy(strbuf->buf + strbuf->pos, str, len);
@@ -39,31 +39,36 @@ static inline void strbuf_write_int64(struct strbuf_t *strbuf, int64_t value)
    
     // 22: maximum length of string representation of 64-bit int
     if (strbuf->len <= strbuf->pos + 22) {
-        strbuf_expand(strbuf);
+        strbuf_expand(strbuf, strbuf->pos + 22);
     }
 
     bytes_written = snprintf(strbuf->buf + strbuf->pos, 22, "%ld", 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);
 
-    // 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, 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,24 +106,9 @@ 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) {
-    return _join(
-        "", "",
-        StringValueCStr(prefix),
-        StringValueCStr(suffix),
-        StringValueCStr(join),
-        number_array
-    );
-}
-
-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.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

data/lib/efficient_join/version.rb

@@ -1,3 +1,3 @@
 module EfficientJoin
-  VERSION = "2.0.0"
+  VERSION = "2.1.4"
 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.4
 platform: ruby
 authors:
 - Tom Morton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,29 +30,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Very fast and memory-efficient way to join a list of ruby numbers.
+        version: '1.0'
+description: Very fast and memory-efficient way to join ruby lists of numbers and
+  strings.
 email:
 - tomm8086@googlemail.com
 executables: []