supplement 2.29 → 2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d98b193bc4d1cc8ede4e690103285660b92acbef10bc2c8c9fbe9774968b55e
-  data.tar.gz: ce38aef42ac4a5aceb953eee5090d62b09da647c6badd39eb13fcf6ae75124d7
+  metadata.gz: 0ecb9754ff9168f112f5cc9535bdd6fa1dd1877cb7eb4738757a32854a56c325
+  data.tar.gz: 983d0b6c6c91258fd74eb0e6fe31f16124654e730d750a09105fe66873086915
 SHA512:
-  metadata.gz: c8a1ca6542111abec4919e6b0fafbc665e88baf3de003ccb696586060b4508f0d8c95c5a85d5b2b2bbab85aad0f2c7132bee0458dd64f799d6825c8f404e6754
-  data.tar.gz: 30703341388fdd2895f68879925eef1d4a1e94c22e177470cc7689b5e7a0addd5693bab20969afa8b127e6a137e5794dba323bdf2d1e2824adfe73b813103dc5
+  metadata.gz: 31724b42dca923848441e648d91757c58bb212a63d91a3613fbedb760b6894f64d432bfb30de89f95fbba93002b9e316283efab175ef747e162ca174ac25e3c4
+  data.tar.gz: 5f9e2ff5d368ea29e22bc2218c22b2261b582a8d81724ae5fb48f841fd1c6d77d3367950a68372a74fd8287a8b51b08ba0c7e7635d5bed296619362103f2f5bb

data/README.md

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

data/lib/supplement.c

@@ -11,6 +11,8 @@
 #include <ruby/re.h>
 
 
+static long  supplement_args_len_default( int, VALUE *);
+static void  supplement_make_ellipse( void);
 static void  supplement_ary_assure_notempty( VALUE);
 static VALUE supplement_index_blk( VALUE);
 static VALUE supplement_index_ref( VALUE, VALUE);
@@ -19,6 +21,9 @@ static VALUE supplement_rindex_ref( VALUE, VALUE);
 static VALUE supplement_do_unumask( VALUE);
 
 
+static VALUE supplement_ellipse = Qnil;
+static long  supplement_len_ell = 0;
+
 static ID id_delete_at = 0;
 static ID id_cmp = 0;
 static ID id_eqq = 0;
@@ -111,8 +116,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 +128,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);
 }
 
@@ -391,49 +400,102 @@ rb_str_tail( int argc, VALUE *argv, VALUE str)
 }
 
 
+long
+supplement_args_len_default( int argc, VALUE *argv)
+{
+    VALUE n;
+    long r;
+
+    if (rb_scan_args( argc, argv, "01", &n) == 1 && !NIL_P( n))
+        r = NUM2LONG( n);
+    else
+        r = 80;
+    return r;
+}
+
+void
+supplement_make_ellipse( void)
+{
+    if (!NIL_P( supplement_ellipse))
+        return;
+    supplement_ellipse = rb_str_new2( "...");
+    supplement_len_ell = rb_str_strlen( supplement_ellipse);
+}
+
 /*
  *  call-seq:
  *     axe( n = 80)   -> str
  *
- *  Cut off everthing beyond then <code>n</code>th character. Replace the
+ *  Cut off everthing beyond the <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..."
+ *     a = "Now is the time for all good men to come to the aid of their country etc."
+ *     a.axe( 16)     #=> "Now is the ti..."
  */
 
 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;
+    newlen = supplement_args_len_default( argc, argv);
     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);
+        supplement_make_ellipse();
+        if (newlen >= supplement_len_ell) {
+            ret = rb_str_substr( str, 0, newlen - supplement_len_ell);
+            rb_str_append( ret, supplement_ellipse);
         } else
-            ret = rb_str_substr( str, 0, newlen);
+            ret = rb_str_substr( supplement_ellipse, 0, newlen);
     } else
         ret = str;
     return ret;
 }
 
 
+/*
+ *  call-seq:
+ *     axe!( n = 80)   -> str
+ *
+ *  Cut off everthing beyond the <code>n</code>th character. Replace the
+ *  last bytes by ellipses.
+ *
+ *     a = "Now is the time for all good men to come to the aid of their country etc."
+ *     a.axe!( 16)     #=> "Now is the ti..."
+ *     a               #=> "Now is the ti..."
+ *
+ *  If nothing was removed, <code>nil</code> is returned.
+ */
+
+VALUE
+rb_str_axe_bang( int argc, VALUE *argv, VALUE str)
+{
+    long newlen, oldlen;
+
+    newlen = supplement_args_len_default( argc, argv);
+    if (newlen < 0)
+        return Qnil;
+
+    rb_str_modify( str);
+
+    oldlen = rb_str_strlen( str);
+    if (newlen < oldlen) {
+        long re;
+
+        rb_str_update( str, newlen, oldlen - newlen, rb_str_new( NULL, 0));
+        supplement_make_ellipse();
+        re = newlen < supplement_len_ell ? newlen : supplement_len_ell;
+        rb_str_update( str, newlen - re, re, rb_str_substr( supplement_ellipse, 0, re));
+        return str;
+    } else
+        return Qnil;
+}
+
+
 /*
  *  call-seq:
  *     starts_with?( *oth)   -> nil or int
@@ -443,7 +505,7 @@ rb_str_axe( int argc, VALUE *argv, VALUE str)
  *
  *     "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>.
  */
@@ -485,7 +547,7 @@ rb_str_starts_with_p( int argc, VALUE *argv, VALUE str)
  *
  *     "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+.
  */
 
@@ -525,7 +587,7 @@ rb_str_ends_with_p( int argc, VALUE *argv, VALUE str)
  *
  *     :"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>.
  */
@@ -546,7 +608,7 @@ rb_sym_starts_with_p( int argc, VALUE *argv, VALUE sym)
  *
  *     :"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+.
  */
 
@@ -1181,6 +1243,7 @@ void Init_supplement( void)
     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, "axe", rb_str_axe, -1);
+    rb_define_method( rb_cString, "axe!", rb_str_axe_bang, -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);
@@ -1202,12 +1265,15 @@ void Init_supplement( void)
 
     rb_define_method( rb_cHash, "notempty?", rb_hash_notempty_p, 0);
 
+    rb_undef_method( CLASS_OF( 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

@@ -27,6 +27,7 @@ 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_axe( int, VALUE *, VALUE);
+extern VALUE rb_str_axe_bang( 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);

metadata

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