rbrainz 0.1.1 → 0.2.0

data/test/test_default_factory.rb

@@ -0,0 +1,75 @@
+# $Id: test_default_factory.rb 134 2007-07-16 08:46:55Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
+
+require 'test/unit'
+require 'rbrainz/model'
+include MusicBrainz
+
+# Unit test for the Alias model.
+class TestDefaultFactory < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+  end
+  
+  def test_new_artist
+    factory = Model::DefaultFactory.new
+    assert factory.new_artist.is_a?(Model::Artist)
+    assert factory.new_entity(:artist).is_a?(Model::Artist)
+  end
+
+  def test_new_label
+    factory = Model::DefaultFactory.new
+    assert factory.new_label.is_a?(Model::Label)
+    assert factory.new_entity(:label).is_a?(Model::Label)
+  end
+
+  def test_new_release
+    factory = Model::DefaultFactory.new
+    assert factory.new_release.is_a?(Model::Release)
+    assert factory.new_entity(:release).is_a?(Model::Release)
+  end
+
+  def test_new_track
+    factory = Model::DefaultFactory.new
+    assert factory.new_track.is_a?(Model::Track)
+    assert factory.new_entity(:track).is_a?(Model::Track)
+  end
+  
+  def test_new_alias
+    factory = Model::DefaultFactory.new
+    assert factory.new_alias.is_a?(Model::Alias)
+  end
+
+  def test_new_disc
+    factory = Model::DefaultFactory.new
+    assert factory.new_disc.is_a?(Model::Disc)
+  end
+
+  def test_new_relation
+    factory = Model::DefaultFactory.new
+    assert factory.new_relation.is_a?(Model::Relation)
+  end
+
+  def test_new_release_event
+    factory = Model::DefaultFactory.new
+    assert factory.new_release_event.is_a?(Model::ReleaseEvent)
+  end
+
+  def test_new_tag
+    factory = Model::DefaultFactory.new
+    assert factory.new_tag.is_a?(Model::Tag)
+  end
+
+  def test_new_user
+    factory = Model::DefaultFactory.new
+    assert factory.new_user.is_a?(Model::User)
+  end
+
+end

data/test/test_disc.rb

@@ -1,7 +1,9 @@
-# $Id: test_disc.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_disc.rb 138 2007-07-17 09:05:01Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test/unit'
 require 'rbrainz/model'
@@ -19,6 +21,8 @@ class TestDisc < Test::Unit::TestCase
   def test_new_disc
     disc = nil
     assert_nothing_raised {disc = Model::Disc.new}
+    assert_nothing_raised {disc = Model::Disc.new('Tit3F0Do_sZ_7NbfM_1vlEbF0wo-')}
+    assert_equal 'Tit3F0Do_sZ_7NbfM_1vlEbF0wo-', disc.id
   end
   
   def test_id
@@ -26,6 +30,7 @@ class TestDisc < Test::Unit::TestCase
     assert disc.id.nil?
     assert_nothing_raised {disc.id = 'Tit3F0Do_sZ_7NbfM_1vlEbF0wo-'}
     assert_equal 'Tit3F0Do_sZ_7NbfM_1vlEbF0wo-', disc.id
+    assert_equal 'Tit3F0Do_sZ_7NbfM_1vlEbF0wo-', disc.to_s
   end
 
   def test_sectors

data/test/test_incomplete_date.rb

@@ -1,7 +1,9 @@
-# $Id: test_incomplete_date.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_incomplete_date.rb 97 2007-07-06 13:52:29Z nigel_graham $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test/unit'
 require 'rbrainz/model'
@@ -31,11 +33,12 @@ class TestIncompleteDate < Test::Unit::TestCase
     assert_equal 1969, date.year
     assert_equal 1, date.month
     assert_equal 5, date.day
-    assert_nothing_raised {date = Model::IncompleteDate.new(nil)}
-    assert_equal nil, date.year
+#    assert_nothing_raised {date = Model::IncompleteDate.new(nil)}
+#    assert_equal nil, date.year
   end
   
   def test_invalid_format
+    assert_raise(ArgumentError) {date = Model::IncompleteDate.new(nil)}
     assert_raise(ArgumentError) {date = Model::IncompleteDate.new('69-01-05')}
     assert_raise(ArgumentError) {date = Model::IncompleteDate.new(69)}
     assert_raise(ArgumentError) {date = Model::IncompleteDate.new('1969/01/05')}
@@ -48,13 +51,17 @@ class TestIncompleteDate < Test::Unit::TestCase
     assert_equal '1980',       @date_year.to_s
   end
   
-  def test_equality
-    assert_equal(@date_year_month_day, @date_year_month,
-                 "#{@date_year_month_day.to_s} <=> #{@date_year_month.to_s}")
-    assert_equal(@date_year_month, @date_year,
-                 "#{@date_year_month.to_s} <=> #{@date_year.to_s}")
-    assert_equal(@date_year, @date_year_month_day,
-                 "#{@date_year.to_s} <=> #{@date_year_month_day.to_s}")
+  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, 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, 1, 1), @date_year.begin
+    assert_equal Date.civil(1981, 1, 1), @date_year.end
+    assert @date_year.exclude_end?
   end
-  
 end

data/test/test_label.rb

@@ -1,7 +1,9 @@
-# $Id: test_label.rb 30 2007-05-29 02:12:33Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_label.rb 138 2007-07-17 09:05:01Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test_entity'
 
@@ -12,6 +14,7 @@ class TestLabel < Test::Unit::TestCase
     @tested_class = Model::Label
     @invalid_entity_types = [:artist, :release, :track]
     @releases = [Model::Release.new, Model::Release.new]
+    @aliases = [Model::Alias.new, Model::Alias.new]
   end
 
   def teardown
@@ -24,6 +27,18 @@ class TestLabel < Test::Unit::TestCase
     label = nil
     assert_nothing_raised {label = Model::Label.new}
     assert label.is_a?(Model::Entity)
+    
+    mbid = Model::MBID.new('9d30e408-1559-448b-b491-2f8de1583ccf', label.entity_type)
+    assert_nothing_raised {label = Model::Label.new(
+      mbid,
+      Model::Label::TYPE_ORIGINAL_PRODUCTION,
+      'Century Media',
+      'Century Media'
+      )}
+    assert_equal mbid, label.id
+    assert_equal Model::Label::TYPE_ORIGINAL_PRODUCTION, label.type
+    assert_equal 'Century Media', label.name
+    assert_equal 'Century Media', label.sort_name
   end
   
   def test_name
@@ -47,6 +62,14 @@ class TestLabel < Test::Unit::TestCase
     assert_equal 'Disambiguation comment', label.disambiguation
   end
   
+  def test_unique_name
+    label = Model::Label.new
+    label.name = 'EMI'
+    label.disambiguation = 'Taiwan'
+    assert_equal 'EMI (Taiwan)', label.unique_name
+    assert_equal 'EMI (Taiwan)', label.to_s
+  end
+  
   def test_code
     label = Model::Label.new
     assert label.code.nil?
@@ -76,32 +99,32 @@ class TestLabel < Test::Unit::TestCase
     assert_equal Model::Label::TYPE_REISSUE_PRODUCTION, label.type
   end
   
-  def test_founding_date
+  def test_begin_date
     label = Model::Label.new
     date = Model::IncompleteDate.new '1988-04-18'
-    assert_nothing_raised {label.founding_date}
-    assert_equal nil, label.founding_date
-    assert_nothing_raised {label.founding_date = date}
-    assert_equal date, label.founding_date
+    assert_nothing_raised {label.begin_date}
+    assert_equal nil, label.begin_date
+    assert_nothing_raised {label.begin_date = date}
+    assert_equal date, label.begin_date
     
     # It should be able to supply a date as a string,
     # but Label should convert it to an IncompleteDate.
-    assert_nothing_raised {label.founding_date = '1988-04-20'}
-    assert_equal Model::IncompleteDate.new('1988-04-20'), label.founding_date
+    assert_nothing_raised {label.begin_date = '1988-04-20'}
+    assert_equal Model::IncompleteDate.new('1988-04-20'), label.begin_date
   end
   
-  def test_dissolving_date
+  def test_end_date
     label = Model::Label.new
     date = Model::IncompleteDate.new '1988-04-18'
-    assert_nothing_raised {label.dissolving_date}
-    assert_equal nil, label.dissolving_date
-    assert_nothing_raised {label.dissolving_date = date}
-    assert_equal date, label.dissolving_date
+    assert_nothing_raised {label.end_date}
+    assert_equal nil, label.end_date
+    assert_nothing_raised {label.end_date = date}
+    assert_equal date, label.end_date
     
     # It should be able to supply a date as a string,
     # but Label should convert it to an IncompleteDate.
-    assert_nothing_raised {label.dissolving_date = '1988-04-20'}
-    assert_equal Model::IncompleteDate.new('1988-04-20'), label.dissolving_date
+    assert_nothing_raised {label.end_date = '1988-04-20'}
+    assert_equal Model::IncompleteDate.new('1988-04-20'), label.end_date
   end
   
   # Many releases can be added
@@ -119,4 +142,19 @@ class TestLabel < Test::Unit::TestCase
     assert_equal 0, label.releases.size
   end
   
+  # Many aliases can be added
+  def test_add_and_remove_aliases
+    label = Model::Label.new
+    assert_equal 0, label.aliases.size
+    assert_nothing_raised {label.aliases << @aliases[0]}
+    assert_equal 1, label.aliases.size
+    assert_nothing_raised {label.aliases << @aliases[1]}
+    assert_equal 2, label.aliases.size
+    
+    assert_nothing_raised {label.aliases.delete @aliases[1]}
+    assert_equal 1, label.aliases.size
+    assert_nothing_raised {label.aliases.delete @aliases[0]}
+    assert_equal 0, label.aliases.size
+  end
+  
 end

data/test/test_label_filter.rb

@@ -1,7 +1,9 @@
-# $Id: test_label_filter.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_label_filter.rb 121 2007-07-12 08:56:19Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test/unit'
 require 'testing_helper'
@@ -12,7 +14,8 @@ include MusicBrainz
 class TestLabelFilter < Test::Unit::TestCase
 
   def setup
-    @filter_hash = {:name => 'Century Media', :limit => 10}
+    @filter_hash = {:name => 'Century Media', :limit => 10, :offset => 20,
+                    :query => 'alias:Century Media OR alias:Century'}
   end
 
   def teardown
@@ -26,6 +29,8 @@ class TestLabelFilter < Test::Unit::TestCase
     result_hash = query_string_to_hash filter_string
     assert_equal @filter_hash[:name], result_hash['name'], filter_string
     assert_equal @filter_hash[:limit].to_s, result_hash['limit'], filter_string
+    assert_equal @filter_hash[:offset].to_s, result_hash['offset'], filter_string
+    assert_equal @filter_hash[:query].to_s, result_hash['query'], filter_string
   end
   
   def test_empty_filter

data/test/test_label_includes.rb

@@ -1,7 +1,9 @@
-# $Id: test_label_includes.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_label_includes.rb 118 2007-07-11 22:46:58Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test/unit'
 require 'rbrainz'
@@ -23,7 +25,8 @@ class TestLabelIncludes < Test::Unit::TestCase
       :release_rels => true,
       :track_rels => true,
       :label_rels => true,
-      :url_rels => true
+      :url_rels => true,
+      :tags => true
       )
     result_string = includes.to_s
     assert_equal 'inc=', result_string[0..3]
@@ -35,6 +38,7 @@ class TestLabelIncludes < Test::Unit::TestCase
     assert result_array.include?('track-rels')
     assert result_array.include?('label-rels')
     assert result_array.include?('url-rels')
+    assert result_array.include?('tags')
   end
   
   def test_empty_includes
@@ -44,7 +48,8 @@ class TestLabelIncludes < Test::Unit::TestCase
       :release_rels => false,
       :track_rels => false,
       :label_rels => false,
-      :url_rels => false
+      :url_rels => false,
+      :tags => false
       )
     assert_equal '', includes.to_s
   

data/test/test_mbid.rb

@@ -1,7 +1,9 @@
-# $Id: test_mbid.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_mbid.rb 142 2007-07-17 15:49:57Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test/unit'
 require 'rbrainz/model'
@@ -25,35 +27,48 @@ class TestMBID < Test::Unit::TestCase
   def teardown
   end
   
-  def test_private_new
-    assert_raise(NoMethodError) {Model::MBID.new}
+  def test_parse
+    assert_equal 'http://musicbrainz.org/artist/9d30e408-1559-448b-b491-2f8de1583ccf',
+      Model::MBID.parse( 
+        'http://musicbrainz.org/artist/9d30e408-1559-448b-b491-2f8de1583ccf', 
+        :artist).to_s
+    assert_equal 'http://musicbrainz.org/artist/9d30e408-1559-448b-b491-2f8de1583ccf',
+      Model::MBID.parse(
+      '9d30e408-1559-448b-b491-2f8de1583ccf',
+      :artist ).to_s
+    assert_raise(Model::EntityTypeNotMatchingError) {
+      Model::MBID.parse(
+      'http://musicbrainz.org/artist/9d30e408-1559-448b-b491-2f8de1583ccf',
+      :label )
+    }
+    assert_equal Model::VARIOUS_ARTISTS_ID, Model::MBID.parse('http://musicbrainz.org/artist/89ad4ac3-39f7-470e-963a-56509c546377')
   end
   
   def test_from_uri
     @valid_entities.each{|entity|
       @valid_uuids.each{|uuid|
         assert_nothing_raised \
-          {Model::MBID.from_uri 'http://musicbrainz.org/' + entity.to_s + '/' + uuid}
+          {Model::MBID.parse 'http://musicbrainz.org/' + entity.to_s + '/' + uuid }
       }
     }
     @invalid_uris.each{|uri|
-      assert_raise(Model::InvalidMBIDError) {Model::MBID.from_uri uri}
+      assert_raise(Model::InvalidMBIDError, uri) {Model::MBID.parse uri}
     }
   end
   
   def test_from_uuid
     @valid_entities.each{|entity|
       @valid_uuids.each{|uuid|
-        assert_nothing_raised {Model::MBID.from_uuid entity, uuid}
+        assert_nothing_raised {Model::MBID.parse uuid, entity}
       }
     }
     @invalid_entities.each{|entity|
       assert_raise(Model::UnknownEntityError, 'Invalid entity ' + entity.inspect + '') \
-        {Model::MBID.from_uuid entity, @valid_uuids[0]}
+        {Model::MBID.parse @valid_uuids[0], entity}
     }
     @invalid_uuids.each{|uuid|
-      assert_raise(Model::InvalidUUIDError, 'Invalid uuid ' + uuid.inspect + '') \
-        {Model::MBID.from_uuid @valid_entities[0], uuid}
+      assert_raise(Model::InvalidMBIDError, uuid.inspect) \
+        {Model::MBID.parse uuid, @valid_entities[0]}
     }
   end
   
@@ -61,9 +76,9 @@ class TestMBID < Test::Unit::TestCase
     @valid_entities.each{|entity|
       @valid_uuids.each{|uuid|
         uri = 'http://musicbrainz.org/' + entity.to_s + '/' + uuid
-        mbid = Model::MBID.from_uuid entity, uuid
+        mbid = Model::MBID.parse uuid, entity
         assert_equal uri, mbid.to_s
-        mbid = Model::MBID.from_uri uri
+        mbid = Model::MBID.parse uri
         assert_equal uri, mbid.to_s
       }
     }
@@ -72,10 +87,10 @@ class TestMBID < Test::Unit::TestCase
   def test_read_attributes
     @valid_entities.each{|entity|
       @valid_uuids.each{|uuid|
-        mbid = Model::MBID.from_uuid entity, uuid
+        mbid = Model::MBID.parse uuid, entity
         assert_equal entity.to_sym, mbid.entity
         assert_equal uuid, mbid.uuid
-        mbid = Model::MBID.from_uri 'http://musicbrainz.org/' + entity.to_s + '/' + uuid
+        mbid = Model::MBID.parse 'http://musicbrainz.org/' + entity.to_s + '/' + uuid
         assert_equal entity.to_sym, mbid.entity
         assert_equal uuid, mbid.uuid
       }
@@ -84,14 +99,14 @@ class TestMBID < Test::Unit::TestCase
   
   # Test if the attributes are read only.
   def test_write_attributes
-    mbid = Model::MBID.from_uuid @valid_entities[0], @valid_uuids[0]
+    mbid = Model::MBID.parse @valid_uuids[0], @valid_entities[0]
     assert_raise(NoMethodError) {mbid.entity = :release}
     assert_raise(NoMethodError) {mbid.uuid = @valid_uuids[0]}
   end
   
   def test_equality
-    mbid1 = Model::MBID.from_uuid @valid_entities[0], @valid_uuids[0]
-    mbid2 = Model::MBID.from_uuid @valid_entities[0], @valid_uuids[0]
+    mbid1 = Model::MBID.parse @valid_uuids[0], @valid_entities[0]
+    mbid2 = Model::MBID.parse @valid_uuids[0], @valid_entities[0]
     assert_equal mbid1, mbid1
     assert_equal mbid1, mbid2
   end