mb-discid 0.1.1 → 0.1.2

data/CHANGES

@@ -0,0 +1,20 @@
+= Changelog
+
+== 0.1.2 (2007-07-04)
+* Support the method +put+ to set the TOC information directly instead of
+  reading it from a device.
+* Fixed possible core dump if +read+ was called twice and failed the
+  second time.
+* New to_s method (returns string representation of the ID itself).
+* Complete RDoc documentation.
+
+== 0.1.1 (2007-06-03)
+* Minor changes to source to support MS compiler
+* Provide Win32 binary gem
+* Changed require of library to "require 'mb-discid'" (was "require 'DiscID'"
+  before, which was likely to cause problems)
+
+== 0.1.0 (2007-06-02)
+* Initial release
+
+$Id: CHANGES 94 2007-07-04 19:45:56Z phw $

data/README

@@ -1,7 +1,7 @@
 = MB-DiscID - Ruby bindings for MusicBrainz libdiscid
 
 == About
-MB-DiscID provides Ruby bindings for the MusicBrainz DiscID library libdsicid.
+MB-DiscID provides Ruby bindings for the MusicBrainz DiscID library libdiscid.
 It allows you to calculate MusicBrainz DiscIDs from audio CDs which you can use
 to find the release entry for your CD in the MusicBrainz database. 
 
@@ -12,25 +12,29 @@ http://musicbrainz.org/doc/libdiscid for more information on how to do this.
 === Installation with RubyGems
  gem install mb-discid
  
-== Installation on Windows operating systems.
-For Windows a binary gem "mb-discid-0.1.1-mswin32.gem" is available. To install
-it follow the instructions below:
+=== Installation on Windows operating systems.
+For Windows a binary gem <tt>mb-discid-x.x.x-mswin32.gem</tt> is available. To
+install it follow the instructions below:
 
 1. Make sure you have at least Ruby 1.8.6 installed.
 2. Install RubyGems, if you don't already have it.
-3. Download "libdiscid-0.1.1-win32bin.zip" from
+3. Download <tt>libdiscid-0.1.1-win32bin.zip</tt> from
    http://musicbrainz.org/doc/libdiscid.
-4. Copy the file "discid.dll" from "libdiscid-0.1.1-win32bin.zip" to your Ruby
-   bin directory (normally "C:\ruby\bin".
-5. Run "gem install mb-discid" to install MB-DiscID.
-6. To test the installation try to run "discid.rb" in the examples directory.
+4. Copy the file <tt>discid.dll</tt> from <tt>libdiscid-0.1.1-win32bin.zip</tt>
+   to your Ruby bin directory (normally <tt>C:\ruby\bin</tt>).
+5. Run <tt>gem install mb-discid</tt> to install MB-DiscID.
+6. To test the installation try to run <tt>examples/discid.rb</tt>.
  
 === Installing from source
  rake install
 
 == Usage
-See the files in the examples directory for usage information.
+See the documentation of MusicBrainz::DiscID or the example files in the
++examples+ directory for usage information.
 
 == License
-Copyright (c) 2007, Philipp Wolfer
-Licensing information can be found in the file LICENSE.
+MB-DiscID is Copyright (c) 2007 Philipp Wolfer.
+It is free softare distributed under a BSD style license. See
+LICENSE[link:files/LICENSE.html] for details.
+
+$Id: README 89 2007-06-26 15:09:34Z phw $

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 69 2007-06-03 14:14:25Z phw $
+# $Id: Rakefile 86 2007-06-05 10:27:42Z phw $
 # Copyright (c) 2007, Philipp Wolfer
 # All rights reserved.
 # See LICENSE for permissions.
@@ -7,6 +7,8 @@
 
 require 'rubygems'
 require 'rake/gempackagetask'
+require 'rake/testtask'
+require 'rake/rdoctask'
 
 task :default do
   puts "Please see 'rake --tasks' for an overview of the available tasks."
@@ -15,7 +17,7 @@ end
 # Packaging tasks: -------------------------------------------------------
 
 PKG_NAME     = 'mb-discid'
-PKG_VERSION  = '0.1.1'
+PKG_VERSION  = '0.1.2'
 PKG_SUMMARY  = 'Ruby bindings for libdiscid.'
 PKG_AUTHOR   = 'Philipp Wolfer'
 PKG_EMAIL    = 'phw@rubyforge.org'
@@ -25,11 +27,13 @@ PKG_DESCRIPTION = <<EOF
     for more information on libdiscid and MusicBrainz.
 EOF
 PKG_FILES = FileList[
-  'Rakefile', 'LICENSE', 'README',
+  'Rakefile', 'LICENSE', 'README', 'CHANGES',
   'examples/**/*',
   'ext/**/*.{c,rb}',
-  'lib/**/*.rb'
+  'lib/**/*.rb',
+  'test/**/*.rb'
 ]
+PKG_EXTRA_RDOC_FILES = ['README', 'LICENSE', 'CHANGES']
 
 spec = Gem::Specification.new do |spec|
   spec.name = PKG_NAME
@@ -53,6 +57,8 @@ spec = Gem::Specification.new do |spec|
   spec.email = PKG_EMAIL
   spec.homepage = PKG_HOMEPAGE
   spec.rubyforge_project = 'rbrainz'
+  spec.has_rdoc = true
+  spec.extra_rdoc_files = PKG_EXTRA_RDOC_FILES
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -109,3 +115,22 @@ task :rebuild => [:clobber_build, :build]
 desc 'Remove all files created during the build process'
 task :clobber => [:clobber_build, :clobber_package]
 
+# Test tasks: ------------------------------------------------------------
+
+desc "Run just the unit tests"
+Rake::TestTask.new(:test => [:rebuild]) do |test|
+  test.test_files = FileList['test/test*.rb']
+  test.libs = ['lib', 'ext']
+  test.warning = true
+end
+
+# Documentation tasks: ---------------------------------------------------
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.title    = "MB-DiscID %s" % PKG_VERSION
+  rdoc.main     = 'README'
+  rdoc.rdoc_dir = 'doc/api'
+  rdoc.rdoc_files.include('lib/**/*.rb', 'ext/**/*.c', PKG_EXTRA_RDOC_FILES)
+  rdoc.options << '--inline-source' << '--line-numbers' #<< '--diagram'
+end
+

data/examples/discid.rb

@@ -1,16 +1,29 @@
 #!/usr/bin/env ruby
+#
+# Example script for MB-DiscID.
+# 
+# This script will read the disc ID from the default device and print
+# the results. You can specify an alternate device to use by giving the
+# device's name as the first command line argument.
+# 
+# Example:
+#  ./discid.rb /dev/dvd
+#
+# $Id: discid.rb 84 2007-06-05 00:41:14Z phw $
 
 require 'mb-discid'
 
 # Read the device name from the command line or use the default.
 device = $*[0] ? $*[0] : MusicBrainz::DiscID.default_device
 
+puts "Reading TOC from device '#{device}'."
+
 disc = MusicBrainz::DiscID.new
 disc.read(device)
 
 print <<EOF
+
 DiscID     : #{disc.id}
-Submit via : #{disc.submission_url}
 FreeDB ID  : #{disc.freedb_id}
 First track: #{disc.first_track_num}
 Last track : #{disc.last_track_num}
@@ -22,3 +35,5 @@ disc.tracks do |offset, length|
   puts "Track #{track}: Offset #{offset}, Length #{length}"
   track += 1
 end
+
+puts "\nSubmit via #{disc.submission_url}"

data/ext/extconf.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id: extconf.rb 69 2007-06-03 14:14:25Z phw $
+# $Id: extconf.rb 68 2007-06-03 14:12:21Z phw $
 
 require 'mkmf'
 

data/ext/mb_discid.c

@@ -1,12 +1,14 @@
-/*---------------------------------------------------------------------------
- $Id: mb_discid.c 67 2007-06-03 14:09:23Z phw $
- Copyright (c) 2007, Philipp Wolfer
- All rights reserved.
- See LICENSE for permissions.
-
- Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid
- for more information on libdiscid and MusicBrainz.
----------------------------------------------------------------------------*/
+/**
+ * $Id: mb_discid.c 95 2007-07-04 20:47:24Z phw $
+ *
+ * Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid
+ * for more information on libdiscid and MusicBrainz.
+ * 
+ * Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+ * Copyright:: Copyright (c) 2007, Philipp Wolfer
+ * License::   MB-DiscID is free software distributed under a BSD style license.
+ *             See LICENSE for permissions.
+ */
 
 #include "ruby.h"
 #include "discid/discid.h"
@@ -24,7 +26,7 @@ static VALUE cDiscID;
 /**
  * Returns the DiscID as a string.
  * 
- * Returns nil if no ID was yet read.
+ * Returns +nil+ if no ID was yet read.
  */
 static VALUE mb_discid_id(VALUE self)
 {
@@ -42,7 +44,7 @@ static VALUE mb_discid_id(VALUE self)
 /**
  * Returns a submission URL for the DiscID as a string.
  * 
- * Returns nil if no ID was yet read.
+ * Returns +nil+ if no ID was yet read.
  */
 static VALUE mb_discid_submission_url(VALUE self)
 {
@@ -60,7 +62,7 @@ static VALUE mb_discid_submission_url(VALUE self)
 /**
  * Return a FreeDB DiscID as a string.
  * 
- * Returns nil if no ID was yet read.
+ * Returns +nil+ if no ID was yet read.
  */
 static VALUE mb_discid_freedb_id(VALUE self)
 {
@@ -76,9 +78,9 @@ static VALUE mb_discid_freedb_id(VALUE self)
 }
 
 /**
- * Return the number of the first track on this disc.
+ * Return the number of the first track on this disc (usually 1).
  * 
- * Returns nil if no ID was yet read.
+ * Returns +nil+ if no ID was yet read.
  */
 static VALUE mb_discid_first_track_num(VALUE self)
 {
@@ -96,7 +98,7 @@ static VALUE mb_discid_first_track_num(VALUE self)
 /**
  * Return the number of the last track on this disc.
  * 
- * Returns nil if no ID was yet read.
+ * Returns +nil+ if no ID was yet read.
  */
 static VALUE mb_discid_last_track_num(VALUE self)
 {
@@ -114,7 +116,7 @@ static VALUE mb_discid_last_track_num(VALUE self)
 /**
  * Return the length of the disc in sectors.
  * 
- * Returns nil if no ID was yet read.
+ * Returns +nil+ if no ID was yet read.
  */
 static VALUE mb_discid_sectors(VALUE self)
 {
@@ -130,12 +132,13 @@ static VALUE mb_discid_sectors(VALUE self)
 }
 
 /**
- * Returns an array of [offset, length] tuples for each track.
+ * Returns an array of <tt>[offset, length]</tt> tuples for each track.
  * 
- * If a block is given this method returns nil and instead iterates over the
- * block calling the block with two arguments |offset, length|.
+ * Offset and length are both integer values representing sectors.
+ * If a block is given this method returns +nil+ and instead iterates over the
+ * block calling the block with two arguments <tt>|offset, length|</tt>.
  *
- * Returns always nil if no ID was yet read. The block won't be called in
+ * Returns always +nil+ if no ID was yet read. The block won't be called in
  * this case.
  */
 static VALUE mb_discid_tracks(VALUE self)
@@ -144,14 +147,14 @@ static VALUE mb_discid_tracks(VALUE self)
 		return Qnil;
 	else
 	{
-		DiscId *disc;
-		Data_Get_Struct(self, DiscId, disc);
+		DiscId *disc; /* Pointer to the disc struct */
+		VALUE result = rb_ary_new(); /* Array of all [offset, length] tuples */
+		VALUE tuple; /* Array to store one [offset, length] tuple. */
+		int track;   /* Counter for the track number to process. */
 		
-		{ // Stupid MS compiler.
+		Data_Get_Struct(self, DiscId, disc);
 		
-		VALUE result = rb_ary_new(); // Array of all [offset, length] tuples
-		VALUE tuple; // Array to store one [offset, length] tuple.
-		int track = discid_get_first_track_num(disc); // Track number
+		track = discid_get_first_track_num(disc); /* First track number */
 		while (track <= discid_get_last_track_num(disc))
 		{
 			tuple = rb_ary_new3(2,
@@ -170,8 +173,6 @@ static VALUE mb_discid_tracks(VALUE self)
 			return Qnil;
 		else
 			return result;
-		
-		} // Stupid MS compiler.
 	}
 }
 
@@ -179,39 +180,90 @@ static VALUE mb_discid_tracks(VALUE self)
  * Read the disc ID from the given device.
  * 
  * If no device is given the default device of the platform will be used.
+ * Throws an <tt>Exception</tt> if the CD's TOC can not be read.
  */
 static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 {
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	{ // Stupid MS compiler.
+	DiscId *disc;        /* Pointer to the disc struct */
+	VALUE device = Qnil; /* The device string as a Ruby string */
+	char* cdevice;       /* The device string as a C string */
 	
-	VALUE device = Qnil; // The device string as a Ruby string.
-	char* cdevice;       // The device string as a C string.
+	Data_Get_Struct(self, DiscId, disc);
 	
-	// Check the number of arguments
+	/* Check the number of arguments */
 	if (argc > 1)
 		rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-	// Convert the given device to a T_STRING
-	else if (argc > 0)	
-		device = rb_funcall(argv[0], rb_intern("to_s"), 0, 0);
+	/* Convert the given device to a T_STRING */
+	else if (argc == 1)
+	{
+		if(rb_respond_to(argv[0], rb_intern("to_s")))
+			device = rb_funcall(argv[0], rb_intern("to_s"), 0, 0);
+		else
+			rb_raise(rb_eTypeError, "wrong argument type (expected String)");
+	}
 	
-	// Use the default device if none was given.
+	/* Use the default device if none was given. */
 	if (argc < 1 || RSTRING(device)->len == 0)
 		cdevice = discid_get_default_device();
 	else
 		cdevice = STR2CSTR(device);
 	
-	// Read the discid
+	/* Mark the disc id as unread in case something goes wrong. */
+	rb_iv_set(self, "@read", Qfalse);
+	
+	/* Read the discid */
 	if (discid_read(disc, cdevice) == 0)
 		rb_raise(rb_eException, discid_get_error_msg(disc));
-	else // Remember that we already read the ID.
+	else /* Remember that we already read the ID. */
 		rb_iv_set(self, "@read", Qtrue);
 	
 	return Qnil;
 	
-	} // Stupid MS compiler.
+}
+
+/**
+ * Set the TOC information directly instead of reading it from a device.
+ * 
+ * Use this instead of read if the TOC information was already read elsewhere
+ * and you want to recalculate the ID.
+ * Throws an <tt>Exception</tt> if the CD's TOC can not be read.
+ * 
+ * <b>Parameters:</b>
+ * [first_track] The number of the first track on the disc (usually 1).
+ * [sectors] The total number of sectors on the disc.
+ * [offsets] Array of all track offsets. The number of tracks must not exceed 99.
+ */
+static VALUE mb_discid_put(VALUE self, VALUE first_track, VALUE sectors,
+                           VALUE offsets)
+{
+	DiscId *disc;                       /* Pointer to the disc struct */
+	long length = RARRAY(offsets)->len; /* length of the offsets array */
+	int cfirst  = NUM2INT(first_track); /* number of the first track */
+	int clast   = length + 1 - cfirst;  /* number of the last track */
+	int coffsets[100];                  /* C array to hold the offsets */
+	int i = 1;                          /* Counter for iterating over coffsets*/
+	
+	Data_Get_Struct(self, DiscId, disc);
+	
+	/* Convert the Ruby array to an C array of integers. discid_puts expects
+	   always an offsets array with exactly 100 elements. */
+	coffsets[0] = NUM2INT(sectors); /* 0 is always the leadout track */
+	while (i <= length && i < 100)
+	{
+		coffsets[i] = NUM2INT(rb_ary_entry(offsets, i - 1));
+		i++;
+	}
+	
+	/* Mark the disc id as unread in case something goes wrong. */
+	rb_iv_set(self, "@read", Qfalse);
+	
+	/* Read the discid */
+	if (discid_put(disc, cfirst, clast, coffsets) == 0)
+		rb_raise(rb_eException, discid_get_error_msg(disc));
+	else /* Remember that we already read the ID. */
+		rb_iv_set(self, "@read", Qtrue);
+	
+	return Qnil;
 }
 
 /**
@@ -249,7 +301,8 @@ VALUE mb_discid_default_device(VALUE class)
 /**
  * Initialize the DiscID class and make it available in Ruby.
  */
-void Init_MB_DiscID() {
+void Init_MB_DiscID()
+{
 	mMusicBrainz = rb_define_module("MusicBrainz");
   	cDiscID = rb_define_class_under(mMusicBrainz, "DiscID", rb_cObject);
 	rb_define_singleton_method(cDiscID, "new", mb_discid_new, -1);
@@ -257,6 +310,7 @@ void Init_MB_DiscID() {
 	                           mb_discid_default_device, 0);
 	
   	rb_define_method(cDiscID, "read", mb_discid_read, -1);
+  	rb_define_method(cDiscID, "put", mb_discid_put, 3);
   	rb_define_method(cDiscID, "id", mb_discid_id, 0);
   	rb_define_method(cDiscID, "submission_url", mb_discid_submission_url, 0);
   	rb_define_method(cDiscID, "freedb_id", mb_discid_freedb_id, 0);

data/lib/mb-discid.rb

@@ -1,12 +1,88 @@
-# $Id: mb-discid.rb 67 2007-06-03 14:09:23Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
-
+# $Id: mb-discid.rb 82 2007-06-05 00:21:51Z phw $
+#
 # Just a helper file to allow loading the MB-DiscID library with
 # <tt>require 'mb-discid'</tt>, which is the only recommended way
 # to load the library.
+# 
 # This file may even provide extensions to the library in the future
 # to avoid to have to write everything in C.
+# 
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   MB-DiscID is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'MB_DiscID.so'
+
+module MusicBrainz
+
+  # Class to calculate a MusicBrainz DiscID from an audio CD in the drive.
+  # 
+  # This is basically an interface to the libdiscid C library
+  # (http://musicbrainz.org/doc/libdiscid).
+  # 
+  # == Usage
+  # === Basic Usage:
+  #  
+  #  require 'mb-discid'
+  #  
+  #  # Create a new DiscID object
+  #  disc = MusicBrainz::DiscID.new
+  #  
+  #  # Read the TOC from the default device.
+  #  # An audio CD must be inserted in the drive. An exception will be thrown
+  #  # if the CD can't be read.
+  #  disc.read
+  #  
+  #  # Print information about the disc:
+  #  print <<EOF
+  #  DiscID     : #{disc.id}
+  #  Submit via : #{disc.submission_url}
+  #  FreeDB ID  : #{disc.freedb_id}
+  #  First track: #{disc.first_track_num}
+  #  Last track : #{disc.last_track_num}
+  #  Sectors    : #{disc.sectors}
+  #  EOF
+  #  
+  #  # Print information about individual tracks:
+  #  track = disc.first_track_num
+  #  disc.tracks do |offset, length|
+  #    puts "Track #{track}: Offset #{offset}, Length #{length}"
+  #    track += 1
+  #  end
+  #  
+  # === Specifying the device to read from:
+  # 
+  #  # Create a new DiscID object and read the disc in /dev/dvd:
+  #  disc = MusicBrainz::DiscID.new
+  #  disc.read('/dev/dvd')
+  #  
+  #  # Create a new DiscID object and directly read the disc in /dev/dvd:
+  #  disc = MusicBrainz::DiscID.new('/dev/dvd')
+  #  
+  #  # Create a new DiscID object and directly read the disc in the platform's
+  #  # default device:
+  #  disc = MusicBrainz::DiscID.new(MusicBrainz::DiscID.default_device)
+  #  
+  # === Calculating the DiscID for a given TOC
+  # 
+  #  disc = MusicBrainz::DiscID.new
+  #  
+  #  first_track   = 1
+  #  sectors       = 224556
+  #  track_offsets = [150, 9078, 13528, 34182, 53768, 70987, 96424,
+  #                   118425, 136793, 159514, 179777, 198006]
+  #  
+  #  disc.put(first_track, sectors, track_offsets)
+  #  puts disc.id # Should print "T_prJXQSrqbnH8OE.dgOKsHm5Uw-"
+  #  
+  class DiscID
+    
+    # DiscID to String conversion. Same as calling the method id.
+    def to_s
+      return id.to_s
+    end
+    
+  end
+
+end

data/test/test_discid.rb

@@ -0,0 +1,108 @@
+# $Id: test_discid.rb 95 2007-07-04 20:47:24Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
+
+require 'test/unit'
+require 'mb-discid'
+
+# Helper class which can't be converted into a string.
+class NotAString
+  
+  private
+  
+  def to_s
+  end
+
+end
+
+# Unit test for the MusicBrainz::DiscID class.
+class TestDiscID < Test::Unit::TestCase
+
+  def setup
+    @fiction_disc_id     = 'Wn8eRBtfLDfM0qjYPdxrz.Zjs_U-'
+    @fiction_first_track = 1
+    @fiction_last_track  = 10
+    @fiction_sectors     = 206535
+    @fiction_offsets     = [150, 18901, 39738, 59557, 79152, 100126,
+                            124833, 147278, 166336, 182560]
+    @fiction_lengths     = [18751, 20837, 19819, 19595, 20974,
+                            24707, 22445, 19058, 16224, 23975] 
+  end
+
+  def teardown
+  end
+  
+  # Test reading the disc id from a device.
+  # We would need some kind of small test data to do this.
+  #def test_read
+  #  assert false, "Not implemented yet"
+  #end
+  
+  # Test how read reacts on different arguments.
+  # Those reads should all fail, but they must never cause a segmentation fault.
+  def test_read_invalid_arguments
+    assert_raise(TypeError) {MusicBrainz::DiscID.new(NotAString.new)}
+    assert_raise(Exception) {MusicBrainz::DiscID.new(1)}
+    assert_raise(Exception) {MusicBrainz::DiscID.new('invalid_device')}
+    assert_raise(Exception) {MusicBrainz::DiscID.new(:invalid_device)}
+    assert_raise(ArgumentError) {MusicBrainz::DiscID.new(
+                                           MusicBrainz::DiscID.default_device,
+                                           'second argument')}
+    
+    disc = MusicBrainz::DiscID.new
+    assert_raise(TypeError) {disc.read(NotAString.new)}
+    assert_raise(Exception) {disc.read(1)}
+    assert_raise(Exception) {disc.read('invalid_device')}
+    assert_raise(Exception) {disc.read(:invalid_device)}
+    assert_raise(ArgumentError) {disc.read(MusicBrainz::DiscID.default_device,
+                                           'second argument')}
+  end
+  
+  # Test calculation of the disc id if the TOC information
+  # gets set by the put method.
+  # All attributes should be nil after a failure, even if there was a
+  # successfull put before.
+  def test_put
+    disc = MusicBrainz::DiscID.new
+    assert_equal nil, disc.id
+    assert_equal '', disc.to_s
+    assert_equal nil, disc.first_track_num
+    assert_equal nil, disc.last_track_num
+    assert_equal nil, disc.sectors
+    assert_equal nil, disc.tracks
+    
+    # First erroneous put
+    assert_raise(Exception) {disc.put(-1, @fiction_sectors, @fiction_offsets)}
+    assert_equal nil, disc.id
+    assert_equal '', disc.to_s
+    assert_equal nil, disc.first_track_num
+    assert_equal nil, disc.last_track_num
+    assert_equal nil, disc.sectors
+    assert_equal nil, disc.tracks
+    
+    # Second successfull put
+    assert_nothing_raised {disc.put(@fiction_first_track, @fiction_sectors,
+                                    @fiction_offsets)}
+    assert_equal @fiction_disc_id, disc.id
+    assert_equal @fiction_disc_id, disc.to_s
+    assert_equal @fiction_first_track, disc.first_track_num
+    assert_equal @fiction_last_track, disc.last_track_num
+    assert_equal @fiction_sectors, disc.sectors
+    assert_equal @fiction_offsets, disc.tracks.map{|t| t[0]}
+    assert_equal @fiction_lengths, disc.tracks.map{|t| t[1]}
+    
+    # Third erroneous put
+    assert_raise(Exception) {disc.put(@fiction_first_track, @fiction_sectors, 
+                                      Array.new(100, 1))}
+    assert_equal nil, disc.id
+    assert_equal '', disc.to_s
+    assert_equal nil, disc.first_track_num
+    assert_equal nil, disc.last_track_num
+    assert_equal nil, disc.sectors
+    assert_equal nil, disc.tracks
+  end
+  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mb-discid
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-06-03 00:00:00 +02:00
+  version: 0.1.2
+date: 2007-07-04 00:00:00 +02:00
 summary: Ruby bindings for libdiscid.
 require_paths: 
 - lib
@@ -16,7 +16,7 @@ description: Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdisc
 autorequire: mb-discid
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -33,16 +33,20 @@ files:
 - Rakefile
 - LICENSE
 - README
+- CHANGES
 - examples/discid.rb
 - ext/mb_discid.c
 - ext/extconf.rb
 - lib/mb-discid.rb
+- test/test_discid.rb
 test_files: []
 
 rdoc_options: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
+- LICENSE
+- CHANGES
 executables: []
 
 extensions: