Fixed calling +read+ method without argument

git-svn-id: svn://rubyforge.org/var/svn/rbrainz/mb-discid/trunk@301 b628d043-b88c-46ef-b09a-645d37a1a36e

Author: phw

CHANGES

@@ -1,5 +1,8 @@
 = Changelog
 
+== 0.1.4 (2009-11-19)
+* Fixed calling +read+ method without argument
+
 == 0.1.3 (2009-11-19)
 * Added singleton method +sectors_to_seconds+ to convert sectors into seconds
 * Added method +seconds+ to retrieve disc length in seconds

ext/mb_discid.c

@@ -186,7 +186,7 @@ static VALUE mb_discid_tracks(VALUE self)
 				INT2FIX(discid_get_track_offset(disc, track)),
 				INT2FIX(discid_get_track_length(disc, track)) );
 
-		   	if (rb_block_given_p())
+			if (rb_block_given_p())
 				rb_yield(tuple);
 			else
 				rb_ary_push(result, tuple);
@@ -221,17 +221,18 @@ static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 	Data_Get_Struct(self, DiscId, disc);
 
 	/* Check the number and types of arguments */
-	rb_scan_args(argc, argv, "1", &device);
-	if(rb_respond_to(device, rb_intern("to_s")))
-		device = rb_funcall(device, rb_intern("to_s"), 0, 0);
-	else
-		rb_raise(rb_eTypeError, "wrong argument type (expected String)");
-	
+	rb_scan_args(argc, argv, "01", &device);
+
 	/* Use the default device if none was given. */
 	if (device == Qnil)
 		cdevice = discid_get_default_device();
-	else
+	else if (rb_respond_to(device, rb_intern("to_s")))
+	{
+		device = rb_funcall(device, rb_intern("to_s"), 0, 0);
 		cdevice = StringValuePtr(device);
+	}
+	else
+		rb_raise(rb_eTypeError, "wrong argument type (expected String)");
 
 	/* Mark the disc id as unread in case something goes wrong. */
 	rb_iv_set(self, "@read", Qfalse);