iobuffer 1.1.0 → 1.1.1

data/ext/extconf.rb

@@ -6,4 +6,4 @@ if have_macro("HAVE_RB_IO_T", "rubyio.h")
   have_struct_member("rb_io_t", "fd", "rubyio.h")
 end
 
-create_makefile("iobuffer")
+create_makefile("iobuffer/iobuffer_ext")

data/ext/iobuffer.c

@@ -81,7 +81,7 @@ static int      buffer_write_to(struct buffer * buf, int fd);
  * Ruby IO objects.
  */
 void
-Init_iobuffer()
+Init_iobuffer_ext()
 {
 	cIO_Buffer = rb_define_class_under(rb_cIO, "Buffer", rb_cObject);
 	rb_define_alloc_func(cIO_Buffer, IO_Buffer_allocate);
@@ -287,6 +287,9 @@ IO_Buffer_prepend(VALUE self, VALUE data)
  * Read the specified abount of data from the buffer.  If no value
  * is given the entire contents of the buffer are returned.  Any data
  * read from the buffer is cleared.
+ * The given length must be greater than 0 or an exception would raise.
+ * If the buffer size is zero then an empty string is returned (regardless
+ * the given length).
  */
 static VALUE
 IO_Buffer_read(int argc, VALUE * argv, VALUE self)
@@ -299,18 +302,15 @@ IO_Buffer_read(int argc, VALUE * argv, VALUE self)
 
 	if (rb_scan_args(argc, argv, "01", &length_obj) == 1) {
 		length = NUM2INT(length_obj);
-	} else {
-		if (buf->size == 0)
-			return rb_str_new2("");
-
-		length = buf->size;
-	}
-
-	if (length > buf->size)
+		if(length < 1)
+		  rb_raise(rb_eArgError, "length must be greater than zero");
+		if(length > buf->size)
+		  length = buf->size;
+	} else
 		length = buf->size;
 
-	if (length < 1)
-		rb_raise(rb_eArgError, "length must be greater than zero");
+	if(buf->size == 0)
+		return rb_str_new2("");
 
 	str = rb_str_new(0, length);
 	buffer_read(buf, RSTRING_PTR(str), length);

data/lib/iobuffer/version.rb

@@ -1,5 +1,5 @@
 class IO
   class Buffer
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
-end
+end

data/lib/iobuffer.rb

@@ -0,0 +1,2 @@
+require 'iobuffer/version'
+require 'iobuffer_ext'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iobuffer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70187477766020 !ruby/object:Gem::Requirement
+  requirement: &70314510650840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187477766020
+  version_requirements: *70314510650840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70187477765400 !ruby/object:Gem::Requirement
+  requirement: &70314510650200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187477765400
+  version_requirements: *70314510650200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70187477764500 !ruby/object:Gem::Requirement
+  requirement: &70314510649400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,16 +43,19 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187477764500
+  version_requirements: *70314510649400
 description: fast buffers for non-blocking IO
 email:
 - tony.arcieri@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
 - README.md
 - lib/iobuffer/version.rb
+- lib/iobuffer.rb
+- lib/iobuffer_ext.bundle
 - ext/iobuffer.c
 - ext/extconf.rb
 homepage: https://github.com/tarcieri/iobuffer