rbrainz 0.2.0 → 0.2.1

data/CHANGES

@@ -1,5 +1,17 @@
 = Changelog
 
+== 0.2.1 (2007-07-24)
+* Erroneous date strings in the XML are ignored. No error is raised and nil
+  is set for the date.
+* MBXML#get_entity_list now returns an ScoredCollection even if no list-element
+  is present in the XML. This is due to the fact that musicbrainz.org always
+  returns an empty result <metadata/> if no matching entities were found.
+* Removed custom eql? and include? methods from Range and added them to
+  IncompleteDate. Those methods changed the behaviour of Range which might lead
+  to unexcpected results in programs using RBrainz.
+* Changed IncompleteDate to include its end value.
+* Added additional examples
+
 == 0.2.0 (2007-07-19)
 * Querying of collections implemented
 * Collection class to store search results (with support for search score and offset)
@@ -28,4 +40,4 @@
 == 0.1.0 (2007-05-23)
 * Initial release
 
-$Id: CHANGES 145 2007-07-19 13:11:44Z phw $
+$Id: CHANGES 156 2007-07-24 17:47:07Z phw $

data/examples/getlabel.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+#
+# Example script which queries the database for an
+# label and displays the label's data.
+# 
+# $Id: getlabel.rb 150 2007-07-24 08:16:16Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# The label's MusicBrainz ID.
+# Either read it from the command line as the first
+# parameter or use a default one for demonstration.
+id = $*[0] ? $*[0] : '727ad90b-7ef4-48d2-8f16-c34016544822'
+
+# Generate a new label MBID object from the ID:
+mbid = Model::MBID.parse(id, :label)
+
+# Define what information about the label
+# should be included in the result.
+# In this case the label's aliases will be
+# fetched as well.
+label_includes = Webservice::LabelIncludes.new(
+  :aliases => true
+)
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new
+
+# Now query the MusicBrainz database for the label
+# with the MBID defined above.
+# We could as well use the ID string directly instead
+# of the MBID object.
+label = query.get_label_by_id(mbid, label_includes)
+
+# Display the fetched label data together with all
+# unique release titles.
+print <<EOF
+ID            : #{label.id.uuid}
+Name          : #{label.name}
+Sort name     : #{label.sort_name}
+Disambiguation: #{label.disambiguation}
+Type          : #{label.type}
+Begin date    : #{label.begin_date}
+End date      : #{label.end_date}
+Aliases       : #{label.aliases.to_a.join('; ')}
+EOF

data/examples/getrelease.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+#
+# Example script which queries the database for an
+# release and displays the release's data.
+# 
+# $Id: getrelease.rb 150 2007-07-24 08:16:16Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# The release's MusicBrainz ID.
+# Either read it from the command line as the first
+# parameter or use a default one for demonstration.
+id = $*[0] ? $*[0] : '6785cad0-159c-40ec-9ee4-30d8745dd7f9'
+
+# Generate a new release MBID object from the ID:
+mbid = Model::MBID.parse(id, :release)
+
+# Define what information about the release
+# should be included in the result.
+# In this case the release artist and the tracks
+# on the release will be fetched as well.
+release_includes = Webservice::ReleaseIncludes.new(
+  :artist => true,
+  :tracks => true
+)
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new
+
+# Now query the MusicBrainz database for the release
+# with the MBID defined above.
+# We could as well use the ID string directly instead
+# of the MBID object.
+release = query.get_release_by_id(mbid, release_includes)
+
+# Display the fetched release data together with all
+# unique release titles.
+print <<EOF
+ID            : #{release.id.uuid}
+Title         : #{release.title}
+Artist        : #{release.artist.unique_name}
+Tracks        : #{release.tracks.to_a.join("\r\n                ")}
+EOF

data/examples/gettrack.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+#
+# Example script which queries the database for an
+# track and displays the track's data.
+# 
+# $Id: gettrack.rb 150 2007-07-24 08:16:16Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# The track's MusicBrainz ID.
+# Either read it from the command line as the first
+# parameter or use a default one for demonstration.
+id = $*[0] ? $*[0] : 'c29715ad-9a28-4f2b-9b64-4b899b06ac2a'
+
+# Generate a new track MBID object from the ID:
+mbid = Model::MBID.parse(id, :track)
+
+# Define what information about the track
+# should be included in the result.
+# In this case the track artist and the releases
+# the track appears on will be fetched as well.
+track_includes = Webservice::TrackIncludes.new(
+  :artist => true,
+  :releases => true
+)
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new
+
+# Now query the MusicBrainz database for the track
+# with the MBID defined above.
+# We could as well use the ID string directly instead
+# of the MBID object.
+track = query.get_track_by_id(mbid, track_includes)
+
+# Display the fetched track data together with all
+# unique track titles.
+print <<EOF
+ID            : #{track.id.uuid}
+Title         : #{track.title}
+Duration      : #{track.duration/1000} seconds
+Artist        : #{track.artist.unique_name}
+Release       : #{track.releases.to_a.join("\r\n                ")}
+EOF

data/examples/searchlabels.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+#
+# Example script which searches the database for
+# labels and displays the label's data.
+# 
+# $Id: searchlabels.rb 150 2007-07-24 08:16:16Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# Define the search parameters: Search for labels with the
+# name "Paradise Lost" and return a maximum of 10 labels.
+label_filter = Webservice::LabelFilter.new(
+  :name  => 'Century',
+  :limit => 10
+)
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new
+
+# Now query the MusicBrainz database for labels
+# with the search parameters defined above.
+labels = query.get_labels(label_filter)
+
+# Display the fetched label's names and the score, which
+# indicates how good the label matches the search parameters.
+labels.each do |entry|
+  print "%s (%i%%)\r\n" % [entry.entity.unique_name, entry.score]
+end

data/examples/searchreleases.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+#
+# Example script which searches the database for
+# releases and displays the release data.
+# 
+# $Id: searchreleases.rb 150 2007-07-24 08:16:16Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# Define the search parameters: Search for releases with the
+# title "Paradise Lost" and return a maximum of 10 releases.
+release_filter = Webservice::ReleaseFilter.new(
+  :title  => 'Draconian Times',
+  :limit => 10
+)
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new
+
+# Now query the MusicBrainz database for releases
+# with the search parameters defined above.
+releases = query.get_releases(release_filter)
+
+# Display the fetched release titles and the score, which
+# indicates how good the release matches the search parameters.
+releases.each do |entry|
+  print "%s (%i%%)\r\n" % [entry.entity.title, entry.score]
+end

data/examples/searchtracks.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+#
+# Example script which searches the database for
+# tracks and displays the track data.
+# 
+# $Id: searchtracks.rb 150 2007-07-24 08:16:16Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# Define the search parameters: Search for releases with the
+# title "Paradise Lost" and return a maximum of 10 releases.
+track_filter = Webservice::TrackFilter.new(
+  :title  => 'Shadowkings',
+  :limit => 10
+)
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new
+
+# Now query the MusicBrainz database for tracks
+# with the search parameters defined above.
+tracks = query.get_tracks(track_filter)
+
+# Display the fetched track titles and the score, which
+# indicates how good the track matches the search parameters.
+tracks.each do |entry|
+  print "%s: \"%s\" (%i%%)\r\n" % [entry.entity.artist, entry.entity.title, entry.score]
+end

data/lib/rbrainz/core_ext/range.rb

@@ -1,4 +1,4 @@
-# $Id: range.rb 136 2007-07-16 15:45:32Z phw $
+# $Id: range.rb 154 2007-07-24 12:39:02Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -8,21 +8,8 @@
 require File.dirname(__FILE__) + '/range/equality'
 
 class Range  #:nodoc:
-  include MusicBrainz::CoreExtensions::Range::Equality
-
-  alias :old_eql? :eql?
-  def eql?(b)
-    if b.kind_of? ::Range
-      self.begin == b.begin && self.open_end == b.open_end
-    else
-      self.begin == b && self.open_end == b.succ
-    end
-  end
-  remove_method :==
-  alias :== :eql?
 
-  alias :old_include? :include?
-  def include?(b)
-    self.started_by?(b) || self.contains?(b) || self.eql?(b) || self.finished_by?(b)
-  end
+  # Extend Range with additional comparison operations.
+  include MusicBrainz::CoreExtensions::Range::Equality
+  
 end

data/lib/rbrainz/core_ext/range/equality.rb

@@ -1,4 +1,4 @@
-# $Id: equality.rb 137 2007-07-17 08:00:06Z phw $
+# $Id: equality.rb 154 2007-07-24 12:39:02Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -211,13 +211,6 @@ Allready exists in Range so we can't define it in the module
           self.starts?(b) || self.during?(b) || self.finishes?(b)
         end
 
-=begin comment
-Allready exists in Range so we can't define it in the module
-        def include?(b)
-          self.started_by?(b) || self.contains?(b) || self.eql?(b) || self.finished_by?(b)
-        end
-=end
-
         protected
         def open_end # :nodoc:
           if self.exclude_end?

data/lib/rbrainz/model/incomplete_date.rb

@@ -1,4 +1,4 @@
-# $Id: incomplete_date.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: incomplete_date.rb 154 2007-07-24 12:39:02Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -10,10 +10,16 @@ require 'date'
 module MusicBrainz
   module Model
 
-    # Represents an incomplete date. An incomplete date is
-    # a date which can be defined without day or without
-    # month and day. It can be written as <em>YYYY</em>,
-    # <em>YYYY-MM</em> or <em>YYYY-MM-DD</em>.
+    # Represents an incomplete date. An incomplete date is a date which can be
+    # defined without day or without month and day. It can be written as
+    # <em>YYYY</em>, <em>YYYY-MM</em> or <em>YYYY-MM-DD</em>.
+    # 
+    # An IncompleteDate is a Range of Date objects. The incomplete date
+    # <em>1969-01</em> for example results in a range beginning on 1969-01-01
+    # and ending on 1969-01-31, including the end.
+    # 
+    # RBrainz extends the Ruby Range class with additional comparison methods.
+    # See CoreExtensions::Range::Equality for a description of those methods.
     class IncompleteDate < ::Range
       attr_reader :year, :month, :day
 
@@ -28,16 +34,16 @@ module MusicBrainz
           if @month
             if @day
               start_d = Date.civil( @year, @month, @day)
-              end_d = start_d.succ
+              end_d = start_d
             else
               start_d = Date.civil( @year, @month)
-              end_d = Date.civil( @year, @month+1)
+              end_d = Date.civil( @year, @month, -1)
             end
           else
             start_d = Date.civil( @year)
-            end_d = Date.civil( @year+1)
+            end_d = Date.civil( @year, -1, -1)
           end
-          super( start_d, end_d, true)
+          super( start_d, end_d)
         else
           raise ArgumentError, "Invalid incomplete date #{date}"
         end
@@ -54,6 +60,36 @@ module MusicBrainz
         }
         return date
       end
+      
+      # Compare two IncompleteDate objects for equality.
+      # 
+      # You can compare an IncompleteDate with another IncompleteDate, with
+      # a Range of Date objects or directly with a Date. The following examples
+      # all return true:
+      # 
+      #  IncompleteDate.new('1969-01-05').eql?( IncompleteDate.new('1969-01-05') )
+      #  IncompleteDate.new('1969-01-05').eql?( Date.civil(1969, 1, 5) )
+      #  IncompleteDate.new('1969-01').eql?( Date.civil(1969, 1)..Date.civil(1969, 1, 31) )
+      #  IncompleteDate.new('1969-01').eql?( Date.civil(1969, 1)...Date.civil(1969, 2, 1) )
+      #  
+      # Please note that comparing an IncompleteDate with something else than a
+      # IncompleteDate is normally not symmetric.
+      def eql?(b)
+        if b.kind_of? ::Range
+          self.begin == b.begin && self.open_end == b.open_end
+        else
+          self.begin == b && self.open_end == b.succ
+        end
+      end
+      alias :== :eql?
+      
+      # Returns true if b is completely included in this IncompleteDate. Unlike
+      # CoreExtensions::Range::Equality#contains? include? allows equality for
+      # begin and end.
+      def include?(b)
+        self.started_by?(b) || self.contains?(b) || self.eql?(b) || self.finished_by?(b)
+      end
+      
     end
     
   end    

data/lib/rbrainz/model/individual.rb

@@ -1,4 +1,4 @@
-# $Id: individual.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: individual.rb 151 2007-07-24 08:36:27Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -65,7 +65,7 @@ module MusicBrainz
       # Should be an IncompleteDate object or a date string, which will
       # get converted into an IncompleteDate.
       def begin_date=(date)
-        date = IncompleteDate.new date unless date.is_a? IncompleteDate
+        date = IncompleteDate.new date unless date.is_a? IncompleteDate or date.nil?
         @begin_date = date
       end
       
@@ -74,7 +74,7 @@ module MusicBrainz
       # Should be an IncompleteDate object or a date string, which will
       # get converted into an IncompleteDate.
       def end_date=(date)
-        date = IncompleteDate.new date unless date.is_a? IncompleteDate
+        date = IncompleteDate.new date unless date.is_a? IncompleteDate or date.nil?
         @end_date = date
       end
       

data/lib/rbrainz/model/relation.rb

@@ -1,4 +1,4 @@
-# $Id: relation.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: relation.rb 151 2007-07-24 08:36:27Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -128,7 +128,7 @@ module MusicBrainz
       # a date string, which will get converted
       # into an IncompleteDate.
       def begin_date=(date)
-        date = IncompleteDate.new date unless date.is_a? IncompleteDate
+        date = IncompleteDate.new date unless date.is_a? IncompleteDate or date.nil?
         @begin_date = date
       end
       
@@ -138,7 +138,7 @@ module MusicBrainz
       # a date string, which will get converted
       # into an IncompleteDate.
       def end_date=(date)
-        date = IncompleteDate.new date unless date.is_a? IncompleteDate
+        date = IncompleteDate.new date unless date.is_a? IncompleteDate or date.nil?
         @end_date = date
       end
       

data/lib/rbrainz/model/release_event.rb

@@ -1,4 +1,4 @@
-# $Id: release_event.rb 141 2007-07-17 14:21:12Z phw $
+# $Id: release_event.rb 151 2007-07-24 08:36:27Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -44,7 +44,7 @@ module MusicBrainz
       
       def initialize(country=nil, date=nil)
         self.country = country
-        self.date    = date if date
+        self.date    = date
       end
       
       # Set the date the release took place.
@@ -53,7 +53,7 @@ module MusicBrainz
       # a date string, which will get converted
       # into an IncompleteDate.
       def date=(date)
-        date = IncompleteDate.new date unless date.is_a? IncompleteDate
+        date = IncompleteDate.new date unless date.is_a? IncompleteDate or date.nil?
         @date = date
       end
       

data/lib/rbrainz/version.rb

@@ -1,4 +1,4 @@
-# $Id: version.rb 143 2007-07-18 11:40:55Z phw $
+# $Id: version.rb 153 2007-07-24 09:04:25Z phw $
 #
 # Version information.
 #
@@ -10,6 +10,6 @@
 module MusicBrainz
 
   # The version of the RBrainz library.
-  RBRAINZ_VERSION = '0.2.0'
+  RBRAINZ_VERSION = '0.2.1'
 
 end

data/lib/rbrainz/webservice/mbxml.rb

@@ -1,4 +1,4 @@
-# $Id: mbxml.rb 148 2007-07-19 17:26:33Z phw $
+# $Id: mbxml.rb 152 2007-07-24 08:47:28Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -75,10 +75,8 @@ module MusicBrainz
       # entity type. There must be an entity-list element as a child of the
       # +metadata+ element in the document.
       # 
-      # Returns an empty Collection if the list is empty.
-      # Raises a MBXML::ParseError if no entity-list element can be found.
-      # 
-      # Raises:: MBXML::ParseError
+      # Returns an empty ScoredCollection if the list is empty or if no
+      # entity-list element can be found.
       def get_entity_list(entity_type, ns=Model::NS_MMD_1)
         # Search for the first occuring node of type entity which is a child node
         # of the metadata element.
@@ -97,9 +95,8 @@ module MusicBrainz
           
           return collection
         else
-          raise ParseError.new("no element %s-list found" % entity_type)
+          return Model::ScoredCollection.new
         end
-        return nil
       end
       
       private # ----------------------------------------------------------------
@@ -133,12 +130,8 @@ module MusicBrainz
         artist.disambiguation = node.elements['disambiguation'].text if node.elements['disambiguation']
         
         if life_span = node.elements['life-span']
-          if life_span.attributes['begin']
-            artist.begin_date = Model::IncompleteDate.new life_span.attributes['begin']
-          end
-          if life_span.attributes['end']
-            artist.end_date = Model::IncompleteDate.new life_span.attributes['end']
-          end
+          artist.begin_date = read_date_attribute(life_span, 'begin')
+          artist.end_date   = read_date_attribute(life_span, 'end')
         end
         
         # Read the alias list
@@ -306,12 +299,8 @@ module MusicBrainz
         label.country = node.elements['country'].text if node.elements['country']
         
         if life_span = node.elements['life-span']
-          if life_span.attributes['begin']
-            label.begin_date = Model::IncompleteDate.new life_span.attributes['begin']
-          end
-          if life_span.attributes['end']
-            label.end_date = Model::IncompleteDate.new life_span.attributes['end']
-          end
+          label.begin_date = read_date_attribute(life_span, 'begin')
+          label.end_date   = read_date_attribute(life_span, 'end')
         end
         
         # Read the alias list
@@ -386,9 +375,7 @@ module MusicBrainz
         event = @factory.new_release_event
         
         # Read all defined data fields
-        if node.attributes['date']
-          event.date = Model::IncompleteDate.new node.attributes['date']
-        end
+        event.date = read_date_attribute(node, 'date')
         event.country = node.attributes['country']
         event.catalog_number = node.attributes['catalog-number']
         event.barcode = node.attributes['barcode']
@@ -451,9 +438,7 @@ module MusicBrainz
           relation.type = MBXML.add_namespace(node.attributes['type'], Model::NS_REL_1)
         end
         
-        if node.attributes['begin']
-          relation.begin_date = Model::IncompleteDate.new node.attributes['begin']
-        end
+        relation.begin_date = read_date_attribute(node, 'begin')
         
         if node.attributes['end']
           relation.begin_end = Model::IncompleteDate.new node.attributes['end']
@@ -565,6 +550,19 @@ module MusicBrainz
       def self.each_element(node, local_name, ns, &block)
         node.elements.each("*[local-name() = '#{local_name}' and namespace-uri()='#{ns}']", &block)
       end
+      
+      # Read a date attribute from node. Returns an IncompleteDate or nil
+      # if the attribute was not set or contained an invalid date.
+      def read_date_attribute(node, attr_name)
+        if node.attributes[attr_name]
+          begin
+            Model::IncompleteDate.new node.attributes[attr_name]
+          rescue ArgumentError
+            nil
+          end
+        end
+      end
+      
     end
 
   end

data/test/test_incomplete_date.rb

@@ -1,4 +1,4 @@
-# $Id: test_incomplete_date.rb 97 2007-07-06 13:52:29Z nigel_graham $
+# $Id: test_incomplete_date.rb 154 2007-07-24 12:39:02Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -53,15 +53,36 @@ class TestIncompleteDate < Test::Unit::TestCase
   
   def test_range
     assert_equal Date.civil(1980,8,22), @date_year_month_day.begin
-    assert_equal Date.civil(1980,8,23), @date_year_month_day.end
-    assert @date_year_month_day.exclude_end?
+    assert_equal Date.civil(1980,8,22), @date_year_month_day.end
+    assert !@date_year_month_day.exclude_end?
     
     assert_equal Date.civil(1980, 8, 1), @date_year_month.begin
-    assert_equal Date.civil(1980, 9, 1), @date_year_month.end
-    assert @date_year_month.exclude_end?
+    assert_equal Date.civil(1980, 8, 31), @date_year_month.end
+    assert !@date_year_month.exclude_end?
 
     assert_equal Date.civil(1980, 1, 1), @date_year.begin
-    assert_equal Date.civil(1981, 1, 1), @date_year.end
-    assert @date_year.exclude_end?
+    assert_equal Date.civil(1980, 12, 31), @date_year.end, @date_year.end.to_s
+    assert !@date_year.exclude_end?
   end
+  
+  def test_eql
+    assert @date_year.eql?(@date_year)
+    assert @date_year_month.eql?(Date.civil(1980, 8, 1)..Date.civil(1980, 8, 31))
+    assert @date_year_month_day.eql?(Date.civil(1980, 8, 22))
+    assert !@date_year.eql?(@date_year_month_day)
+  end
+
+  def test_include
+    assert @date_year.include?(@date_year)
+    assert @date_year.include?(@date_year_month)
+    assert @date_year.include?(@date_year_month_day)
+    assert @date_year_month.include?(Date.civil(1980, 8, 1))
+    assert @date_year_month.include?(Date.civil(1980, 8, 22))
+    assert @date_year_month.include?(Date.civil(1980, 8, 31))
+    assert @date_year_month.include?(Date.civil(1980, 8, 1)..Date.civil(1980, 8, 31))
+    assert !@date_year_month.include?(Date.civil(1980, 8, 1)..Date.civil(1980, 9, 1))
+    assert !@date_year_month.include?(Date.civil(1980, 7, 30))
+    assert !@date_year_month.include?(Date.civil(1980, 9, 1))
+  end
+  
 end

data/test/test_mbxml.rb

@@ -1,4 +1,4 @@
-# $Id: test_mbxml.rb 146 2007-07-19 16:33:38Z phw $
+# $Id: test_mbxml.rb 152 2007-07-24 08:47:28Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -31,10 +31,10 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:artist) }
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:release) }
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:track) }
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:label) }
+    assert mbxml.get_entity_list(:artist).empty?
+    assert mbxml.get_entity_list(:release).empty?
+    assert mbxml.get_entity_list(:track).empty?
+    assert mbxml.get_entity_list(:label).empty?
     
     # The second contains an empty artist list
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/empty_2.xml')
@@ -43,9 +43,9 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
     assert mbxml.get_entity_list(:artist).empty?
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:release) }
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:track) }
-    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:label) }
+    assert mbxml.get_entity_list(:release).empty?
+    assert mbxml.get_entity_list(:track).empty?
+    assert mbxml.get_entity_list(:label).empty?
   end
   
   def test_artist_search

data/test/test_range_equality.rb

@@ -1,4 +1,4 @@
-# $Id: test_range_equality.rb 111 2007-07-10 14:09:52Z nigel_graham $
+# $Id: test_range_equality.rb 154 2007-07-24 12:39:02Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -70,7 +70,6 @@ class TestRangeEquality < Test::Unit::TestCase
   OPERATIONS = [
       :before?,
       :after?,
-      :eql?,
       :meets_beginning_of?,
       :meets_end_of?,
       :overlaps_beginning_of?,
@@ -132,13 +131,13 @@ class TestRangeEquality < Test::Unit::TestCase
     end
   end
 
-  def test_include
-    TESTSET.each do |a,b,op|
-      if op == :started_by? || op == :contains? || op == :eql? || op == :finished_by?
-        assert a.include?(b), a.inspect + ".include? " + b.inspect
-      else
-        assert !a.include?(b), '!' + a.inspect + ".include? " + b.inspect + ''
-      end
-    end
-  end
+  #def test_include
+  #  TESTSET.each do |a,b,op|
+  #    if op == :started_by? || op == :contains? || op == :eql? || op == :finished_by?
+  #      assert a.include?(b), a.inspect + ".include? " + b.inspect
+  #    else
+  #      assert !a.include?(b), '!' + a.inspect + ".include? " + b.inspect + ''
+  #    end
+  #  end
+  #end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rbrainz
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-07-19 00:00:00 +02:00
+  version: 0.2.1
+date: 2007-07-24 00:00:00 +02:00
 summary: Ruby library for the MusicBrainz XML web service.
 require_paths: 
 - lib
@@ -39,6 +39,12 @@ files:
 - examples/getuser.rb
 - examples/searchartists.rb
 - examples/getartist.rb
+- examples/searchtracks.rb
+- examples/getlabel.rb
+- examples/getrelease.rb
+- examples/gettrack.rb
+- examples/searchlabels.rb
+- examples/searchreleases.rb
 - lib/rbrainz.rb
 - lib/rbrainz/webservice.rb
 - lib/rbrainz/model.rb