rbrainz 0.2.1 → 0.3.0

data/CHANGES

@@ -1,5 +1,14 @@
 = Changelog
 
+== 0.3.0 (2007-08-11)
+* BUG: Relation end date was not set correctly in MBXML.
+* NEW: Allow release type constants to be passed to include and filter objects.
+* NEW: Methods Utils.add_namespace and Utils.remove_namespace.
+* NEW: Methods Release#earliest_release_event and Release#earliest_release_date
+* NEW: Entity#get_relations allows string with or without namespace for
+  target_type, relation_type and required_attributes
+* BUG: Corrected constant TYPE_PSEUDO_RELEASE
+
 == 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.
@@ -40,4 +49,4 @@
 == 0.1.0 (2007-05-23)
 * Initial release
 
-$Id: CHANGES 156 2007-07-24 17:47:07Z phw $
+$Id: CHANGES 167 2007-08-11 09:18:30Z phw $

data/examples/getartist.rb

@@ -3,7 +3,7 @@
 # Example script which queries the database for an
 # artist and displays the artist's data.
 # 
-# $Id: getartist.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: getartist.rb 162 2007-07-29 17:44:11Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.
@@ -28,7 +28,7 @@ mbid = Model::MBID.parse(id, :artist)
 # fetched.
 artist_includes = Webservice::ArtistIncludes.new(
   :aliases => true,
-  :releases => ['Album', 'Official']
+  :releases => [Model::Release::TYPE_ALBUM, Model::Release::TYPE_OFFICIAL]
 )
 
 # Create a new Query object which will provide

data/examples/getlabel.rb

@@ -3,7 +3,7 @@
 # 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 $
+# $Id: getlabel.rb 160 2007-07-27 13:18:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.

data/examples/getrelease.rb

@@ -3,7 +3,7 @@
 # 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 $
+# $Id: getrelease.rb 160 2007-07-27 13:18:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.
@@ -27,7 +27,8 @@ mbid = Model::MBID.parse(id, :release)
 # on the release will be fetched as well.
 release_includes = Webservice::ReleaseIncludes.new(
   :artist => true,
-  :tracks => true
+  :tracks => true,
+  :release_events => true
 )
 
 # Create a new Query object which will provide
@@ -47,4 +48,9 @@ ID            : #{release.id.uuid}
 Title         : #{release.title}
 Artist        : #{release.artist.unique_name}
 Tracks        : #{release.tracks.to_a.join("\r\n                ")}
-EOF
+Release Events:
+EOF
+
+release.release_events.each do |event|
+  puts "#{event.date} #{Utils.get_country_name(event.country)}"
+end

data/examples/gettrack.rb

@@ -3,7 +3,7 @@
 # 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 $
+# $Id: gettrack.rb 160 2007-07-27 13:18:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.

data/examples/searchlabels.rb

@@ -3,7 +3,7 @@
 # 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 $
+# $Id: searchlabels.rb 160 2007-07-27 13:18:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.

data/examples/searchreleases.rb

@@ -3,7 +3,7 @@
 # Example script which searches the database for
 # releases and displays the release data.
 # 
-# $Id: searchreleases.rb 150 2007-07-24 08:16:16Z phw $
+# $Id: searchreleases.rb 160 2007-07-27 13:18:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.

data/examples/searchtracks.rb

@@ -3,7 +3,7 @@
 # Example script which searches the database for
 # tracks and displays the track data.
 # 
-# $Id: searchtracks.rb 150 2007-07-24 08:16:16Z phw $
+# $Id: searchtracks.rb 160 2007-07-27 13:18:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.

data/lib/rbrainz/model/entity.rb

@@ -1,4 +1,4 @@
-# $Id: entity.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: entity.rb 162 2007-07-29 17:44:11Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -137,8 +137,9 @@ module MusicBrainz
                                    :required_attributes => [], :direction => nil})
         Utils.check_options options, 
             :target_type, :relation_type, :required_attributes, :direction
-        target_type = options[:target_type]
-        relation_type = options[:relation_type]
+        
+        target_type   = Utils.add_namespace(options[:target_type], NS_REL_1)
+        relation_type = Utils.add_namespace(options[:relation_type], NS_REL_1)
         required_attributes = 
           options[:required_attributes] ? options[:required_attributes] : []
         direction = options[:direction]
@@ -160,7 +161,7 @@ module MusicBrainz
         
         # Filter for attributes
         #
-        required = required_attributes.to_set
+        required = required_attributes.map{|a| Utils.add_namespace(a, NS_REL_1)}.to_set
         result.find_all do |r|
              required.subset?( r.attributes.to_set )
         end

data/lib/rbrainz/model/release.rb

@@ -1,4 +1,4 @@
-# $Id: release.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: release.rb 167 2007-08-11 09:18:30Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -22,26 +22,58 @@ module MusicBrainz
     #
     # See:: http://musicbrainz.org/doc/Release.
     # Note:: The current MusicBrainz server implementation supports only a
-    #        limited set of types.
-    #
+    #        limited set of types. See http://wiki.musicbrainz.org/ReleaseAttribute
+    #        for more information.
     class Release < Entity
     
+      # A type for not a type. Currently unsupported by MusicBrainz
+      TYPE_NONE           = NS_MMD_1 + 'None'
+      
+      # An album, perhaps better defined as a "Long Play" (LP) release,
+      # generally consists of previously unreleased material. This includes
+      # release re-issues, with or without bonus tracks.
       TYPE_ALBUM          = NS_MMD_1 + 'Album'
+      # An audiobook is a book read by a narrator without music.
       TYPE_AUDIOBOOK      = NS_MMD_1 + 'Audiobook'
-      TYPE_BOOTLEG        = NS_MMD_1 + 'Bootleg'
+      # A compilation is a collection of previously released tracks by one or
+      # more artists. Please note that this is a simplified description of a
+      # compilation.
       TYPE_COMPILATION    = NS_MMD_1 + 'Compilation'
+      # An EP is a so-called "Extended Play" release and often contains the
+      # letters EP in the title.
       TYPE_EP             = NS_MMD_1 + 'EP'
+      # An interview release contains an interview, generally with an Artist.
       TYPE_INTERVIEW      = NS_MMD_1 + 'Interview'
+      # A release that was recorded live.
       TYPE_LIVE           = NS_MMD_1 + 'Live'
-      TYPE_NONE           = NS_MMD_1 + 'None'
-      TYPE_OFFICIAL       = NS_MMD_1 + 'Official'
-      TYPE_OTHER          = NS_MMD_1 + 'Other'
-      TYPE_PROMOTION      = NS_MMD_1 + 'Promotion'
-      TYPE_PSEUDO_RELEASE = NS_MMD_1 + 'Pseudo-Release'
+      # A release that primarily contains remixed material.
       TYPE_REMIX          = NS_MMD_1 + 'Remix'
+      # A single typically has one main song and possibly a handful of
+      # additional tracks or remixes of the main track. A single is usually
+      # named after its main song.
       TYPE_SINGLE         = NS_MMD_1 + 'Single'
+      # A soundtrack is the musical score to a movie, TV series, stage show,
+      # computer game etc.
       TYPE_SOUNDTRACK     = NS_MMD_1 + 'Soundtrack'
+      # Non-music spoken word releases.
       TYPE_SPOKENWORD     = NS_MMD_1 + 'Spokenword'
+      # Any release that does not fit or can't decisively be placed in any of
+      # the categories above.
+      TYPE_OTHER          = NS_MMD_1 + 'Other'
+      
+      # Any release officially sanctioned by the artist and/or their record
+      # company. (Most releases will fit into this category.)
+      TYPE_OFFICIAL       = NS_MMD_1 + 'Official'
+      # A giveaway release or a release intended to promote an upcoming official
+      # release. (e.g. prerelease albums or releases included with a magazine,
+      # versions supplied to radio DJs for air-play, etc).
+      TYPE_PROMOTION      = NS_MMD_1 + 'Promotion'
+      # An unofficial/underground release that was not sanctioned by the artist
+      # and/or the record company.
+      TYPE_BOOTLEG        = NS_MMD_1 + 'Bootleg'
+      # A pseudo-release is a duplicate release for translation/transliteration
+      # purposes.
+      TYPE_PSEUDO_RELEASE = NS_MMD_1 + 'Pseudo-Release'
       
       # See Entity::ENTITY_TYPE.
       ENTITY_TYPE = :release # :nodoc:
@@ -126,6 +158,32 @@ module MusicBrainz
           tracks.all {|track| !track.artist || track.artist.id == artist.id }
       end
     
+      # Returns the earliest release date as an IncompleteDate.
+      # 
+      # This favours complete dates. For example, '2006-09' is
+	  # returned if there is '2000', too. If there is no release
+	  # event associated with this release, +nil+ is returned.
+      # 
+      # See:: earliest_release_date
+      def earliest_release_event
+        earliest_event = nil
+        release_events.each do |event|
+          if earliest_event.nil? or (event.date and
+            (event.date <= earliest_event.date or event.date.between?(earliest_event.date)))
+            earliest_event = event
+          end
+        end
+        return earliest_event
+      end
+      
+      # Returns the earliest release event or +nil+.
+      # 
+      # See:: earliest_release_event
+      def earliest_release_date
+        event = earliest_release_event
+        event ? event.date : nil
+      end
+    
       # Returns the string representation for this release.
       # 
       # Returns #title converted into a string.

data/lib/rbrainz/utils/helper.rb

@@ -1,4 +1,4 @@
-# $Id: helper.rb 141 2007-07-17 14:21:12Z phw $
+# $Id: helper.rb 158 2007-07-25 16:19:19Z phw $
 #
 # Author::    Nigel Graham, Philipp Wolfer
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -8,14 +8,39 @@
 module MusicBrainz
   module Utils
   
-    # Check an options hash for required options.
-    # Raises an ArgumentError if unknown options are present in the hash.
-    def self.check_options(options, *optdecl)   # :nodoc:
-      h = options.dup
-      optdecl.each do |name|
-        h.delete name
+    class << self
+    
+      # Remove the given _namespace_ from _str_. Will return _str_ with the
+      # namespace removed. If the namespace was not present in _str_ it will
+      # be returned unchanged.
+      def remove_namespace(str, namespace=Model::NS_MMD_1)
+        if str =~ /^#{namespace}(.*)/
+          return $1 
+        else
+          return str
+        end
       end
-      raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
+      
+      # Will return the given _str_ extended by _namespace_. If _str_ already
+      # includes the namespace or if _str_ is empty it will be returned unchanged.
+      def add_namespace(str, namespace=Model::NS_MMD_1)
+        unless str =~ /^#{namespace}/ or str.to_s.empty?
+          return namespace + str
+        else
+          return str
+        end
+      end
+      
+      # Check an options hash for required options.
+      # Raises an ArgumentError if unknown options are present in the hash.
+      def check_options(options, *optdecl)   # :nodoc:
+        h = options.dup
+        optdecl.each do |name|
+          h.delete name
+        end
+        raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
+      end
+    
     end
       
   end

data/lib/rbrainz/version.rb

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

data/lib/rbrainz/webservice/filter.rb

@@ -1,4 +1,4 @@
-# $Id: filter.rb 148 2007-07-19 17:26:33Z phw $
+# $Id: filter.rb 159 2007-07-25 16:53:32Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -84,8 +84,9 @@ module MusicBrainz
       #              (36 character ASCII representation). If this is given,
       #              the artist parameter is ignored.
       # [:releasetypes] The returned releases must match all of the given
-      #                 release types. This is a list of space separated values
-      #                 like Official, Bootleg, Album, Compilation, etc.
+      #                 release types. This is either an array of release types
+      #                 as defined in Model::Release or a string of space separated
+      #                 values like Official, Bootleg, Album, Compilation etc.
       # [:count]     Number of tracks in the release.
       # [:date]      Earliest release date for the release.
       # [:asin]      The Amazon ASIN.
@@ -108,12 +109,20 @@ module MusicBrainz
         @filter[:discid]       = filter[:discid]    if filter[:discid]
         @filter[:artist]       = filter[:artist]    if filter[:artist]
         @filter[:artistid]     = filter[:artistid]  if filter[:artistid]
-        @filter[:releasetypes] = filter[:releasetypes] if filter[:releasetypes]
         @filter[:count]        = filter[:count]     if filter[:count]
         @filter[:date]         = filter[:date]      if filter[:date]
         @filter[:asin]         = filter[:asin]      if filter[:asin]
         @filter[:lang]         = filter[:lang]      if filter[:lang]
         @filter[:script]       = filter[:script]    if filter[:script]
+        
+        if releasetypes = filter[:releasetypes]
+          if releasetypes.respond_to?(:to_a)
+            releasetypes = releasetypes.to_a.map do |type|
+              Utils.remove_namespace(type)
+            end.join(' ')
+          end
+          @filter[:releasetypes] = releasetypes
+        end
       end
     
     end
@@ -138,7 +147,8 @@ module MusicBrainz
       #              parameter is ignored.
       # [:puid]      The returned tracks have to match the given PUID.
       # [:count]     Number of tracks on the release.
-      # [:releasetype] The type of the release this track appears on
+      # [:releasetype] The type of the release this track appears on. See
+      #                Model::Release for possible values.
       # [:limit]     The maximum number of tracks returned. Defaults
       #              to 25, the maximum allowed value is 100. 
       # [:offset]    Return search results starting at a given offset. Used
@@ -161,7 +171,9 @@ module MusicBrainz
         @filter[:releaseid]   = filter[:releaseid] if filter[:releaseid]
         @filter[:puid]        = filter[:puid]      if filter[:puid]
         @filter[:count]       = filter[:count]     if filter[:count]
-        @filter[:releasetype] = filter[:releasetype] if filter[:releasetype]
+        if filter[:releasetype]
+          @filter[:releasetype] = Utils.remove_namespace(filter[:releasetype])
+        end
       end
     
     end

data/lib/rbrainz/webservice/includes.rb

@@ -1,4 +1,4 @@
-# $Id: includes.rb 148 2007-07-19 17:26:33Z phw $
+# $Id: includes.rb 158 2007-07-25 16:19:19Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -75,11 +75,11 @@ module MusicBrainz
         @parameters << 'tags'         if includes[:tags]
         
         includes[:releases].each {|release_type|
-          @parameters << 'sa-' + release_type.to_s
+          @parameters << 'sa-' + Utils.remove_namespace(release_type.to_s)
         } if includes[:releases]
         
         includes[:va_releases].each {|release_type|
-          @parameters << 'va-' + release_type.to_s
+          @parameters << 'va-' + Utils.remove_namespace(release_type.to_s)
         } if includes[:va_releases]
       end
       

data/lib/rbrainz/webservice/mbxml.rb

@@ -1,4 +1,4 @@
-# $Id: mbxml.rb 152 2007-07-24 08:47:28Z phw $
+# $Id: mbxml.rb 158 2007-07-25 16:19:19Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -122,7 +122,7 @@ module MusicBrainz
         # Read all defined data fields
         artist.id = node.attributes['id']
         if node.attributes['type']
-          artist.type = MBXML.add_namespace(node.attributes['type'], Model::NS_MMD_1)
+          artist.type = Utils.add_namespace(node.attributes['type'])
         end
         
         artist.name = node.elements['name'].text if node.elements['name']
@@ -185,7 +185,7 @@ module MusicBrainz
         
         # Read the types
         node.attributes['type'].split(' ').each {|type|
-          release.types << MBXML.add_namespace(type, Model::NS_MMD_1)
+          release.types << Utils.add_namespace(type)
         } if node.attributes['type']
         
         # Read the text representation information.
@@ -289,7 +289,7 @@ module MusicBrainz
         # Read all defined data fields
         label.id = node.attributes['id']
         if node.attributes['type']
-          label.type = MBXML.add_namespace(node.attributes['type'], Model::NS_MMD_1)
+          label.type = Utils.add_namespace(node.attributes['type'])
         end
         
         label.name = node.elements['name'].text if node.elements['name']
@@ -338,7 +338,7 @@ module MusicBrainz
         alias_model = @factory.new_alias
         alias_model.name = node.text
         if node.attributes['type']
-          alias_model.type = MBXML.add_namespace(node.attributes['type'], Model::NS_MMD_1)
+          alias_model.type = Utils.add_namespace(node.attributes['type'])
         end
         alias_model.script = node.attributes['script']
         return alias_model
@@ -419,7 +419,7 @@ module MusicBrainz
       # 
       # The node must be of the type <em>relation-list</em>.
       def read_relation_list(node)
-        target_type = MBXML.add_namespace(node.attributes['target-type'], Model::NS_REL_1)
+        target_type = Utils.add_namespace(node.attributes['target-type'], Model::NS_REL_1)
         node.elements.each('relation') {|child|
           yield create_relation(child, target_type)
         }
@@ -435,18 +435,15 @@ module MusicBrainz
         end
         
         if node.attributes['type']
-          relation.type = MBXML.add_namespace(node.attributes['type'], Model::NS_REL_1)
+          relation.type = Utils.add_namespace(node.attributes['type'], Model::NS_REL_1)
         end
         
         relation.begin_date = read_date_attribute(node, 'begin')
-        
-        if node.attributes['end']
-          relation.begin_end = Model::IncompleteDate.new node.attributes['end']
-        end
+        relation.end_date   = read_date_attribute(node, 'end')
         
         if node.attributes['attributes']
           node.attributes['attributes'].split(' ').each {|attribute|
-            relation.attributes << MBXML.add_namespace(attribute, Model::NS_REL_1)
+            relation.attributes << Utils.add_namespace(attribute, Model::NS_REL_1)
           }
         end
         
@@ -501,7 +498,7 @@ module MusicBrainz
         user_model = @factory.new_user
         # Read the types
         node.attributes['type'].split(' ').each {|type|
-          user_model.types << MBXML.add_namespace(type, Model::NS_EXT_1)
+          user_model.types << Utils.add_namespace(type, Model::NS_EXT_1)
         } if node.attributes['type']
 
         user_model.name = node.elements['name'].text
@@ -530,19 +527,6 @@ module MusicBrainz
         end
       end
       
-      # Helper method which will return the given property
-      # extended by the namespace. If the property
-      # already includes the namespace it will be returned
-      # unchanged.
-      def self.add_namespace(property, namespace)
-        regex = Regexp.new("/#{namespace}[a-z-]/i")
-        unless property =~ regex
-          return namespace + property
-        else
-          return property
-        end
-      end
-      
       def self.get_element(node, local_name, ns)
         node.elements["*[local-name() = '#{local_name}' and namespace-uri() = '#{ns}']"]
       end

data/test/lib/test_entity.rb

@@ -1,4 +1,4 @@
-# $Id: test_entity.rb 118 2007-07-11 22:46:58Z phw $
+# $Id: test_entity.rb 162 2007-07-29 17:44:11Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -60,16 +60,16 @@ module TestEntity
     artist_rel.target = Model::Artist.new
     artist_rel.type = Model::NS_REL_1 + 'Vocal'
     artist_rel.direction = Model::Relation::DIR_BACKWARD
-    artist_rel.attributes << 'Guest'
-    artist_rel.attributes << 'Lead'
+    artist_rel.attributes << Model::NS_REL_1 + 'Guest'
+    artist_rel.attributes << Model::NS_REL_1 + 'Lead'
     assert_nothing_raised {entity.add_relation artist_rel}
     
     track_rel = Model::Relation.new
     track_rel.target = Model::Track.new
     track_rel.type = Model::NS_REL_1 + 'Vocal'
     track_rel.direction = Model::Relation::DIR_FORWARD
-    track_rel.attributes << 'Lead'
-    track_rel.attributes << 'Guest'
+    track_rel.attributes << Model::NS_REL_1 + 'Lead'
+    track_rel.attributes << Model::NS_REL_1 + 'Guest'
     assert_nothing_raised {entity.add_relation track_rel}
     
     url_rel = Model::Relation.new
@@ -91,15 +91,27 @@ module TestEntity
     assert_equal 1, rel_list.size
     assert rel_list.include?(artist_rel)
     
+    # Get only artist relation by target type (without namespace)
+    assert_nothing_raised {rel_list = entity.get_relations(
+                             :target_type => 'Artist')}
+    assert_equal 1, rel_list.size
+    assert rel_list.include?(artist_rel)
+    
     # Get only url relation type
     assert_nothing_raised {rel_list = entity.get_relations(
                              :relation_type => Model::NS_REL_1 + 'OfficialHomepage')}
     assert_equal 1, rel_list.size
     assert rel_list.include?(url_rel)
     
+    # Get only url relation type (without namespace)
+    assert_nothing_raised {rel_list = entity.get_relations(
+                             :relation_type => 'OfficialHomepage')}
+    assert_equal 1, rel_list.size
+    assert rel_list.include?(url_rel)
+    
     # Get only artist and track relation by attribute
     assert_nothing_raised {rel_list = entity.get_relations(
-                             :required_attributes => ['Guest', 'Lead'])}
+                             :required_attributes => ['Guest', Model::NS_REL_1 + 'Lead'])}
     assert_equal 2, rel_list.size
     assert rel_list.include?(artist_rel)
     assert rel_list.include?(track_rel)

data/test/test_artist_includes.rb

@@ -1,4 +1,4 @@
-# $Id: test_artist_includes.rb 118 2007-07-11 22:46:58Z phw $
+# $Id: test_artist_includes.rb 158 2007-07-25 16:19:19Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -26,8 +26,8 @@ class TestArtistIncludes < Test::Unit::TestCase
       :track_rels => true,
       :label_rels => true,
       :url_rels => true,
-      :releases => ['Album', 'Official'],
-      :va_releases => ['Album', 'Official'],
+      :releases => [Model::Release::TYPE_ALBUM, 'Official'],
+      :va_releases => ['Album', Model::Release::TYPE_OFFICIAL],
       :tags => true
       )
     result_string = includes.to_s

data/test/test_release.rb

@@ -1,4 +1,4 @@
-# $Id: test_release.rb 138 2007-07-17 09:05:01Z phw $
+# $Id: test_release.rb 163 2007-07-29 17:52:22Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -14,7 +14,8 @@ class TestRelease < Test::Unit::TestCase
     @tested_class = Model::Release
     @invalid_entity_types = [:artist, :track, :label]
     @tracks = [Model::Track.new, Model::Track.new]
-    @release_events = [Model::ReleaseEvent.new, Model::ReleaseEvent.new]
+    @release_events = [Model::ReleaseEvent.new('DE', 2007), Model::ReleaseEvent.new('GB', 1996),
+                       Model::ReleaseEvent.new('GB', '1996-06-01'), Model::ReleaseEvent.new('GB', '1996-06')]
     @discs = [Model::Disc.new, Model::Disc.new]
   end
 
@@ -121,12 +122,27 @@ class TestRelease < Test::Unit::TestCase
   # Many release events can be added
   def test_add_and_remove_release_events
     release = Model::Release.new
+    
+    assert_equal nil, release.earliest_release_event
+    assert_equal nil, release.earliest_release_date
+    
     assert_equal 0, release.release_events.size
     assert_nothing_raised {release.release_events << @release_events[0]}
     assert_equal 1, release.release_events.size
     assert_nothing_raised {release.release_events << @release_events[1]}
     assert_equal 2, release.release_events.size
+    assert_nothing_raised {release.release_events << @release_events[2]}
+    assert_equal 3, release.release_events.size
+    assert_nothing_raised {release.release_events << @release_events[3]}
+    assert_equal 4, release.release_events.size
     
+    assert_equal @release_events[2], release.earliest_release_event
+    assert_equal release.earliest_release_event.date, release.earliest_release_date
+    
+    assert_nothing_raised {release.release_events.delete @release_events[2]}
+    assert_equal 3, release.release_events.size
+    assert_nothing_raised {release.release_events.delete @release_events[3]}
+    assert_equal 2, release.release_events.size
     assert_nothing_raised {release.release_events.delete @release_events[1]}
     assert_equal 1, release.release_events.size
     assert_nothing_raised {release.release_events.delete @release_events[0]}

data/test/test_release_filter.rb

@@ -1,4 +1,4 @@
-# $Id: test_release_filter.rb 121 2007-07-12 08:56:19Z phw $
+# $Id: test_release_filter.rb 159 2007-07-25 16:53:32Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -55,6 +55,15 @@ class TestReleaseFilter < Test::Unit::TestCase
     assert_equal @filter_hash[:query].to_s, result_hash['query'], filter_string
   end
   
+  def test_release_types_as_array
+    filter = Webservice::ReleaseFilter.new(:releasetypes => [Model::Release::TYPE_ALBUM, 'Official'])
+    filter_string = filter.to_s
+    assert_not_equal '&', filter_string[0]
+    
+    result_hash = query_string_to_hash filter_string
+    assert_equal 'Album Official', result_hash['releasetypes'], filter_string
+  end
+  
   def test_empty_filter
     filter = Webservice::ReleaseFilter.new({})
     assert_equal '', filter.to_s

data/test/test_track_filter.rb

@@ -1,4 +1,4 @@
-# $Id: test_track_filter.rb 121 2007-07-12 08:56:19Z phw $
+# $Id: test_track_filter.rb 159 2007-07-25 16:53:32Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -55,6 +55,15 @@ class TestTrackFilter < Test::Unit::TestCase
     assert_equal @filter_hash[:query].to_s, result_hash['query'], filter_string
   end
   
+  def test_release_type_as_constant
+    filter = Webservice::TrackFilter.new(:releasetype => Model::Release::TYPE_ALBUM)
+    filter_string = filter.to_s
+    assert_not_equal '&', filter_string[0]
+    
+    result_hash = query_string_to_hash filter_string
+    assert_equal 'Album', result_hash['releasetype'], filter_string
+  end
+  
   def test_empty_filter
     filter = Webservice::TrackFilter.new({})
     assert_equal '', filter.to_s

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rbrainz
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-07-24 00:00:00 +02:00
+  version: 0.3.0
+date: 2007-08-11 00:00:00 +02:00
 summary: Ruby library for the MusicBrainz XML web service.
 require_paths: 
 - lib