rbrainz 0.3.0 → 0.4.0

data/lib/rbrainz/model/tag.rb

@@ -1,4 +1,4 @@
-# $Id: tag.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: tag.rb 181 2007-10-04 09:20:49Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -13,8 +13,7 @@ module MusicBrainz
     # 
     # Tags are arbitrary labels assigned to entities by the users of MusicBrainz.
     # 
-    # Note:: Tagging is not supported by the current MusicBrainz server but will
-    #        be added in the near future.
+    # See:: http://wiki.musicbrainz.org/FolksonomyTagging
     class Tag
       # The tag text.
       attr_accessor :text

data/lib/rbrainz/utils/helper.rb

@@ -1,4 +1,4 @@
-# $Id: helper.rb 158 2007-07-25 16:19:19Z phw $
+# $Id: helper.rb 173 2007-08-24 15:11:11Z phw $
 #
 # Author::    Nigel Graham, Philipp Wolfer
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -25,7 +25,7 @@ module MusicBrainz
       # 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
+          return namespace + str.to_s
         else
           return str
         end

data/lib/rbrainz/version.rb

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

data/lib/rbrainz/webservice/filter.rb

@@ -1,4 +1,4 @@
-# $Id: filter.rb 159 2007-07-25 16:53:32Z phw $
+# $Id: filter.rb 166 2007-08-10 08:56:09Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -50,7 +50,7 @@ module MusicBrainz
     class ArtistFilter < AbstractFilter
     
       # The parameter _filter_ is a hash with filter options. At least the
-      # <tt>:name</tt> filter must be specified.
+      # <tt>:name</tt> or <tt>:query</tt> filter must be specified.
       # 
       # Available filter options:
       # [:name]   Fetch a list of artists with a matching name.
@@ -131,7 +131,7 @@ module MusicBrainz
     class TrackFilter < AbstractFilter
     
       # The parameter _filter_ is a hash with filter options. At least the
-      # <tt>:title</tt> filter must be specified.
+      # <tt>:title</tt>, <tt>:puid</tt> or <tt>:query</tt> filter must be specified.
       # 
       # Available filter options:
       # [:title]     Fetch a list of tracks with a matching title.
@@ -182,7 +182,7 @@ module MusicBrainz
     class LabelFilter < AbstractFilter
     
       # The parameter _filter_ is a hash with filter options. At least the
-      # <tt>:name</tt> filter must be specified.
+      # <tt>:name</tt> or <tt>:query</tt> filter must be specified.
       # 
       # Available filter options:
       # [:name]   Fetch a list of labels with a matching name.

data/lib/rbrainz/webservice/mbxml.rb

@@ -1,4 +1,4 @@
-# $Id: mbxml.rb 158 2007-07-25 16:19:19Z phw $
+# $Id: mbxml.rb 189 2007-11-26 00:10:49Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -72,10 +72,11 @@ module MusicBrainz
       end
       
       # Read the XML string and create a list of entity models for the given
-      # entity type. There must be an entity-list element as a child of the
-      # +metadata+ element in the document.
+      # entity type. The list is returned as a Model::ScoredCollection. There
+      # must be an entity-list element as a child of the +metadata+ element in
+      # the document.
       # 
-      # Returns an empty ScoredCollection if the list is empty or if no
+      # Returns an empty Model::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
@@ -347,8 +348,8 @@ module MusicBrainz
       # Iterate over a list of tags and add them to the target collection.
       # 
       # The node must be of the type <em>tag-list</em>.
-      def read_tag_list(list_node, target_collection)
-        read_list(list_node, target_collection, 'tag') do |a|
+      def read_tag_list(list_node, target_collection, read_scores=false)
+        read_list(list_node, target_collection, 'tag', read_scores) do |a|
           yield a if block_given?
         end
       end
@@ -380,6 +381,7 @@ module MusicBrainz
         event.catalog_number = node.attributes['catalog-number']
         event.barcode = node.attributes['barcode']
         event.label   = create_label(node.elements['label']) if node.elements['label']
+        event.format  = Utils.add_namespace(node.attributes['format'])
         
         return event
       end
@@ -432,6 +434,8 @@ module MusicBrainz
         # Read all defined data fields
         if node.attributes['direction']
           relation.direction = node.attributes['direction'].to_sym
+        else
+          relation.direction = :both
         end
         
         if node.attributes['type']

data/lib/rbrainz/webservice/query.rb

@@ -1,4 +1,4 @@
-# $Id: query.rb 147 2007-07-19 17:10:26Z phw $
+# $Id: query.rb 174 2007-08-24 15:23:56Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -294,24 +294,101 @@ module MusicBrainz
       
       # Submit track to PUID mappings.
       #
-      # The <em>tracks2puids</em> parameter has to be a dictionary, with the
-      # keys being MusicBrainz track IDs (either as absolute URIs or
-      # in their 36 character ASCII representation) and the values
-      # being PUIDs (ASCII, 36 characters).
+      # The <em>tracks2puids</em> parameter has to be a Hash or Array
+      # with track ID/PUID pairs. The track IDs are either instances of MBID,
+      # absolute URIs or the 36 character ASCII representation. PUIDs are 
+      # 36 characters ASCII strings.
+      # 
+      # Example:
+      #  ws = Webservice::Webservice.new(
+      #         :host     => 'test.musicbrainz.org',
+      #         :username => 'outsidecontext',
+      #         :password => 'secret'
+      #  ) 
+      #  
+      #  query = Webservice::Query.new(ws, :client_id=>'My Tagging App 1.0')
+      #  
+      #  query.submit_puids([
+      #    ['90a56b15-4259-4a33-be13-20d5513504d5', '09ff336b-79e7-1303-f613-7f1cd0d5a346'],
+      #    ['90a56b15-4259-4a33-be13-20d5513504d5', '18fd245f-bc0c-3361-9d61-61a225ed8c79'],
+      #    ['6d9276af-b990-41b6-ad14-de2f128437ea', '3b633298-e671-957a-1f74-83fe71969ad0']
+      #  ])
       #
       # Note that this method only works if a valid user name and
       # password have been set. If username and/or password are incorrect,
       # an AuthenticationError is raised. See the example in Query on
       # how to supply authentication data.
       #
+      # See:: http://test.musicbrainz.org/doc/PUID
       # Raises:: ConnectionError, RequestError, AuthenticationError
       def submit_puids(tracks2puids)
         raise RequestError, 'Please supply a client ID' unless @client_id
         params = [['client', @client_id.to_s]] # Encoded as utf-8
 
-        tracks2puids.each {|track_id, puid| params << ['puid', track_id + ' ' + puid ]}
+        tracks2puids.each do |track_id, puid|
+          track_id = Model::MBID.parse(track_id, :track).uuid
+          params << ['puid', track_id + ' ' + puid ]
+        end
 
-        @webservice.post('track', :querystring=>params)
+        @webservice.post(:track, :params=>params)
+      end
+      
+      # Submit tags for an entity. _mbid_ must be an instance of MBID identifying
+      # the entity the tag should applied to and _tags_ is either and array or
+      # Collection of Tag objects or a string with comma separated tags.
+      # 
+      # Note that this method only works if a valid user name and password have
+      # been set. The tags will be applied for the authenticated user. If
+      # username and/or password are incorrect, an AuthenticationError is raised.
+      # See the example in Query on how to supply authentication data.
+      #
+      # Example:
+      #  ws = Webservice::Webservice.new(
+      #         :host     => 'test.musicbrainz.org',
+      #         :username => 'outsidecontext',
+      #         :password => 'secret'
+      #  ) 
+      #  
+      #  query = Webservice::Query.new(ws)
+      #
+      #  mbid = Model::MBID.new('http://musicbrainz.org/artist/10bf95b6-30e3-44f1-817f-45762cdc0de0')
+      #  query.set_tags(mbid, 'doom metal, british')
+      # 
+      # See:: Model::Tag
+      # Raises:: ConnectionError, RequestError, AuthenticationError
+      def submit_user_tags(mbid, tags)
+        mbid = Model::MBID.parse(mbid)
+        tag_string = tags.respond_to?(:to_ary) ? tags.to_ary.join(',') : tags.to_s
+        params = {:entity=>mbid.entity, :id=>mbid.uuid, :tags=>tag_string}
+        @webservice.post(:tag, :params=>params)
+      end
+      
+      # Returns a Model::Collection of tags a user has applied to the entity
+      # identified by _mbid_.
+      # 
+      # Note that this method only works if a valid user name and password have
+      # been set. Only the tags the authenticated user apllied to the entity will
+      # be returned. If username and/or password are incorrect, an
+      # AuthenticationError is raised. See the example in Query on how to supply
+      # authentication data.
+      #
+      # Example:
+      #  ws = Webservice::Webservice.new(
+      #         :host     => 'test.musicbrainz.org',
+      #         :username => 'outsidecontext',
+      #         :password => 'secret'
+      #  ) 
+      #  
+      #  query = Webservice::Query.new(ws)
+      #
+      #  mbid = Model::MBID.new('http://musicbrainz.org/artist/10bf95b6-30e3-44f1-817f-45762cdc0de0')
+      #  query.get_tags(mbid)
+      # 
+      # See:: Model::Tag
+      # Raises:: ConnectionError, RequestError, ResponseError, AuthenticationError
+      def get_user_tags(mbid)
+        mbid = Model::MBID.parse(mbid)
+        return get_entities(:tag, "entity=#{mbid.entity}&id=#{mbid.uuid}").to_collection
       end
       
       private # ----------------------------------------------------------------

data/lib/rbrainz/webservice/webservice.rb

@@ -1,4 +1,4 @@
-# $Id: webservice.rb 148 2007-07-19 17:26:33Z phw $
+# $Id: webservice.rb 182 2007-10-16 14:46:17Z nigel_graham $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -40,9 +40,9 @@ module MusicBrainz
       # 
       # Options:
       # [:id]      A MBID if querying for a single ressource.
-      # [:querystring] A string containing the data to post.
+      # [:params]  A Hash or Array containing the data to post as key/value pairs.
       # [:version] The version of the webservice to use. Defaults to 1.
-      def post(entity_type, options={ :id=>nil, :querystring=>[], :version=>1 })
+      def post(entity_type, options={ :id=>nil, :params=>[], :version=>1 })
         raise NotImplementedError.new('Called abstract method.')
       end
       
@@ -71,17 +71,26 @@ module MusicBrainz
       #                the server. Defaults to '/ws'.
       # [:username] The username to authenticate with.
       # [:password] The password to authenticate with.
-      # [:user_agent] Value sent in the User-Agent HTTP header. Defaults to 'rbrainz/0.2'
-      def initialize(options={ :host=>nil, :port=>nil, :path_prefix=>'/ws', :username=>nil, :password=>nil, :user_agent=>'rbrainz/0.2' })
-        Utils.check_options options, :host, :port, :path_prefix, :username, :password, :user_agent
+      # [:user_agent] Value sent in the User-Agent HTTP header. Defaults to "rbrainz/#{RBRAINZ_VERSION}"
+      # [:proxy] URL for the proxy server to connect through
+      def initialize(options={ :host=>nil, :port=>nil, :path_prefix=>'/ws', :username=>nil, :password=>nil, :user_agent=>"rbrainz/#{RBRAINZ_VERSION}", :proxy=>nil })
+        Utils.check_options options, :host, :port, :path_prefix, :username, :password, :user_agent, :proxy
         @host = options[:host] ? options[:host] : 'musicbrainz.org'
         @port = options[:port] ? options[:port] : 80
         @path_prefix = options[:path_prefix] ? options[:path_prefix] : '/ws'
         @username = options[:username]
         @password = options[:password]
-        @user_agent = options[:user_agent] ? options[:user_agent] : 'rbrainz/0.2'
+        @user_agent = options[:user_agent] ? options[:user_agent] : "rbrainz/#{RBRAINZ_VERSION}"
         @open_timeout = nil
         @read_timeout = nil
+        @proxy = {}
+        unless options[:proxy].nil?
+          uri = URI.parse( options[:proxy] )
+          @proxy[:host], @proxy[:port] = uri.host, uri.port
+          if uri.userinfo
+            @proxy[:username], @proxy[:password] = uri.userinfo.split(/:/)
+          end
+        end
       end
     
       # Query the Webservice with HTTP GET.
@@ -102,7 +111,7 @@ module MusicBrainz
         url = URI.parse(create_uri(entity_type, options))
         request = Net::HTTP::Get.new(url.request_uri)
         request['User-Agent'] = @user_agent
-        connection = Net::HTTP.new(url.host, url.port)
+        connection = Net::HTTP.new(url.host, url.port, @proxy[:host], @proxy[:port])
         
         # Set timeouts
         connection.open_timeout = @open_timeout if @open_timeout
@@ -112,10 +121,18 @@ module MusicBrainz
         begin
           response = connection.start do |http|
             response = http.request(request)
+            if response.is_a?(Net::HTTPProxyAuthenticationRequired) && @proxy[:user] && @proxy[:password]
+              request = Net::HTTP::Post.new(url.request_uri)
+              request['User-Agent'] = @user_agent
+              request.proxy_select_auth( @username, @password, response)
+              request.set_form_data(options[:params])
+              response = http.request(request)
+            end
+
             if response.is_a?(Net::HTTPUnauthorized) && @username && @password
               request = Net::HTTP::Get.new(url.request_uri)
               request['User-Agent'] = @user_agent
-              request.digest_auth @username, @password, response
+              request.select_auth @username, @password, response
               response = http.request(request)
             end
             response
@@ -149,20 +166,20 @@ module MusicBrainz
       #
       # Options:
       # [:id]      A MBID if querying for a single ressource.
-      # [:querystring] A string containing the data to post.
+      # [:params]  A Hash or Array containing the data to post as key/value pairs.
       # [:version] The version of the webservice to use. Defaults to 1.
       #
       # Raises:: ConnectionError, RequestError, AuthenticationError, 
       #          ResourceNotFoundError
       #
       # See:: IWebservice#post
-      def post(entity_type, options={:id=>nil, :querystring=>[], :version=>1})
-        Utils.check_options options, :id, :querystring, :version
+      def post(entity_type, options={ :id=>nil, :params=>[], :version=>1 })
+        Utils.check_options options, :id, :params, :version
         url = URI.parse(create_uri(entity_type, options))
         request = Net::HTTP::Post.new(url.request_uri)
         request['User-Agent'] = @user_agent
-        request.set_form_data(options[:querystring])
-        connection = Net::HTTP.new(url.host, url.port)
+        request.set_form_data(options[:params])
+        connection = Net::HTTP.new(url.host, url.port, @proxy[:host], @proxy[:port])
         
         # Set timeouts
         connection.open_timeout = @open_timeout if @open_timeout
@@ -173,11 +190,18 @@ module MusicBrainz
           response = connection.start do |http|
             response = http.request(request)
             
+            if response.is_a?(Net::HTTPProxyAuthenticationRequired) && @proxy[:user] && @proxy[:password]
+              request = Net::HTTP::Post.new(url.request_uri)
+              request['User-Agent'] = @user_agent
+              request.proxy_select_auth( @username, @password, response)
+              request.set_form_data(options[:params])
+              response = http.request(request)
+            end
             if response.is_a?(Net::HTTPUnauthorized) && @username && @password
               request = Net::HTTP::Post.new(url.request_uri)
               request['User-Agent'] = @user_agent
-              request.digest_auth @username, @password, response
-              request.set_form_data(options[:querystring])
+              request.select_auth( @username, @password, response)
+              request.set_form_data(options[:params])
               response = http.request(request)
             end
             response
@@ -205,9 +229,10 @@ module MusicBrainz
       private # ----------------------------------------------------------------
       
       # Builds a request URI for querying the webservice.
-      def create_uri(entity_type, options = {:id => nil, :include => nil, :filter => nil, :version => 1})
+      def create_uri(entity_type, options = {:id=>nil, :include=>nil, :filter=>nil, :version=>1, :type=>nil})
         # Make sure the version is set
         options[:version] = 1 if options[:version].nil?
+        options[:type] = 'xml' if options[:type].nil?
         
         # Build the URI
         if options[:id]
@@ -217,16 +242,19 @@ module MusicBrainz
             id = Model::MBID.parse(id, entity_type)
           end
         
-          uri = 'http://%s:%d%s/%d/%s/%s?type=%s' %
-                [@host, @port, @path_prefix, options[:version],
-                 entity_type, id.uuid, 'xml']
+          uri = 'http://%s:%d%s/%d/%s/%s' %
+                [@host, @port, @path_prefix, options[:version], entity_type, id.uuid]
         else
-          uri = 'http://%s:%d%s/%d/%s/?type=%s' %
-                [@host, @port, @path_prefix, options[:version],
-                 entity_type, 'xml']
+          uri = 'http://%s:%d%s/%d/%s/' %
+                [@host, @port, @path_prefix, options[:version], entity_type]
         end
-        uri += '&' + options[:include].to_s unless options[:include].nil?
-        uri += '&' + options[:filter].to_s unless options[:filter].nil?
+        
+        # Append the querystring
+        querystring = []
+        querystring << 'type=' + URI.escape(options[:type]) unless options[:type].nil?
+        querystring << options[:include].to_s unless options[:include].nil?
+        querystring << options[:filter].to_s unless options[:filter].nil?
+        uri += '?' + querystring.join('&') unless querystring.empty? 
         return uri
       end
     

data/test/test-data/valid/release/Under_the_Pink_3.xml

@@ -6,7 +6,7 @@
             <name>Tori Amos</name>
         </artist>
         <release-event-list>
-            <event date="1994-01-31" catalog-number="82567-2" barcode="07567825672">
+            <event date="1994-01-31" catalog-number="82567-2" barcode="07567825672" format="CD">
                 <label id="50c384a2-0b44-401b-b893-8181173339c7">
                     <name>Atlantic Records</name>
                 </label>

data/test/test_collection.rb

@@ -1,4 +1,4 @@
-# $Id: test_collection.rb 117 2007-07-11 21:40:05Z phw $
+# $Id: test_collection.rb 172 2007-08-24 11:19:19Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -36,8 +36,7 @@ class TestCollection < Test::Unit::TestCase
     # Fill the collection
     assert_nothing_raised {
       collection << @artist_one
-      collection << @artist_two
-      collection << @artist_three
+      collection << @artist_two << @artist_three
     }
     assert_equal 3, collection.size
     assert !collection.empty?

data/test/test_mbxml.rb

@@ -1,4 +1,4 @@
-# $Id: test_mbxml.rb 152 2007-07-24 08:47:28Z phw $
+# $Id: test_mbxml.rb 189 2007-11-26 00:10:49Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -15,12 +15,12 @@ include MusicBrainz
 # We test against the official test files supplied by
 # MusicBrainz. See http://bugs.musicbrainz.org/browser/mmd-schema/trunk/test-data
 class TestMBXML < Test::Unit::TestCase
-
+  
   DATA_PATH = 'test/test-data/valid/'
-
+  
   def setup
   end
-
+  
   def teardown
   end
   
@@ -54,7 +54,7 @@ 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)
-
+    
     artist_list = mbxml.get_entity_list(:artist)
     assert_equal 0, artist_list.offset
     assert_equal 47, artist_list.count
@@ -100,7 +100,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'composer', artist.tags[3].text
     assert_equal 120, artist.tags[3].count
   end
- 
+  
   def test_artist_tori_amos_1
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_1.xml')
     artist = mbxml.get_entity(:artist)
@@ -111,7 +111,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Amos, Tori', artist.sort_name
     assert_equal '1963-08-22', artist.begin_date.to_s
   end
-
+  
   def test_artist_tori_amos_2
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_2.xml')
     artist = mbxml.get_entity(:artist)
@@ -132,7 +132,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal artist, artist.releases[2].artist
     assert_equal 4, artist.releases[2].discs.count
   end
-
+  
   def test_artist_tori_amos_3
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_3.xml')
     artist = mbxml.get_entity(:artist)
@@ -157,7 +157,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal Model::NS_REL_1 + 'Wikipedia', url_rels[1].type
     assert_equal 'http://en.wikipedia.org/wiki/Tori_Amos', url_rels[1].target
   end
-
+  
   def test_artist_tori_amos_4
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_4.xml')
     artist = mbxml.get_entity(:artist)
@@ -175,7 +175,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Latn', artist.aliases[2].script
     assert_equal Model::NS_MMD_1 + 'Misspelling', artist.aliases[2].type
   end
-
+  
   def test_artist_tori_amos_5
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_5.xml')
     artist = mbxml.get_entity(:artist)
@@ -193,14 +193,14 @@ class TestMBXML < Test::Unit::TestCase
     assert artist.releases[0].types.include?(Model::Release::TYPE_ALBUM)
     assert artist.releases[0].types.include?(Model::Release::TYPE_OFFICIAL)
   end
-
+  
   def test_release_search
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
-
+    
     release_list = mbxml.get_entity_list(:release)
     assert_equal 0, release_list.offset
     assert_equal 234, release_list.count
@@ -238,14 +238,14 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 9, release.tracks.size
     assert_equal '430aa3d3-3dac-4bd5-857d-eb10212ffefb', release.tracks[0].id.uuid
     assert_equal 'd315625a-3976-41b4-b2e0-43336b0f67bc', release.tracks[8].id.uuid
-  
+    
     url_rels = release.get_relations(:target_type => Model::Relation::TO_URL)
     assert_equal 2, url_rels.size, release.get_relations.inspect
     assert_equal Model::NS_REL_1 + 'Wikipedia', url_rels[0].type
-    assert_equal nil, url_rels[0].direction
+    assert_equal Model::Relation::DIR_BOTH, url_rels[0].direction
     assert_equal 'http://en.wikipedia.org/wiki/Highway_61_Revisited', url_rels[0].target
     assert_equal Model::NS_REL_1 + 'AmazonAsin', url_rels[1].type
-    assert_equal nil, url_rels[1].direction
+    assert_equal Model::Relation::DIR_BOTH, url_rels[1].direction
     assert_equal 'http://www.amazon.com/gp/product/B0000024SI', url_rels[1].target
   end
   
@@ -286,7 +286,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 3, release.discs.size
     assert_equal 'ILKp3.bZmvoMO7wSrq1cw7WatfA-', release.discs[0].id
   end
-
+  
   def test_release_little_earthquakes_2
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Little_Earthquakes_2.xml')
     release = mbxml.get_entity(:release)
@@ -309,7 +309,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Crucify', release.tracks[0].title
     assert_equal 301186, release.tracks[0].duration
   end
-
+  
   # This is a various artist release.
   def test_release_mission_impossible_2
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Mission_Impossible_2.xml')
@@ -330,7 +330,7 @@ class TestMBXML < Test::Unit::TestCase
       assert_not_equal release.artist, track.artist
     }
   end
-
+  
   def test_release_under_the_pink_1
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Under_the_Pink_1.xml')
     release = mbxml.get_entity(:release)
@@ -349,7 +349,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 4, release.discs.count
     assert_equal 12, release.tracks.count
   end
-
+  
   def test_release_under_the_pink_2
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Under_the_Pink_2.xml')
     release = mbxml.get_entity(:release)
@@ -364,7 +364,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal '0a984e3b-e38a-4b86-80be-f3a3eb1114ca', release.tracks[0].id.uuid
     assert_equal 'God', release.tracks[0].title
   end
-
+  
   def test_release_under_the_pink_3
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Under_the_Pink_3.xml')
     release = mbxml.get_entity(:release)
@@ -381,15 +381,16 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal '07567825672', release.release_events[0].barcode
     assert_equal '50c384a2-0b44-401b-b893-8181173339c7', release.release_events[0].label.id.uuid
     assert_equal 'Atlantic Records', release.release_events[0].label.name
+    assert_equal Model::ReleaseEvent::FORMAT_CD, release.release_events[0].format
   end
-
+  
   def test_track_search
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
-
+    
     track_list = mbxml.get_entity_list(:track)
     assert_equal 7, track_list.offset
     assert_equal 100, track_list.count
@@ -414,7 +415,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Silent All These Years', track.title
     assert_equal 253466, track.duration
   end
-
+  
   def test_track_silent_all_these_years_2
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_2.xml')
     track = mbxml.get_entity(:track)
@@ -431,7 +432,7 @@ class TestMBXML < Test::Unit::TestCase
     assert track_rels[0].target.is_a?(Model::Track)
     assert_equal '5bcd4eaa-fae7-465f-9f03-d005b959ed02', track_rels[0].target.artist.id.uuid
   end
-
+  
   def test_track_silent_all_these_years_3
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_3.xml')
     track = mbxml.get_entity(:track)
@@ -443,7 +444,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'c2a2cee5-a8ca-4f89-a092-c3e1e65ab7e6', track.puids[0]
     assert_equal '42ab76ea-5d42-4259-85d7-e7f2c69e4485', track.puids[6]
   end
-
+  
   def test_track_silent_all_these_years_4
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_4.xml')
     track = mbxml.get_entity(:track)
@@ -458,7 +459,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'c2a2cee5-a8ca-4f89-a092-c3e1e65ab7e6', track.puids[0]
     assert_equal '42ab76ea-5d42-4259-85d7-e7f2c69e4485', track.puids[6]
   end
-
+  
   # This test is similiar to silent_all_these_years_3, but it includes an
   # schema exctension which mustn't disturb the parsing.
   def test_track_silent_all_these_years_5
@@ -482,14 +483,14 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 253466, track.duration
     assert_equal 0, track.tags.size
   end
-
+  
   def test_label_search
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
-
+    
     label_list = mbxml.get_entity_list(:label)
     assert_equal 0, label_list.offset
     assert_equal 2, label_list.count
@@ -518,7 +519,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'US', label.country
     assert_equal '1947', label.begin_date.to_s
   end
-
+  
   def test_label_atlantic_records_2
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/Atlantic_Records_2.xml')
     label = mbxml.get_entity(:label)
@@ -534,7 +535,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 1, label.aliases.size
     assert_equal 'Atlantic Rec.', label.aliases[0].name
   end
-
+  
   def test_label_atlantic_records_3
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/Atlantic_Records_3.xml')
     label = mbxml.get_entity(:label)