efficient_join 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb0fc1fe97206cfe1fc37b6dcc15904d9ab7276add24337afedc487255bab35
-  data.tar.gz: 98a1732e553cb92eae5c957e34353c79924b6ea8d8fdd23259f20366a02142e2
+  metadata.gz: e67d8cd6098b472380780f923955d25c1dc2777afa768f22552e780823ac63ab
+  data.tar.gz: 3d0d6057ee163ef3498f3e9563097489cd04ae074c88fa43a1b35356b156e955
 SHA512:
-  metadata.gz: 9352ba250499feb06620b23ba816c5ab12dbf91e25f689d78c1a36b842f6767a94d1361a92fc903b1a9bbc4d423fca19d72596ffd270666467e0069791f5620e
-  data.tar.gz: 908e42ce26f867477eabf07f5738d2abd33838c2731c54464130b5e93886e484584f5e1f23cb25bd52202d5fd2a797499115212adc9300c54f3f68e14ceb9977
+  metadata.gz: c3c1f9456f986b2cba749b351a8646fd1476ee825bf47c18bf78061a4c070f350980f40ecb31ef9b4ede1d77be01eed71e82cd3b8f3ab1c87edf37f3112129dc
+  data.tar.gz: 24d0e958eeff1ed02f7bc5cb37c831de6d5f27253e3da4885db9b6ad728b489e64db0111981281d5e7d1ae1bc8c5d2b66c6bc446d2860bda2f8bc699de08fca4

data/README.md

@@ -44,15 +44,15 @@ MemoryProfiler.report { (0...1000000).to_a.join(',') }
 With efficient join:
 ```
 require 'efficient_join'
-EfficientJoin.join('','',',',(0...1000000).to_a)
+EfficientJoin.join((0...1000000).to_a)
   ...
   @total_allocated=5,
   @total_allocated_memsize=18525362
 ```
 
-It takes prefix and suffix:
+It can also take separator, item prefix and item suffix:
 ```
-EfficientJoin.join('(', ',now(),now())', ',', [1,2,3,4])
+EfficientJoin.join([1,2,3,4], separator: ',', item_prefix: '(', item_suffix: ',now(),now())')
  => "(1,now(),now()),(2,now(),now()),(3,now(),now()),(4,now(),now())" 
 ```
 

data/ext/efficient_join/efficient_join.c

@@ -10,7 +10,16 @@ static VALUE _join(const char *header, const char *footer, const char *item_pref
     fputs(header, stream);
 
     for (long i=0; i<array_len; ++i) {
-        fprintf(stream, "%s%ld%s", item_prefix, FIX2LONG(RARRAY_PTR(number_array)[i]), item_suffix);
+        const VALUE v = RARRAY_PTR(number_array)[i];
+        
+        if (TYPE(v) != T_FIXNUM) {
+            // rb_raise does not return control, so clean up first
+            fclose(stream);
+            free(buf);
+            rb_raise(rb_eTypeError, "array must contain only integers");
+        }
+
+        fprintf(stream, "%s%ld%s", item_prefix, FIX2LONG(v), item_suffix);
 
         if (i < array_len - 1) {
             fputs(join, stream);
@@ -45,7 +54,7 @@ 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, 4);
+    rb_define_method(mod, "_join_pg_array", rb_efficient_join_pg_array, 1);
 }
 

data/lib/efficient_join/version.rb

@@ -1,3 +1,3 @@
 module EfficientJoin
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/lib/efficient_join.rb

@@ -6,5 +6,13 @@ module EfficientJoin
 
   class << self
     include EfficientJoinCExt
+
+    def join(array, separator: ',', item_prefix: '', item_suffix: '')
+      _join(item_prefix, item_suffix, separator, array)
+    end
+
+    def join_pg_array(array)
+      _join_pg_array(array)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: efficient_join
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Tom Morton