console 0.2 → 0.2.1

data/ext/console/console.c

@@ -49,7 +49,9 @@ static VALUE display_width(VALUE v_self, VALUE v_string) {
     if(num_bytes == 0) rb_raise(rb_eArgError, "malformed string: NULL byte at position %ld", RSTRING_LEN(v_string) - remaining_bytes);
 
     int width = wcwidth(wc);
-    if(width == 0) rb_raise(rb_eArgError, "bad string: non-printable character");
+    /* sometimes this seems to happen! maybe it's not bad...
+    if(width == 0) rb_raise(rb_eArgError, "bad string: non-printable character at position %ld", RSTRING_LEN(v_string) - remaining_bytes);
+    */
 
     display_width += width;
     remaining_bytes -= num_bytes;
@@ -126,7 +128,9 @@ static VALUE display_slice(int argc, VALUE *argv, VALUE v_self) {
     if(num_bytes == 0) rb_raise(rb_eArgError, "malformed string: NULL byte at position %ld", RSTRING_LEN(v_string) - remaining_bytes);
 
     int width = wcwidth(wc);
-    if(width == 0) rb_raise(rb_eArgError, "bad string: non-printable character");
+    /* sometimes this seems to happen! maybe it's not bad...
+    if(width == 0) rb_raise(rb_eArgError, "bad string: non-printable character at position %ld", RSTRING_LEN(v_string) - remaining_bytes);
+    */
 
     current_width += width;
     remaining_bytes -= num_bytes;
@@ -152,7 +156,9 @@ static VALUE display_slice(int argc, VALUE *argv, VALUE v_self) {
     if(num_bytes == 0) rb_raise(rb_eArgError, "malformed string: NULL byte at position %ld", RSTRING_LEN(v_string) - remaining_bytes);
 
     int width = wcwidth(wc);
-    if(width == 0) rb_raise(rb_eArgError, "bad string: non-printable character");
+    /* sometimes this seems to happen! maybe it's not bad...
+    if(width == 0) rb_raise(rb_eArgError, "bad string: non-printable character at position %ld", RSTRING_LEN(v_string) - remaining_bytes);
+    */
 
     if((current_width + width) > display_width) break; // have to stop here
 

data/lib/console/string.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+## lib/console/string.rb -- include Console methods into String
+## Author:     William Morgan (mailto: wmorgan-ruby-console@masanjin.net)
+## Copyright:  Copyright 2010 William Morgan
+## License:    same terms as Ruby itself
+
+require 'console'
+
+## reopen the String class and add #display_width and
+## #display_slice methods directly to strings.
+##
+## If you include "console/string", you can call
+##   "能吞a".display_width
+## instead of
+##   Console.display_width "能吞a"
+##
+## and
+##
+##   "能吞a".display_slice 0, 2
+## instead of
+##   Console.display_slice "能吞a", 0, 2
+##
+
+class String
+  ## Returns the display width of the string. See Console.display_width for details.
+  def display_width; Console.display_width self end
+
+  ## Returns a substring according to display-based start and offset values. See
+  ## Console.display_slice for what this means.
+  ##
+  ## Stupid rdoc is not interpreting this next directive, and I'm tired of wasting
+  ## my life figuring out why.
+  ##
+  ## :call-seq:
+  ##   display_slice(start, offset=1, pad_string=" ")
+  ##
+  def display_slice(*a); Console.display_slice self, *a end
+end

data/test/console.rb

@@ -119,4 +119,8 @@ class ConsoleTest < ::Test::Unit::TestCase
     assert_raises(TypeError) { Console.display_width :potato }
     assert_raises(TypeError) { Console.display_width 3 }
   end
+
+  def test_display_width_of_a_big_crazy_string
+    assert_equal 154, Console.display_width("我能吞下玻璃而不傷身體。Góa ē-tàng chia̍h po-lê, mā bē tio̍h-siong.私はガラスを食べられます。それは私を傷つけません。I can eat glass and it doesn't hurt me.")
+  end
 end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - William Morgan
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 08:47:32 -04:00
+date: 2010-05-11 13:23:26 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +30,7 @@ files:
 - ext/console/extconf.rb
 - ext/console/console.c
 - test/console.rb
+- lib/console/string.rb
 has_rdoc: true
 homepage: http://console.rubygems.org
 licenses: []