supplement 2.30 → 2.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd387c214f1666040ad8c1d4844543310d0616449c08cf3b69a3f11cdc83e93a
-  data.tar.gz: 1b5460d3ecf411e6c7cda40510a8649f8ecd9a42ea405d1284f4b3d57148fa9d
+  metadata.gz: dff470072491d922eb1edfa3e305fad6323caa366f83379f10065de3c8ce5a84
+  data.tar.gz: a69fc76a288c99a345e583029fac4678ec591aaa6edd50cf896e77a498147cef
 SHA512:
-  metadata.gz: 513e9ff98266e00ef2ee11f47961cadb834074a7c7d889708032c14515aaf2db28d95a593d25d6904a66d29f030b4cb9e65219152ae88b6cca9b9a532a60c260
-  data.tar.gz: c8c0be3cff0f29e4d5476f694d78f44105222b58f8e86ac37977567a6b702efe65bc0b9f2d5a0dbf4288761b348231cea62fe6ce90f00c964dcd73fff2d9180a
+  metadata.gz: cabaaa436d3f1e3a7bfae57e47c2df42980e8011a1f2a745be79489bbbdc164e8ef7a89c420369a0128e743618303649b396f045351009c5e3b85cca1e60e740
+  data.tar.gz: e5de3d55afe67a240d8efbf35198bed3ca114ef143c1e5a91d221b63ee3c5eea367b76548a250010bcc8eca420cc287f0305f612fb075c746ad267fd3a5ca168

data/LICENSE

@@ -1,6 +1,6 @@
 # BSD-2-clause license, extended by language use conditions
 
-Copyright (C) 2009-2025, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (C) 2009-2026, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,4 +1,4 @@
-# supplement 2.30  --  Useful Ruby enhancements
+# supplement 2.31.1  --  Useful Ruby enhancements
 
 Some simple Ruby extensions.
 
@@ -48,7 +48,7 @@ one of them to be included into the Ruby standard.
 
 ## Copyright
 
-  * (C) 2009-2025 Bertram Scharpf <software@bertram-scharpf.de>
+  * (C) 2009-2026 Bertram Scharpf <software@bertram-scharpf.de>
   * License: [BSD-2-Clause+](./LICENSE)
   * Repository: [ruby-supplement](https://github.com/BertramScharpf/ruby-supplement)
 

data/lib/supplement.c

@@ -11,6 +11,7 @@
 #include <ruby/re.h>
 
 
+static long  supplement_args_len_default( int, VALUE *);
 static void  supplement_ary_assure_notempty( VALUE);
 static VALUE supplement_index_blk( VALUE);
 static VALUE supplement_index_ref( VALUE, VALUE);
@@ -19,6 +20,8 @@ static VALUE supplement_rindex_ref( VALUE, VALUE);
 static VALUE supplement_do_unumask( VALUE);
 
 
+static const char *supplement_ellipse = "...";
+
 static ID id_delete_at = 0;
 static ID id_cmp = 0;
 static ID id_eqq = 0;
@@ -395,49 +398,101 @@ 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;
+}
+
 /*
  *  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;
+        long le;
 
-        ell = rb_str_new2( "...");
-        e = rb_str_strlen( ell);
-        if (newlen > e) {
-            ret = rb_str_substr( str, 0, newlen - e);
+        ell = rb_str_new2( supplement_ellipse);
+        le = rb_str_strlen( ell);
+        if (newlen >= le) {
+            ret = rb_str_substr( str, 0, newlen - le);
             rb_str_append( ret, ell);
         } else
-            ret = rb_str_substr( str, 0, newlen);
+            ret = rb_str_substr( ell, 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) {
+        VALUE ell;
+        long le;
+        long re;
+
+        rb_str_update( str, newlen, oldlen - newlen, rb_str_new( NULL, 0));
+        ell = rb_str_new2( supplement_ellipse);
+        le = rb_str_strlen( ell);
+        re = newlen < le ? newlen : le;
+        rb_str_update( str, newlen - re, re, rb_str_substr( ell, 0, re));
+        return str;
+    } else
+        return Qnil;
+}
+
+
 /*
  *  call-seq:
  *     starts_with?( *oth)   -> nil or int
@@ -1185,6 +1240,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);
@@ -1206,7 +1262,7 @@ 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_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);

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.30'
+  version: 2.31.1
 platform: ruby
 authors:
 - Bertram Scharpf