supplement 1.6.1 → 1.7

data/README

@@ -1,4 +1,4 @@
-= supplement 1.6.1  --  Useful Ruby enhancements
+= supplement 1.7  --  Useful Ruby enhancements
 
 Some simple Ruby extensions.
 

data/lib/supplement.c

@@ -53,7 +53,9 @@ static struct supplement_flock *flocks_root = NULL;
 
 
 static VALUE supplement_index_blk( VALUE);
+static VALUE supplement_index_ref( VALUE, VALUE);
 static VALUE supplement_rindex_blk( VALUE);
+static VALUE supplement_rindex_ref( VALUE, VALUE);
 #ifdef FEATURE_ARRAY_INDEX_WITH_BLOCK
 static VALUE supplement_index_val( VALUE, VALUE);
 static VALUE supplement_rindex_val( VALUE, VALUE);
@@ -899,10 +901,12 @@ rb_ary_indexes( VALUE ary)
 
 /*
  *  call-seq:
+ *     pick( ref)           -> obj or nil
  *     pick { |elem| ... }  -> obj or nil
  *
- *  Deletes the element where the <em>block</em> first returns
- *  <code>true</code>. Or <code>nil</code> if nothing is found.
+ *  Deletes the element where first <code>ref === obj</code> is true or the
+ *  <em>block</em> first returns <code>true</code>. The result will be
+ *  <code>nil</code> if nothing is found.
  *
  *     a = %w(ant bat cat dog)
  *     a.pick { |e| e =~ /^c/ }  #=> "cat"
@@ -911,16 +915,36 @@ rb_ary_indexes( VALUE ary)
  */
 
 VALUE
-rb_ary_pick( VALUE ary)
+rb_ary_pick( int argc, VALUE *argv, VALUE ary)
 {
+    VALUE ref;
     VALUE pos;
+    VALUE p;
+
+    if (rb_scan_args( argc, argv, "01", &ref) == 1)
+        pos = supplement_index_ref( ary, ref);
+    else
+        pos = supplement_index_blk( ary);
 
-    pos = supplement_index_blk( ary);
     if (!NIL_P( pos))
         return rb_funcall( ary, id_delete_at, 1, pos);
     return Qnil;
 }
 
+VALUE
+supplement_index_ref( VALUE ary, VALUE ref)
+{
+    long i, j;
+
+    if (!id_eqq)
+        id_eqq = rb_intern( "===");
+    for (i = 0, j = RARRAY_LEN( ary); j > 0; i++, j--) {
+        if (RTEST( rb_funcall( ref, id_eqq, 1, RARRAY_PTR( ary)[ i])))
+            return LONG2NUM( i);
+    }
+    return Qnil;
+}
+
 VALUE
 supplement_index_blk( VALUE ary)
 {
@@ -935,11 +959,12 @@ supplement_index_blk( VALUE ary)
 
 /*
  *  call-seq:
+ *     rpick( ref)           -> obj or nil
  *     rpick { |elem| ... }  -> obj or nil
  *
- *  Deletes the element where the <em>block</em> first returns
- *  <code>true</code>. Or <code>nil</code> if nothing is found. Search
- *  from right to left.
+ *  Deletes the element where first <code>ref === obj</code> is true or the
+ *  <em>block</em> first returns <code>true</code>. The result will be
+ *  <code>nil</code> if nothing is found. Search from right to left.
  *
  *     a = %w(ant cow bat cat dog)
  *     a.rpick { |e| e =~ /^c/ }  #=> "cat"
@@ -948,16 +973,37 @@ supplement_index_blk( VALUE ary)
  */
 
 VALUE
-rb_ary_rpick( VALUE ary)
+rb_ary_rpick( int argc, VALUE *argv, VALUE ary)
 {
+    VALUE ref;
     VALUE pos;
+    VALUE p;
+
+    if (rb_scan_args( argc, argv, "01", &ref) == 1)
+        pos = supplement_rindex_ref( ary, ref);
+    else
+        pos = supplement_rindex_blk( ary);
 
-    pos = supplement_rindex_blk( ary);
     if (!NIL_P( pos))
         return rb_funcall( ary, id_delete_at, 1, pos);
     return Qnil;
 }
 
+VALUE
+supplement_rindex_ref( VALUE ary, VALUE ref)
+{
+    long i;
+
+    if (!id_eqq)
+        id_eqq = rb_intern( "===");
+    for (i = RARRAY_LEN( ary); i;) {
+        --i;
+        if (RTEST( rb_funcall( ref, id_eqq, 1, RARRAY_PTR( ary)[ i])))
+            return LONG2NUM( i);
+    }
+    return Qnil;
+}
+
 VALUE
 supplement_rindex_blk( VALUE ary)
 {
@@ -965,7 +1011,7 @@ supplement_rindex_blk( VALUE ary)
 
     for (i = RARRAY_LEN( ary); i;) {
         --i;
-        if (rb_yield( RARRAY_PTR( ary)[ i]))
+        if (RTEST( rb_yield( RARRAY_PTR( ary)[ i])))
             return LONG2NUM( i);
     }
     return Qnil;
@@ -1610,8 +1656,8 @@ void Init_supplement( void)
     rb_define_method( rb_cArray, "notempty?", rb_ary_notempty_p, 0);
     rb_define_method( rb_cArray, "indexes", rb_ary_indexes, 0);
     rb_define_alias(  rb_cArray, "keys", "indexes");
-    rb_define_method( rb_cArray, "pick", rb_ary_pick, 0);
-    rb_define_method( rb_cArray, "rpick", rb_ary_rpick, 0);
+    rb_define_method( rb_cArray, "pick", rb_ary_pick, -1);
+    rb_define_method( rb_cArray, "rpick", rb_ary_rpick, -1);
 #ifdef FEATURE_ARRAY_INDEX_WITH_BLOCK
     rb_define_method( rb_cArray, "index", rb_ary_index, -1);
     rb_define_method( rb_cArray, "rindex", rb_ary_rindex, -1);

data/lib/supplement.h

@@ -44,8 +44,8 @@ extern VALUE rb_str_axe( int, VALUE *, VALUE);
 
 extern VALUE rb_ary_notempty_p( VALUE);
 extern VALUE rb_ary_indexes( VALUE);
-extern VALUE rb_ary_pick( VALUE);
-extern VALUE rb_ary_rpick( VALUE);
+extern VALUE rb_ary_pick(  int, VALUE *, VALUE);
+extern VALUE rb_ary_rpick( int, VALUE *, VALUE);
 #ifdef FEATURE_ARRAY_INDEX_WITH_BLOCK
 extern VALUE rb_ary_index( int, VALUE *, VALUE);
 extern VALUE rb_ary_rindex( int, VALUE *, VALUE);

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: supplement
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: '1.7'
+  prerelease: 
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -53,7 +56,6 @@ files:
 - LICENSE
 homepage: http://www.bertram-scharpf.de/software/supplement
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset
@@ -63,11 +65,13 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
@@ -75,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby and the autorake gem
 rubyforge_project: NONE
-rubygems_version: 2.0.7
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple Ruby extensions
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGY0Y2M4OGFjNTc5Zjg1OGVmNTU3NzFlMzhkZDhkNjlhMWQxNGNkMQ==
-  data.tar.gz: !binary |-
-    ZjcyODM0M2VjYWI1NWI3MDE0YzBlYzRjZTYxMDc0MzAwMTRkNmQ0Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Y2ZmZjRlY2MwOTVhMGFlNDlkNjgxZDM5NTRlYzQ5OWU3NTUxNGI3NTA0Y2Zh
-    MGI1ZWY2MDc5ODU2MTkxMjY5ZjhhYjRmNWU2ZDg4ODM0MzczM2JjYzdiZjA4
-    YzFiNWM4YWFiNWEwYTY5OWFkY2EzMjhiYTc3NjQwMDY1ZjdjODM=
-  data.tar.gz: !binary |-
-    NzQ2ODFjZjQ4MDg4NDU5OWYwYmRjNTJmMjYxMjlkNmY1NTNhNjgzNDVjODc0
-    YzExNGMzOTg1NjNiZTE0MDRhYWRmZjQ3MzQ2NWI1ZWFjOGQ0NDc3YTNkMzY4
-    ZjlkYTdhN2M2MWIzNWI2MGE0MmYzYjYyZDc2NzBlMTYxNDE4MGI=