fast_slice 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76c299152c97820445861f419759fef22f36cd79
-  data.tar.gz: c1ab82924be78c347b0be49fa06053c8637ef7e0
+  metadata.gz: ad4a9a197c0d531c6a12eb2ba3dcb8b6dbe677b6
+  data.tar.gz: c34e41dc8b0989a9db29a725256e0a061132eb29
 SHA512:
-  metadata.gz: d9fdb9db080a35d97169ec64f5b78a97086f5678e01d0262728928bccccb632b5fa4f0bab68a9300200ad0c27c0dc2299aec6556b1710170a6bcb3a002956fdd
-  data.tar.gz: 4cbdd2934cec23b7d1ea3db75ce4a8dc81a4bf00aabbc07ea3efd99f762c6249a172090ea8e32588afa9315f45a1d1cb7854ca982856b55daf5c0c75f36f1346
+  metadata.gz: 8f79eaef84b1910772c27923b348346dcf318bfdb5b607c73b5290a86af8df77acf3f02940354325e24970ee80b08a8bceff8a1f2f5a0c4f67dfd0c70b2e3ec2
+  data.tar.gz: 51ac330d592cea1611037e9d4e6629f3924606b5210b7b6914c0489a804c7c754fbc1318d410d7e2844a83fe52b973d12ac027f6b5ab48301eca54aa2ef38a14

data/ext/fast_slice/fast_slice.c

@@ -1,9 +1,11 @@
 #include <ruby.h>
 
+static VALUE FastSlice = Qnil;
+
 // Effectively a copy and paste from hash.c
 // but replacing RHASH(hash)->tbl with RHASH_TBL (RHASH is not public)
-VALUE
-__rb_hash_has_key(VALUE hash, VALUE key)
+static VALUE
+rb_hash_has_key(VALUE hash, VALUE key)
 {
   if (!RHASH_TBL(hash))
     return Qfalse;
@@ -13,12 +15,9 @@ __rb_hash_has_key(VALUE hash, VALUE key)
   return Qfalse;
 }
 
-VALUE
-rb_fast_slice(int argc, VALUE *argv, VALUE self)
+static VALUE
+fast_slice(VALUE hash, VALUE keys)
 {
-  VALUE hash, args;
-  rb_scan_args(argc, argv, "1*", &hash, &args);
-
   if (TYPE(hash) != T_HASH) {
     rb_raise(rb_eTypeError, "expected a Hash");
     return Qfalse;
@@ -29,11 +28,11 @@ rb_fast_slice(int argc, VALUE *argv, VALUE self)
     result = rb_hash_new();
 
     int i;
-    for (i=0; i < RARRAY_LEN(args); i++) {
-      VALUE arg;
-      arg = rb_ary_entry(args, i);
-      if(__rb_hash_has_key(hash, arg) == Qtrue) {
-        rb_hash_aset(result, arg, rb_hash_aref(hash, arg));
+    for (i=0; i < RARRAY_LEN(keys); i++) {
+      VALUE key;
+      key = rb_ary_entry(keys, i);
+      if(rb_hash_has_key(hash, key) == Qtrue) {
+        rb_hash_aset(result, key, rb_hash_aref(hash, key));
       }
     }
 
@@ -43,20 +42,33 @@ rb_fast_slice(int argc, VALUE *argv, VALUE self)
   return rb_hash_dup(hash);
 }
 
-// Add the `slice` instance method to Hash
-// TODO figure out how to do this
-VALUE rb_define_hash_slice(int argc, VALUE *argv, VALUE self)
+VALUE
+rb_fast_slice_m(int argc, VALUE *argv, VALUE self)
 {
-  rb_define_method(rb_cHash, "slice", rb_fast_slice, -1);
+  VALUE hash, args;
+  rb_scan_args(argc, argv, "1*", &hash, &args);
+  return fast_slice(hash, args);
+}
 
+VALUE
+rb_fast_slice(int argc, VALUE *argv, VALUE self)
+{
+  VALUE args;
+  rb_scan_args(argc, argv, "0*", &args);
+  return fast_slice(self, args);
+}
+
+static VALUE
+rb_define_hash_slice_m(void)
+{
+  rb_define_method(rb_cHash, "slice", rb_fast_slice, -1);
   return Qtrue;
 }
 
 void Init_fast_slice( void )
 {
-  VALUE FastSlice = Qnil;
-  FastSlice = rb_define_class_under(rb_cObject, "FastSlice", rb_cObject);
-      
-  rb_define_singleton_method(FastSlice, "slice", rb_fast_slice, -1);
-  // rb_define_singleton_method(FastSlice, "define_on_hash", rb_define_hash_slice, 0);
+  FastSlice = rb_define_module_under(rb_cObject, "FastSlice");
+  rb_define_singleton_method(FastSlice, "slice", rb_fast_slice_m, -1);
+  rb_define_method(FastSlice, "slice", rb_fast_slice, -1);
+  rb_define_singleton_method(FastSlice, "define_on_hash", rb_define_hash_slice_m, 0);
 }

data/lib/fast_slice/version.rb

@@ -0,0 +1,3 @@
+module FastSlice
+  VERSION = "1.0.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_slice
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - James Cook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ext/fast_slice/extconf.rb
 - ext/fast_slice/fast_slice.c
+- lib/fast_slice/version.rb
 homepage: 
 licenses: []
 metadata: {}