supplement 2.28 → 2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85d589269b733a85677e23b294181ffe0c589b85b4a4d635d4071cfb11f9dee
-  data.tar.gz: 629cb0a6f688289737682b4483ce56b2d48ebc59329427e526b8422cc8dbb7f0
+  metadata.gz: 9d98b193bc4d1cc8ede4e690103285660b92acbef10bc2c8c9fbe9774968b55e
+  data.tar.gz: ce38aef42ac4a5aceb953eee5090d62b09da647c6badd39eb13fcf6ae75124d7
 SHA512:
-  metadata.gz: 35b071bcdc5240496f66ab0e288c3be3f9d22166f5fe817f01cd69ba64e19af7fc78c9a76fe10fc78d85addb8703861b87b9082c903a21a45c22e63033a6e8a5
-  data.tar.gz: 8d2d97d762991063639a8fd33d2d84ab876542e71b005c11744f74dfc3ab30d2412490b1dc9e9f699ce4334f0579ce10bdb4ad0f9fcacaa860c9ffcf67cbc119
+  metadata.gz: c8a1ca6542111abec4919e6b0fafbc665e88baf3de003ccb696586060b4508f0d8c95c5a85d5b2b2bbab85aad0f2c7132bee0458dd64f799d6825c8f404e6754
+  data.tar.gz: 30703341388fdd2895f68879925eef1d4a1e94c22e177470cc7689b5e7a0addd5693bab20969afa8b127e6a137e5794dba323bdf2d1e2824adfe73b813103dc5

data/README.md

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

data/lib/supplement.c

@@ -393,10 +393,53 @@ 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
  *
@@ -406,32 +449,39 @@ rb_str_tail( int argc, VALUE *argv, VALUE str)
  */
 
 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
  *
@@ -440,65 +490,70 @@ rb_str_starts_with_p( VALUE str, VALUE oth)
  */
 
 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? (notice 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? (notice 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 +1180,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);

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.29'
 platform: ruby
 authors:
 - Bertram Scharpf