console 0.3 → 0.4

data/ext/console/console.c

@@ -17,8 +17,10 @@
 static inline int calc_width(char* string, long strlen, long byte_offset, size_t* num_bytes, size_t* num_cols) {
   wchar_t wc;
   size_t width = -1;
+  mbstate_t state;
 
-  *num_bytes = mbrtowc(&wc, string + byte_offset, strlen - byte_offset, NULL);
+  memset(&state, 0, sizeof(state));
+  *num_bytes = mbrtowc(&wc, string + byte_offset, strlen - byte_offset, &state);
 
   if(*num_bytes == (size_t)-2) {
     rb_raise(rb_eArgError, "malformed string: incomplete multibyte character at position %ld", byte_offset);
@@ -34,9 +36,6 @@ static inline int calc_width(char* string, long strlen, long byte_offset, size_t
   }
 
   *num_cols = wcwidth(wc);
-  /* 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);
-  */
 
   return 0;
 }

metadata

@@ -1,33 +1,32 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: console
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  version: "0.3"
+version: !ruby/object:Gem::Version
+  version: '0.4'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - William Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-17 20:18:21 -08:00
+date: 2011-04-30 14:51:22.000000000 -07:00
 default_executable: 
 dependencies: []
-
-description: Console is a helper class for displaying super-ASCII strings on the console. Console is needed when you want to mix two-column (e.g. Chinese) and single-column (e.g. ASCII) characters and know how much horizontal realestate the result takes on the screen. This is generally necessary when you want to have internationalization support in a console-based program. Console currently provides utility methods for determining the display width of a string, and for taking a substring based on display position and display width.
+description: Console is a helper class for displaying super-ASCII strings on the console.
+  Console is needed when you want to mix two-column (e.g. Chinese) and single-column
+  (e.g. ASCII) characters and know how much horizontal realestate the result takes
+  on the screen. This is generally necessary when you want to have internationalization
+  support in a console-based program. Console currently provides utility methods for
+  determining the display width of a string, and for taking a substring based on display
+  position and display width.
 email: wmorgan-console@masanjin.net
 executables: []
-
-extensions: 
+extensions:
 - ext/console/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - ext/console/console.c
-files: 
+files:
 - README
 - ext/console/extconf.rb
 - ext/console/console.c
@@ -36,36 +35,28 @@ files:
 has_rdoc: true
 homepage: http://masanjin.net/console
 licenses: []
-
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- -c
+- utf8
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Console is a helper for properly handling super-ASCII strings on the console.
 test_files: []
-