supplement 2.28 → 2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85d589269b733a85677e23b294181ffe0c589b85b4a4d635d4071cfb11f9dee
-  data.tar.gz: 629cb0a6f688289737682b4483ce56b2d48ebc59329427e526b8422cc8dbb7f0
+  metadata.gz: fd387c214f1666040ad8c1d4844543310d0616449c08cf3b69a3f11cdc83e93a
+  data.tar.gz: 1b5460d3ecf411e6c7cda40510a8649f8ecd9a42ea405d1284f4b3d57148fa9d
 SHA512:
-  metadata.gz: 35b071bcdc5240496f66ab0e288c3be3f9d22166f5fe817f01cd69ba64e19af7fc78c9a76fe10fc78d85addb8703861b87b9082c903a21a45c22e63033a6e8a5
-  data.tar.gz: 8d2d97d762991063639a8fd33d2d84ab876542e71b005c11744f74dfc3ab30d2412490b1dc9e9f699ce4334f0579ce10bdb4ad0f9fcacaa860c9ffcf67cbc119
+  metadata.gz: 513e9ff98266e00ef2ee11f47961cadb834074a7c7d889708032c14515aaf2db28d95a593d25d6904a66d29f030b4cb9e65219152ae88b6cca9b9a532a60c260
+  data.tar.gz: c8c0be3cff0f29e4d5476f694d78f44105222b58f8e86ac37977567a6b702efe65bc0b9f2d5a0dbf4288761b348231cea62fe6ce90f00c964dcd73fff2d9180a

data/README.md

@@ -1,4 +1,4 @@
-# supplement 2.28  --  Useful Ruby enhancements
+# supplement 2.30  --  Useful Ruby enhancements
 
 Some simple Ruby extensions.
 

data/lib/supplement.c

@@ -111,8 +111,10 @@ rb_krn_tap_bang( VALUE obj)
  *  call-seq:
  *     with { |x| ... }    -> obj
  *
+ *  Warning. This method will be removed. Use +Kernel#then+ instead.
+ *
  *  Yields +x+ to the block.
- *  This difference to +tap+ is that the block's result will be returned.
+ *  The difference to +tap+ is that the block's result will be returned.
  *
  *  Use this to narrow your namespace.
  *
@@ -121,6 +123,8 @@ rb_krn_tap_bang( VALUE obj)
 VALUE
 rb_krn_with( VALUE obj)
 {
+    rb_category_warning(RB_WARN_CATEGORY_DEPRECATED,
+        "Kernel#with will be removed from the supplement gem. Use Kernel#then instead.");
     return rb_yield( obj);
 }
 
@@ -393,112 +397,167 @@ rb_str_tail( int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *     starts_with?( oth)   -> nil or int
+ *     axe( n = 80)   -> str
  *
- *  Checks whether the head is <code>oth</code>. Returns length of
- *  <code>oth</code> when matching.
+ *  Cut off everthing beyond then <code>n</code>th character. Replace the
+ *  last bytes by ellipses.
+ *
+ *     a = "Redistribution and use in source and binary forms, with or without"
+ *     a.axe( 16)     #=> "Redistributio..."
+ */
+
+VALUE
+rb_str_axe( int argc, VALUE *argv, VALUE str)
+{
+    VALUE n;
+    VALUE ret;
+    long newlen, oldlen;
+
+    if (rb_scan_args( argc, argv, "01", &n) == 1 && !NIL_P( n))
+        newlen = NUM2LONG( n);
+    else
+        newlen = 80;
+    if (newlen < 0)
+        return Qnil;
+
+    oldlen = rb_str_strlen( str);
+    if (newlen < oldlen) {
+        VALUE ell;
+        long e;
+
+        ell = rb_str_new2( "...");
+        e = rb_str_strlen( ell);
+        if (newlen > e) {
+            ret = rb_str_substr( str, 0, newlen - e);
+            rb_str_append( ret, ell);
+        } else
+            ret = rb_str_substr( str, 0, newlen);
+    } else
+        ret = str;
+    return ret;
+}
+
+
+/*
+ *  call-seq:
+ *     starts_with?( *oth)   -> nil or int
+ *
+ *  Checks whether the head is one of <code>oth</code>. Returns the position
+ *  where the match ends.
  *
  *     "sys-apps".starts_with?( "sys-")    #=> 4
  *
- *  Caution! The Ruby 1.9.3 method #start_with? (notice the missing s)
+ *  Caution! The Ruby 1.9.3 method #start_with? (note the missing s)
  *  just returns +true+ or +false+. Mnemonics: "s" = prepare for
  *  <code>#slice</code>.
  */
 
 VALUE
-rb_str_starts_with_p( VALUE str, VALUE oth)
+rb_str_starts_with_p( int argc, VALUE *argv, VALUE str)
 {
-    long i;
-    char *s, *o;
-    VALUE ost;
+    int j;
 
-    ost = rb_string_value( &oth);
-    i = RSTRING_LEN( ost);
-    if (i > RSTRING_LEN( str))
-        return Qnil;
-    s = RSTRING_PTR( str);
-    o = RSTRING_PTR( ost);
-    for (; i; i--, s++, o++) {
-        if (*s != *o)
+    for (j = 0; j < argc; j++) {
+        long i;
+        char *s, *o;
+        VALUE ost;
+        VALUE oth = argv[ j];
+
+        ost = rb_string_value( &oth);
+        i = RSTRING_LEN( ost);
+        if (i > RSTRING_LEN( str))
             return Qnil;
+        s = RSTRING_PTR( str);
+        o = RSTRING_PTR( ost);
+        for (; i; i--, s++, o++) {
+            if (*s != *o)
+                break;
+        }
+        if (!i)
+            return INT2FIX( rb_str_strlen( ost));
     }
-    return INT2FIX( rb_str_strlen( ost));
+    return Qnil;
 }
 
 
 /*
  *  call-seq:
- *     ends_with?( oth)   -> nil or int
+ *     ends_with?( *oth)   -> nil or int
  *
- *  Checks whether the tail is <code>oth</code>. Returns the position
- *  where <code>oth</code> starts when matching.
+ *  Checks whether the tail is one of <code>oth</code>. Returns the position
+ *  where the match starts.
  *
  *     "sys-apps".ends_with?( "-apps")    #=> 3
  *
- *  Caution! The Ruby 1.9.3 method #start_with? (notice the missing s)
+ *  Caution! The Ruby 1.9.3 method #start_with? (note the missing s)
  *  just returns +true+ or +false+.
  */
 
 VALUE
-rb_str_ends_with_p( VALUE str, VALUE oth)
+rb_str_ends_with_p( int argc, VALUE *argv, VALUE str)
 {
-    long i;
-    char *s, *o;
-    VALUE ost;
+    int j;
 
-    ost = rb_string_value( &oth);
-    i = RSTRING_LEN( ost);
-    if (i > RSTRING_LEN( str))
-        return Qnil;
-    s = RSTRING_END( str);
-    o = RSTRING_END( ost);
-    for (; i; i--)
-        if (*--s != *--o)
+    for (j = 0; j < argc; j++) {
+        long i;
+        char *s, *o;
+        VALUE ost;
+        VALUE oth = argv[ j];
+
+        ost = rb_string_value( &oth);
+        i = RSTRING_LEN( ost);
+        if (i > RSTRING_LEN( str))
             return Qnil;
-    return INT2FIX( rb_str_strlen( str) - rb_str_strlen( ost));
+        s = RSTRING_END( str);
+        o = RSTRING_END( ost);
+        for (; i; i--)
+            if (*--s != *--o)
+                break;
+        if (!i)
+            return INT2FIX( rb_str_strlen( str) - rb_str_strlen( ost));
+    }
+    return Qnil;
 }
 
 
 /*
  *  call-seq:
- *     axe( n = 80)   -> str
+ *     starts_with?( oth)   -> nil or int
  *
- *  Cut off everthing beyond then <code>n</code>th character. Replace the
- *  last bytes by ellipses.
+ *  Checks whether the head is <code>oth</code>. Returns length of
+ *  <code>oth</code> when matching.
  *
- *     a = "Redistribution and use in source and binary forms, with or without"
- *     a.axe( 16)     #=> "Redistributio..."
+ *     :"sys-apps".starts_with?( "sys-")    #=> 4
+ *
+ *  Caution! The Ruby 1.9.3 method #start_with? (note the missing s)
+ *  just returns +true+ or +false+. Mnemonics: "s" = prepare for
+ *  <code>#slice</code>.
  */
 
 VALUE
-rb_str_axe( int argc, VALUE *argv, VALUE str)
+rb_sym_starts_with_p( int argc, VALUE *argv, VALUE sym)
 {
-    VALUE n;
-    VALUE ret;
-    long newlen, oldlen;
+    return rb_str_starts_with_p(argc, argv, rb_sym2str(sym));
+}
 
-    if (rb_scan_args( argc, argv, "01", &n) == 1 && !NIL_P( n))
-        newlen = NUM2LONG( n);
-    else
-        newlen = 80;
-    if (newlen < 0)
-        return Qnil;
 
-    oldlen = rb_str_strlen( str);
-    if (newlen < oldlen) {
-        VALUE ell;
-        long e;
+/*
+ *  call-seq:
+ *     ends_with?( oth)   -> nil or int
+ *
+ *  Checks whether the tail is <code>oth</code>. Returns the position
+ *  where <code>oth</code> starts when matching.
+ *
+ *     :"sys-apps".ends_with?( "-apps")    #=> 3
+ *
+ *  Caution! The Ruby 1.9.3 method #start_with? (note the missing s)
+ *  just returns +true+ or +false+.
+ */
 
-        ell = rb_str_new2( "...");
-        e = rb_str_strlen( ell);
-        if (newlen > e) {
-            ret = rb_str_substr( str, 0, newlen - e);
-            rb_str_append( ret, ell);
-        } else
-            ret = rb_str_substr( str, 0, newlen);
-    } else
-        ret = str;
-    return ret;
+VALUE
+rb_sym_ends_with_p( int argc, VALUE *argv, VALUE sym)
+{
+    return rb_str_ends_with_p(argc, argv, rb_sym2str(sym));
 }
 
 
@@ -1125,9 +1184,11 @@ void Init_supplement( void)
     rb_define_method( rb_cString, "head", rb_str_head, -1);
     rb_define_method( rb_cString, "rest", rb_str_rest, -1);
     rb_define_method( rb_cString, "tail", rb_str_tail, -1);
-    rb_define_method( rb_cString, "starts_with?", rb_str_starts_with_p, 1);
-    rb_define_method( rb_cString, "ends_with?", rb_str_ends_with_p, 1);
     rb_define_method( rb_cString, "axe", rb_str_axe, -1);
+    rb_define_method( rb_cString, "starts_with?", rb_str_starts_with_p, -1);
+    rb_define_method( rb_cString, "ends_with?", rb_str_ends_with_p, -1);
+    rb_define_method( rb_cSymbol, "starts_with?", rb_sym_starts_with_p, -1);
+    rb_define_method( rb_cSymbol, "ends_with?", rb_sym_ends_with_p, -1);
 
     rb_define_method( rb_cNumeric, "grammatical", rb_num_grammatical, 2);
     rb_define_method( rb_cNumeric, "sqrt", rb_num_sqrt, 0);
@@ -1145,12 +1206,15 @@ void Init_supplement( void)
 
     rb_define_method( rb_cHash, "notempty?", rb_hash_notempty_p, 0);
 
+    rb_undef_method( rb_singleton_class( rb_cFile), "umask");
     rb_define_singleton_method( rb_cFile, "umask", rb_file_s_umask, -1);
 
     rb_define_singleton_method( rb_cDir, "current", rb_dir_s_current, 0);
     rb_define_singleton_method( rb_cDir, "mkdir!", rb_dir_s_mkdir_bang, -1);
     rb_define_alias(  rb_cDir, "entries!", "children");
 
+    rb_undef_method( rb_cMatch, "begin");
+    rb_undef_method( rb_cMatch, "end");
     rb_define_method( rb_cMatch, "begin", rb_match_begin, -1);
     rb_define_method( rb_cMatch, "end", rb_match_end, -1);
 

data/lib/supplement.h

@@ -26,9 +26,11 @@ extern VALUE rb_str_cut_bang( VALUE, VALUE);
 extern VALUE rb_str_head( int, VALUE *, VALUE);
 extern VALUE rb_str_rest( int, VALUE *, VALUE);
 extern VALUE rb_str_tail( int, VALUE *, VALUE);
-extern VALUE rb_str_starts_with_p( VALUE, VALUE);
-extern VALUE rb_str_ends_with_p( VALUE, VALUE);
 extern VALUE rb_str_axe( int, VALUE *, VALUE);
+extern VALUE rb_str_starts_with_p( int argc, VALUE *argv, VALUE);
+extern VALUE rb_str_ends_with_p( int argc, VALUE *argv, VALUE);
+extern VALUE rb_sym_starts_with_p( int argc, VALUE *argv, VALUE);
+extern VALUE rb_sym_ends_with_p( int argc, VALUE *argv, VALUE);
 
 extern VALUE rb_num_grammatical( VALUE, VALUE, VALUE);
 extern VALUE rb_num_sqrt( VALUE);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supplement
 version: !ruby/object:Gem::Version
-  version: '2.28'
+  version: '2.30'
 platform: ruby
 authors:
 - Bertram Scharpf