mb-discid 0.1.2 → 0.1.3

data/CHANGES

@@ -1,5 +1,11 @@
 = Changelog
 
+== 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
+* Added method +track_info+ for accessing more detailed information about tracks
+* Fixed building with Ruby 1.9 (Mihaly Csomay)
+
 == 0.1.2 (2007-07-04)
 * Support the method +put+ to set the TOC information directly instead of
   reading it from a device.
@@ -17,4 +23,4 @@
 == 0.1.0 (2007-06-02)
 * Initial release
 
-$Id: CHANGES 94 2007-07-04 19:45:56Z phw $
+$Id: CHANGES 298 2009-11-19 09:26:45Z phw $

data/README

@@ -5,6 +5,10 @@ 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. 
 
+== Requirements
+* Ruby >= 1.8.6
+* libdiscid >= 0.1.0
+
 == Installation
 Before installing rdiscid make sure you have libdiscid installed. See
 http://musicbrainz.org/doc/libdiscid for more information on how to do this.
@@ -32,9 +36,19 @@ install it follow the instructions below:
 See the documentation of MusicBrainz::DiscID or the example files in the
 +examples+ directory for usage information.
 
+== Contact
+MB-DiscID is part of the RBrainz project which provides a library to query
+the MusicBrainz XML web service. For more information about MB-DiscID or
+RBrainz visit http://rbrainz.rubyforge.org.
+
+If you have any questions or suggestions regarding MB-DiscID please write to
+the rbrainz-user mailinglist[http://rubyforge.org/mail/?group_id=3677].
+If you find bugs or if you have any feature requests please use the
+RBrainz bug tracker[http://rubyforge.org/tracker/?group_id=3677]. 
+
 == 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 $
+$Id: README 298 2009-11-19 09:26:45Z phw $

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 86 2007-06-05 10:27:42Z phw $
+# $Id: Rakefile 296 2009-11-18 22:09:36Z phw $
 # Copyright (c) 2007, Philipp Wolfer
 # All rights reserved.
 # See LICENSE for permissions.
@@ -17,7 +17,7 @@ end
 # Packaging tasks: -------------------------------------------------------
 
 PKG_NAME     = 'mb-discid'
-PKG_VERSION  = '0.1.2'
+PKG_VERSION  = '0.1.3'
 PKG_SUMMARY  = 'Ruby bindings for libdiscid.'
 PKG_AUTHOR   = 'Philipp Wolfer'
 PKG_EMAIL    = 'phw@rubyforge.org'
@@ -28,7 +28,7 @@ PKG_DESCRIPTION = <<EOF
 EOF
 PKG_FILES = FileList[
   'Rakefile', 'LICENSE', 'README', 'CHANGES',
-  'examples/**/*',
+  'examples/**/*.rb',
   'ext/**/*.{c,rb}',
   'lib/**/*.rb',
   'test/**/*.rb'
@@ -48,6 +48,7 @@ spec = Gem::Specification.new do |spec|
     spec.platform = Gem::Platform::RUBY
     spec.files = PKG_FILES
     spec.extensions << 'ext/extconf.rb'
+    spec.required_ruby_version = ">= 1.8.6"
   end
   spec.requirements << 'libdiscid (http://musicbrainz.org/doc/libdiscid)'
   spec.require_paths = ['lib', 'ext']
@@ -130,7 +131,7 @@ 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.rdoc_files.include('ext/**/*.c', 'lib/**/*.rb', PKG_EXTRA_RDOC_FILES)
   rdoc.options << '--inline-source' << '--line-numbers' #<< '--diagram'
 end
 

data/examples/discid.rb

@@ -9,31 +9,49 @@
 # Example:
 #  ./discid.rb /dev/dvd
 #
-# $Id: discid.rb 84 2007-06-05 00:41:14Z phw $
+# $Id: discid.rb 201 2008-02-13 14:59:48Z phw $
 
 require 'mb-discid'
 
 # Read the device name from the command line or use the default.
 device = $*[0] ? $*[0] : MusicBrainz::DiscID.default_device
 
+# Create a new DiscID object and read the disc information.
+# In case of errors exit the application.
 puts "Reading TOC from device '#{device}'."
+begin
+  disc = MusicBrainz::DiscID.new
+  disc.read(device)
+  
+  # Instead of reading from a device we could set the TOC directly:
+  # disc.put(1, 82255, [150, 16157, 35932, 57527])
+rescue Exception => e
+  puts e
+  exit(1)
+end
 
-disc = MusicBrainz::DiscID.new
-disc.read(device)
-
+# Print information about the disc:
 print <<EOF
 
-DiscID     : #{disc.id}
-FreeDB ID  : #{disc.freedb_id}
-First track: #{disc.first_track_num}
-Last track : #{disc.last_track_num}
-Sectors    : #{disc.sectors}
+DiscID      : #{disc.id}
+FreeDB ID   : #{disc.freedb_id}
+First track : #{disc.first_track_num}
+Last track  : #{disc.last_track_num}
+Total length: #{disc.seconds} seconds
+Sectors     : #{disc.sectors}
 EOF
 
-track = disc.first_track_num
-disc.tracks do |offset, length|
-  puts "Track #{track}: Offset #{offset}, Length #{length}"
-  track += 1
+# Print information about individual tracks:
+disc.track_details do |track_info|
+  puts "Track ##{track_info.number}"
+  puts "  Length: %02d:%02d (%i sectors)" %
+      [track_info.seconds / 60, track_info.seconds % 60, track_info.sectors]
+  puts "  Start : %02d:%02d (sector %i)" %
+      [track_info.start_time / 60, track_info.start_time % 60, track_info.start_sector]
+  puts "  End   : %02d:%02d (sector %i)" %
+      [track_info.end_time / 60, track_info.end_time % 60, track_info.end_sector]
 end
 
+# Print a submission URL that can be used to submit
+# the disc ID to MusicBrainz.org.
 puts "\nSubmit via #{disc.submission_url}"

data/ext/mb_discid.c

@@ -1,5 +1,5 @@
 /**
- * $Id: mb_discid.c 95 2007-07-04 20:47:24Z phw $
+ * $Id: mb_discid.c 297 2009-11-18 22:18:10Z phw $
  *
  * Ruby bindings for libdiscid. See http://musicbrainz.org/doc/libdiscid
  * for more information on libdiscid and MusicBrainz.
@@ -24,6 +24,9 @@ static VALUE mMusicBrainz;
 static VALUE cDiscID;
 
 /**
+ * call-seq:
+ *  id() -> string or nil
+ * 
  * Returns the DiscID as a string.
  * 
  * Returns +nil+ if no ID was yet read.
@@ -42,6 +45,9 @@ static VALUE mb_discid_id(VALUE self)
 }
 
 /**
+ * call-seq:
+ *  submission_url() -> string or nil
+ * 
  * Returns a submission URL for the DiscID as a string.
  * 
  * Returns +nil+ if no ID was yet read.
@@ -60,7 +66,10 @@ static VALUE mb_discid_submission_url(VALUE self)
 }
 
 /**
- * Return a FreeDB DiscID as a string.
+ * call-seq:
+ *  freedb_id() -> string or nil
+ * 
+ * Returns a FreeDB DiscID as a string.
  * 
  * Returns +nil+ if no ID was yet read.
  */
@@ -78,6 +87,9 @@ static VALUE mb_discid_freedb_id(VALUE self)
 }
 
 /**
+ * call-seq:
+ *  first_track_num() -> int or nil
+ * 
  * Return the number of the first track on this disc (usually 1).
  * 
  * Returns +nil+ if no ID was yet read.
@@ -96,6 +108,9 @@ static VALUE mb_discid_first_track_num(VALUE self)
 }
 
 /**
+ * call-seq:
+ *  last_track_num() -> int or nil
+ * 
  * Return the number of the last track on this disc.
  * 
  * Returns +nil+ if no ID was yet read.
@@ -114,6 +129,9 @@ static VALUE mb_discid_last_track_num(VALUE self)
 }
 
 /**
+ * call-seq:
+ *  sectors() -> int or nil
+ * 
  * Return the length of the disc in sectors.
  * 
  * Returns +nil+ if no ID was yet read.
@@ -132,6 +150,10 @@ static VALUE mb_discid_sectors(VALUE self)
 }
 
 /**
+ * call-seq:
+ *  tracks() -> array
+ *  tracks() {|offset, length| block }
+ * 
  * Returns an array of <tt>[offset, length]</tt> tuples for each track.
  * 
  * Offset and length are both integer values representing sectors.
@@ -140,6 +162,9 @@ static VALUE mb_discid_sectors(VALUE self)
  *
  * Returns always +nil+ if no ID was yet read. The block won't be called in
  * this case.
+ *
+ * You may want to use the method track_details instead of this method to
+ * retrieve more detailed information about the tracks.
  */
 static VALUE mb_discid_tracks(VALUE self)
 {
@@ -177,10 +202,15 @@ static VALUE mb_discid_tracks(VALUE self)
 }
 
 /**
+ * call-seq:
+ *  read(device=nil)
+ * 
  * 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.
+ * Throws an _Exception_ if the CD's TOC can not be read.
+ *
+ * Raises:: ArgumentError, TypeError, Exception
  */
 static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 {
@@ -190,23 +220,18 @@ static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 	
 	Data_Get_Struct(self, DiscId, disc);
 	
-	/* 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 == 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)");
-	}
+	/* 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)");
 	
 	/* Use the default device if none was given. */
-	if (argc < 1 || RSTRING(device)->len == 0)
+	if (device == Qnil)
 		cdevice = discid_get_default_device();
 	else
-		cdevice = STR2CSTR(device);
+		cdevice = StringValuePtr(device);
 	
 	/* Mark the disc id as unread in case something goes wrong. */
 	rb_iv_set(self, "@read", Qfalse);
@@ -222,22 +247,27 @@ static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 }
 
 /**
+ * call-seq:
+ *  put(first_track, sectors, offsets)
+ * 
  * 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.
+ * Throws an _Exception_ 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.
+ *
+ * Raises:: Exception
  */
 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 */
+	long length = RARRAY_LEN(offsets);  /* 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 */
@@ -267,30 +297,38 @@ static VALUE mb_discid_put(VALUE self, VALUE first_track, VALUE sectors,
 }
 
 /**
+ * call-seq:
+ *  MusicBrainz::DiscID.new(device=nil) -> obj
+ *
  * Construct a new DiscID object.
  * 
  * As an optional argument the name of the device to read the ID from
  * may be given. If you don't specify a device here you can later read
  * the ID with the read method.
+ *
+ * Raises:: ArgumentError, TypeError, Exception
  */
 VALUE mb_discid_new(int argc, VALUE *argv, VALUE class)
 {
 	DiscId *disc = discid_new();
 	VALUE tdata = Data_Wrap_Struct(class, 0, discid_free, disc);
+	VALUE device = Qnil;
 	rb_obj_call_init(tdata, 0, 0);
 	rb_iv_set(tdata, "@read", Qfalse);
 	
-	// Check the number of arguments
-	if (argc > 1)
-		rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-	// If a device was given try to read the disc id from this device.
-	else if (argc > 0)
-		rb_funcall(tdata, rb_intern("read"), 1, argv[0]);
+	/* Check the number of arguments */
+	rb_scan_args(argc, argv, "01", &device);
+	
+	if (device != Qnil)
+		rb_funcall(tdata, rb_intern("read"), 1, device);
 	
 	return tdata;
 }
 
 /**
+ * call-seq:
+ *  MusicBrainz::DiscID.default_device(device=nil) -> string
+ *
  * Returns a device string for the default device for this platform.
  */
 VALUE mb_discid_default_device(VALUE class)
@@ -304,18 +342,18 @@ VALUE mb_discid_default_device(VALUE class)
 void Init_MB_DiscID()
 {
 	mMusicBrainz = rb_define_module("MusicBrainz");
-  	cDiscID = rb_define_class_under(mMusicBrainz, "DiscID", rb_cObject);
+	cDiscID = rb_define_class_under(mMusicBrainz, "DiscID", rb_cObject);
 	rb_define_singleton_method(cDiscID, "new", mb_discid_new, -1);
 	rb_define_singleton_method(cDiscID, "default_device",
 	                           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);
-  	rb_define_method(cDiscID, "first_track_num", mb_discid_first_track_num, 0);
-  	rb_define_method(cDiscID, "last_track_num", mb_discid_last_track_num, 0);
-  	rb_define_method(cDiscID, "sectors", mb_discid_sectors, 0);
-  	rb_define_method(cDiscID, "tracks", mb_discid_tracks, 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);
+	rb_define_method(cDiscID, "first_track_num", mb_discid_first_track_num, 0);
+	rb_define_method(cDiscID, "last_track_num", mb_discid_last_track_num, 0);
+	rb_define_method(cDiscID, "sectors", mb_discid_sectors, 0);
+	rb_define_method(cDiscID, "tracks", mb_discid_tracks, 0);
 }

data/lib/mb-discid.rb

@@ -1,4 +1,4 @@
-# $Id: mb-discid.rb 82 2007-06-05 00:21:51Z phw $
+# $Id: mb-discid.rb 201 2008-02-13 14:59:48Z phw $
 #
 # Just a helper file to allow loading the MB-DiscID library with
 # <tt>require 'mb-discid'</tt>, which is the only recommended way
@@ -26,31 +26,45 @@ module MusicBrainz
   #  
   #  require 'mb-discid'
   #  
-  #  # Create a new DiscID object
+  #  # 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
+  #  begin
+  #    disc.read
+  #  rescue Exception => e
+  #    puts e
+  #    exit(1)
+  #  end
   #  
   #  # 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}
+  #  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}
+  #  Total length: #{disc.seconds} seconds
+  #  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
+  #  disc.track_details do |track_info|
+  #    puts "Track ##{track_info.number}"
+  #    puts "  Length: %02d:%02d (%i sectors)" %
+  #       [track_info.seconds / 60, track_info.seconds % 60, track_info.sectors]
+  #    puts "  Start : %02d:%02d (sector %i)" % 
+  #       [track_info.start_time / 60, track_info.start_time % 60, track_info.start_sector]
+  #    puts "  End   : %02d:%02d (sector %i)" %
+  #       [track_info.end_time / 60, track_info.end_time % 60, track_info.end_sector]
   #  end
   #  
+  #  # Print a submission URL that can be used to submit
+  #  # the disc ID to MusicBrainz.org.
+  #  puts "\nSubmit via #{disc.submission_url}"
+  #  
   # === Specifying the device to read from:
   # 
   #  # Create a new DiscID object and read the disc in /dev/dvd:
@@ -77,10 +91,137 @@ module MusicBrainz
   #  puts disc.id # Should print "T_prJXQSrqbnH8OE.dgOKsHm5Uw-"
   #  
   class DiscID
+  
+    # This class holds information about a single track.
+    # 
+    # Currently this includes the following fields:
+    # [number]       The number of the track on the disc.
+    # [sectors]      Length of the track in sectors.
+    # [start_sector] Start position of the track on the disc in sectors.
+    # [end_sector]   End position of the track on the disc in sectors.
+    # [seconds]      Length of the track in seconds.
+    # [start_time]   Start position of the track on the disc in seconds.
+    # [end_time]     End position of the track on the disc in seconds.
+    # 
+    # You can access all fields either with directly or with the square bracket
+    # notation:
+    # 
+    #  track = TrackInfo.new(1, 150, 16007)
+    #  puts track.sectors   # 16007
+    #  puts track[:sectors] # 16007
+    #  
+    # See:: DiscID#track_details
+    class TrackInfo
+      
+      # The number of the track on the disc.
+      attr_reader :number
+      
+      # Length of the track in sectors.
+      attr_reader :sectors
+      
+      # Start position of the track on the disc in sectors.
+      attr_reader :start_sector
+      
+      # Returns a new TrackInfo.
+      def initialize(number, offset, length)
+        @number = number
+        @start_sector = offset
+        @sectors = length
+      end
+      
+      # End position of the track on the disc in sectors.
+      def end_sector
+        start_sector + sectors
+      end
+      
+      # Length of the track in seconds.
+      def seconds
+        DiscID.sectors_to_seconds(sectors)
+      end
+      
+      # Start position of the track on the disc in seconds.
+      def start_time
+        DiscID.sectors_to_seconds(start_sector)
+      end
+      
+      # End position of the track on the disc in seconds.
+      def end_time
+        DiscID.sectors_to_seconds(end_sector)
+      end
+      
+      # Allows access to all fields similar to accessing values in a hash.
+      # 
+      # Example:
+      #  track = TrackInfo.new(1, 150, 16007)
+      #  puts track.sectors   # 16007
+      #  puts track[:sectors] # 16007
+      def [](key)
+        if [:number, :sectors, :start_sector, :end_sector,
+            :seconds, :start_time, :end_time].include?(key.to_sym)
+          method(key).call
+        end
+      end
+      
+      # Converts the TrackInfo into a Hash.
+      def to_hash
+        {
+        :sectors      => sectors,
+        :start_sector => start_sector,
+        :end_sector   => end_sector,
+        :seconds      => seconds,
+        :start_time   => start_time,
+        :end_time     => end_time,
+        }
+      end
+      
+    end
     
-    # DiscID to String conversion. Same as calling the method id.
+    # DiscID to String conversion. Same as calling the method id but guaranteed
+    # to return a string.
     def to_s
-      return id.to_s
+      id.to_s
+    end
+    
+    # Return the length of the disc in sectors.
+    # 
+    # Returns <tt>nil</tt> if no ID was yet read. 
+    def seconds
+      DiscID.sectors_to_seconds(sectors) unless @read == false
+    end
+    
+    # Returns an array of TrackInfo objects. Each TrackInfo object contains
+    # detailed information about the track.
+    # 
+    # If a block is given this method returns <tt>nil</tt> and instead iterates
+    # over the block calling the block with one argument <tt>|track_info|</tt>.
+    # 
+    # Returns always <tt>nil</tt> if no ID was yet read. The block won't be
+    # called in this case.
+    def track_details
+      unless @read == false
+        track_number = self.first_track_num - 1
+        tracks = []
+        
+        self.tracks do |offset, length|
+          track_number += 1
+          track_info = TrackInfo.new(track_number, offset, length)
+          
+          if block_given?
+            yield track_info
+          else
+            tracks << track_info
+          end
+        end
+        
+        return tracks unless block_given?
+      end
+    end
+    
+    # Converts sectors to seconds.
+    # 
+    # According to the red book standard 75 sectors are one second.
+    def self.sectors_to_seconds(sectors)
+      return (sectors.to_f / 75).round
     end
     
   end

data/test/test_discid.rb

@@ -1,4 +1,4 @@
-# $Id: test_discid.rb 95 2007-07-04 20:47:24Z phw $
+# $Id: test_discid.rb 236 2009-05-07 05:58:07Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -26,10 +26,11 @@ class TestDiscID < Test::Unit::TestCase
     @fiction_first_track = 1
     @fiction_last_track  = 10
     @fiction_sectors     = 206535
+    @fiction_seconds     = 2754
     @fiction_offsets     = [150, 18901, 39738, 59557, 79152, 100126,
                             124833, 147278, 166336, 182560]
     @fiction_lengths     = [18751, 20837, 19819, 19595, 20974,
-                            24707, 22445, 19058, 16224, 23975] 
+                            24707, 22445, 19058, 16224, 23975]
   end
 
   def teardown
@@ -72,6 +73,7 @@ class TestDiscID < Test::Unit::TestCase
     assert_equal nil, disc.first_track_num
     assert_equal nil, disc.last_track_num
     assert_equal nil, disc.sectors
+    assert_equal nil, disc.seconds
     assert_equal nil, disc.tracks
     
     # First erroneous put
@@ -81,6 +83,7 @@ class TestDiscID < Test::Unit::TestCase
     assert_equal nil, disc.first_track_num
     assert_equal nil, disc.last_track_num
     assert_equal nil, disc.sectors
+    assert_equal nil, disc.seconds
     assert_equal nil, disc.tracks
     
     # Second successfull put
@@ -91,6 +94,7 @@ class TestDiscID < Test::Unit::TestCase
     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_seconds, disc.seconds
     assert_equal @fiction_offsets, disc.tracks.map{|t| t[0]}
     assert_equal @fiction_lengths, disc.tracks.map{|t| t[1]}
     
@@ -102,7 +106,68 @@ class TestDiscID < Test::Unit::TestCase
     assert_equal nil, disc.first_track_num
     assert_equal nil, disc.last_track_num
     assert_equal nil, disc.sectors
+    assert_equal nil, disc.seconds
     assert_equal nil, disc.tracks
   end
   
+  # Test the track info method and TrackInfo objects
+  def test_track_details
+    disc = MusicBrainz::DiscID.new
+    
+    assert_equal nil, disc.track_details
+    assert_nothing_raised {disc.put(@fiction_first_track, @fiction_sectors,
+                                    @fiction_offsets)}
+    
+    
+    # Save a block for testing each track
+    number = 0
+    proc_test_track = lambda do |track|
+      assert_equal number + 1, track.number
+      
+      assert_equal @fiction_offsets[number], track.start_sector
+      assert_equal @fiction_lengths[number], track.sectors
+      assert_equal @fiction_offsets[number]+ @fiction_lengths[number],
+                   track.end_sector
+                   
+      assert_equal MusicBrainz::DiscID.sectors_to_seconds(@fiction_offsets[number]),
+                   track.start_time
+      assert_equal MusicBrainz::DiscID.sectors_to_seconds(@fiction_lengths[number]),
+                   track.seconds
+      assert_equal MusicBrainz::DiscID.sectors_to_seconds(
+                     @fiction_offsets[number]+ @fiction_lengths[number]),
+                   track.end_time
+      
+      assert_equal track.number, track[:number]
+      assert_equal track.sectors, track[:sectors]
+      assert_equal track.start_sector, track[:start_sector]
+      assert_equal track.end_sector, track[:end_sector]
+      assert_equal track.seconds, track[:seconds]
+      assert_equal track.start_time, track[:start_time]
+      assert_equal track.end_time, track[:end_time]
+      
+      assert_equal nil, track[:invalid_value]
+      
+      number += 1
+    end
+    
+    # Call track_info and retrieve an Array
+    track_info = []                               
+    assert_nothing_raised {track_info = disc.track_details}
+    assert track_info.is_a?(Array)
+    track_info.each(&proc_test_track)
+    assert_equal disc.last_track_num, number
+    
+    # Calling track_info directly with a given block
+    number = 0 # Reset the number of tracks (the above block is a closure, so this works)
+    assert_equal nil, disc.track_details(&proc_test_track)
+    assert_equal disc.last_track_num, number
+  end
+  
+  # Test the conversion from sectors to seconds
+  def test_sectors_to_seconds
+    assert_equal 0, MusicBrainz::DiscID.sectors_to_seconds(0)
+    assert_equal @fiction_seconds,
+                 MusicBrainz::DiscID.sectors_to_seconds(@fiction_sectors)
+  end
+  
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: mb-discid
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-07-04 00:00:00 +02:00
+  version: 0.1.3
+date: 2009-11-19 00:00:00 +01:00
 summary: Ruby bindings for libdiscid.
 require_paths: 
 - lib
@@ -19,9 +19,9 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 0.0.0
+      version: 1.8.6
   version: 
 platform: ruby
 signing_key: