rbrainz 0.1.1 → 0.2.0

data/test/lib/mock_webservice.rb

@@ -0,0 +1,53 @@
+# $Id: mock_webservice.rb 147 2007-07-19 17:10:26Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
+
+require 'rbrainz/webservice/webservice'
+
+class MockWebservice < MusicBrainz::Webservice::IWebservice
+  
+  DATA_PATH = 'test/test-data/'
+  
+  def get(entity_type, options = {:id => nil, :include => nil, :filter => nil, :version => 1})
+    case entity_type
+    when :artist
+      if options[:id]
+        case options[:id]
+        when '00000000-0000-0000-0000-000000000000'
+          file = 'invalid/artist/basic_1.xml'
+        when '11111111-1111-1111-1111-111111111111'
+          file = 'valid/artist/empty_1.xml'
+        else
+          file = 'valid/artist/Tori_Amos_1.xml'
+        end
+      else
+        file = 'valid/artist/search_result_1.xml'
+      end
+    when :release
+      if options[:id]
+        file = 'valid/release/Under_the_Pink_1.xml'
+      else
+        file = 'valid/release/search_result_1.xml'
+      end
+    when :track
+      if options[:id]
+        file = 'valid/track/Silent_All_These_Years_1.xml'
+      else
+        file = 'valid/track/search_result_1.xml'
+      end
+    when :label
+      if options[:id]
+        file = 'valid/label/Atlantic_Records_1.xml'
+      else
+        file = 'valid/label/search_result_1.xml'
+      end
+    when :user
+      file = 'valid/user/User_1.xml'
+    end
+    return File.read(DATA_PATH + file)
+  end
+
+end

data/test/lib/test_entity.rb

@@ -1,7 +1,9 @@
-# $Id: test_entity.rb 29 2007-05-29 02:03:36Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_entity.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/model'
@@ -15,7 +17,7 @@ module TestEntity
 
   def test_valid_mbid
     entity = @tested_class.new
-    valid_mbid = Model::MBID.from_uuid(@tested_class.entity_type, '9d30e408-1559-448b-b491-2f8de1583ccf')
+    valid_mbid = Model::MBID.parse('9d30e408-1559-448b-b491-2f8de1583ccf', @tested_class.entity_type )
     
     assert_equal nil, entity.id
     assert_nothing_raised {entity.id = valid_mbid}
@@ -24,7 +26,7 @@ module TestEntity
   
   def test_valid_mbid_from_uuid
     entity = @tested_class.new
-    valid_mbid = Model::MBID.from_uuid(@tested_class.entity_type, '9d30e408-1559-448b-b491-2f8de1583ccf')
+    valid_mbid = Model::MBID.parse('9d30e408-1559-448b-b491-2f8de1583ccf', @tested_class.entity_type )
     
     assert_equal nil, entity.id
     assert_nothing_raised {entity.id = valid_mbid.uuid}
@@ -33,7 +35,7 @@ module TestEntity
   
   def test_valid_mbid_from_uri
     entity = @tested_class.new
-    valid_mbid = Model::MBID.from_uuid(@tested_class.entity_type, '9d30e408-1559-448b-b491-2f8de1583ccf')
+    valid_mbid = Model::MBID.parse( '9d30e408-1559-448b-b491-2f8de1583ccf', @tested_class.entity_type )
     
     assert_equal nil, entity.id
     assert_nothing_raised {entity.id = valid_mbid.to_s}
@@ -43,7 +45,7 @@ module TestEntity
   def test_invalid_mbid_entity_type_not_matching
     entity = @tested_class.new
     @invalid_entity_types.each {|type|
-      invalid_mbid = Model::MBID.from_uuid(type, '9d30e408-1559-448b-b491-2f8de1583ccf')
+      invalid_mbid = Model::MBID.parse( '9d30e408-1559-448b-b491-2f8de1583ccf', type )
       assert_raise(Model::EntityTypeNotMatchingError) {entity.id = invalid_mbid}
       assert_raise(Model::EntityTypeNotMatchingError) {entity.id = invalid_mbid.to_s}
     }
@@ -117,4 +119,21 @@ module TestEntity
     }
   end
   
+  def test_tags
+    entity = @tested_class.new
+    tag1 = Model::Tag.new('doom metal')
+    tag2 = Model::Tag.new
+    
+    assert_equal 0, entity.tags.size
+    assert_nothing_raised {entity.tags << tag1}
+    assert_equal 1, entity.tags.size
+    assert_nothing_raised {entity.tags << tag2}
+    assert_equal 2, entity.tags.size
+    
+    assert_nothing_raised {entity.tags.delete tag2}
+    assert_equal 1, entity.tags.size
+    assert_nothing_raised {entity.tags.delete tag1}
+    assert_equal 0, entity.tags.size
+  end
+  
 end

data/test/lib/test_factory.rb

@@ -0,0 +1,47 @@
+# $Id: test_factory.rb 140 2007-07-17 13:27:54Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
+
+class MyArtist < Model::Artist
+end
+
+class MyLabel < Model::Label
+end
+
+class MyRelease < Model::Release
+end
+
+class MyTrack < Model::Track
+end
+
+class MyAlias < Model::Alias
+end
+
+# An alternative model factory for testing purposes.
+class MyFactory < Model::DefaultFactory 
+
+  def new_artist
+    MyArtist.new
+  end
+
+  def new_label
+    MyLabel.new
+  end
+
+  def new_release
+    MyRelease.new
+  end
+
+  def new_track
+    MyTrack.new
+  end
+
+  def new_alias
+    MyAlias.new
+  end
+
+end
+

data/test/lib/testing_helper.rb

@@ -1,9 +1,11 @@
-# $Id: testing_helper.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
-
+# $Id: testing_helper.rb 78 2007-06-04 19:47:11Z phw $
+#
 # Usefull helper methods which are used in different test classes.
+#
+# 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.
 
 # Converts a query string into a hash.
 def query_string_to_hash query_string

data/test/test-data/invalid/artist/tags_1.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://musicbrainz.org/ns/mmd-1.0#">
+    <artist>
+	<tag-list><tag count="-1">foo</tag></tag-list>
+    </artist>
+</metadata>

data/test/test-data/valid/artist/Tchaikovsky-2.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://musicbrainz.org/ns/mmd-1.0#">
+    <artist id="9ddd7abc-9e1b-471d-8031-583bc6bc8be9" type="Person">
+        <name>Пётр Ильич Чайковский</name>
+        <tag-list>
+            <tag count="100">classical</tag>  
+            <tag count="60">russian</tag>  
+            <tag count="40">romantic era</tag>  
+            <tag count="120">composer</tag>  
+        </tag-list>
+    </artist>
+</metadata>

data/test/test-data/valid/label/Atlantic_Records_2.xml

@@ -7,5 +7,8 @@
         <disambiguation>fake</disambiguation>
         <country>US</country>
         <life-span begin="1947" end="2047"/>
+	<alias-list>
+	    <alias>Atlantic Rec.</alias>
+	</alias-list>
     </label>
 </metadata>

data/test/test-data/valid/label/Atlantic_Records_3.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://musicbrainz.org/ns/mmd-1.0#">
+    <label id="50c384a2-0b44-401b-b893-8181173339c7" type="OriginalProduction">
+        <name>Atlantic Records</name>
+	<tag-list>
+	    <tag>american</tag>
+	    <tag>jazz</tag>
+	    <tag>blues</tag>
+	</tag-list>
+    </label>
+</metadata>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://musicbrainz.org/ns/mmd-1.0#">
+    <release id="d61a2bd9-81ac-4023-bd22-1c884d4a176c" type="Album Official">
+        <title>Highway 61 Revisited</title>
+        <tag-list>
+	    <tag count="100">rock</tag>
+	    <tag count="40">blues rock</tag>
+	    <tag count="40">folk rock</tag>
+	    <tag count="4">dylan</tag>
+        </tag-list>
+    </release>
+</metadata>

data/test/test-data/valid/track/Silent_All_These_Years_6.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://musicbrainz.org/ns/mmd-1.0#">
+    <track id="d6118046-407d-4e06-a1ba-49c399a4c42f">
+	<title>Silent All These Years</title>
+	<duration>253466</duration>
+	<tag-list></tag-list>
+    </track>
+</metadata>

data/test/test_alias.rb

@@ -1,7 +1,9 @@
-# $Id: test_alias.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_alias.rb 139 2007-07-17 10:02:30Z 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'
@@ -18,6 +20,10 @@ class TestAlias < Test::Unit::TestCase
   
   def test_new_alias
     assert_nothing_raised {Model::Alias.new}
+    alias_ = Model::Alias.new('Dark Tranquility', Model::NS_MMD_1 + 'Misspelling', 'Latn')
+    assert_equal 'Dark Tranquility', alias_.name
+    assert_equal Model::NS_MMD_1 + 'Misspelling', alias_.type
+    alias_.script = 'Latn'
   end
   
   def test_name
@@ -28,8 +34,8 @@ class TestAlias < Test::Unit::TestCase
   
   def test_type
     alias_ = Model::Alias.new
-    alias_.type = 'Misspelling'
-    assert_equal 'Misspelling', alias_.type
+    alias_.type = Model::NS_MMD_1 + 'Misspelling'
+    assert_equal Model::NS_MMD_1 + 'Misspelling', alias_.type
   end
   
   def test_script
@@ -42,7 +48,7 @@ class TestAlias < Test::Unit::TestCase
     alias_ = Model::Alias.new
     assert_equal '', alias_.to_s
     alias_.name = 'Dark Tranquility'
-    alias_.type = 'Misspelling'
+    alias_.type = Model::NS_MMD_1 + 'Misspelling'
     alias_.script = 'Latn'
     assert_equal 'Dark Tranquility', alias_.to_s
   end

data/test/test_artist.rb

@@ -1,7 +1,9 @@
-# $Id: test_artist.rb 30 2007-05-29 02:12:33Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_artist.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'
 
@@ -25,6 +27,18 @@ class TestArtist < Test::Unit::TestCase
     artist = nil
     assert_nothing_raised {artist = Model::Artist.new}
     assert artist.is_a?(Model::Entity)
+    
+    mbid = Model::MBID.new('9d30e408-1559-448b-b491-2f8de1583ccf', artist.entity_type)
+    assert_nothing_raised {artist = Model::Artist.new(
+      mbid,
+      Model::Artist::TYPE_GROUP,
+      'The White Stripes',
+      'White Stripes, The'
+      )}
+    assert_equal mbid, artist.id
+    assert_equal Model::Artist::TYPE_GROUP, artist.type
+    assert_equal 'The White Stripes', artist.name
+    assert_equal 'White Stripes, The', artist.sort_name
   end
   
   def test_name
@@ -48,6 +62,14 @@ class TestArtist < Test::Unit::TestCase
     assert_equal 'Disambiguation comment', artist.disambiguation
   end
   
+  def test_unique_name
+    artist = Model::Artist.new
+    artist.name = 'Paradise Lost'
+    artist.disambiguation = 'British metal / hard rock band'
+    assert_equal 'Paradise Lost (British metal / hard rock band)', artist.unique_name
+    assert_equal 'Paradise Lost (British metal / hard rock band)', artist.to_s
+  end
+  
   def test_type
     artist = Model::Artist.new
     assert artist.type.nil?

data/test/test_artist_filter.rb

@@ -1,7 +1,9 @@
-# $Id: test_artist_filter.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_artist_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,9 +14,10 @@ include MusicBrainz
 class TestArtistFilter < Test::Unit::TestCase
 
   def setup
-    @filter_hash = {:name => 'Tori Amos', :limit => 10}
+    @filter_hash = {:name => 'Tori Amos', :limit => 10, :offset => 20,
+                    :query => 'alias:Torie Amos AND artype:1'}
   end
-
+  
   def teardown
   end
   
@@ -26,6 +29,8 @@ class TestArtistFilter < 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_artist_includes.rb

@@ -1,7 +1,9 @@
-# $Id: test_artist_includes.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_artist_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'
@@ -25,7 +27,8 @@ class TestArtistIncludes < Test::Unit::TestCase
       :label_rels => true,
       :url_rels => true,
       :releases => ['Album', 'Official'],
-      :va_releases => ['Album', 'Official']
+      :va_releases => ['Album', 'Official'],
+      :tags => true
       )
     result_string = includes.to_s
     assert_equal 'inc=', result_string[0..3]
@@ -41,6 +44,7 @@ class TestArtistIncludes < Test::Unit::TestCase
     assert result_array.include?('sa-Official')
     assert result_array.include?('va-Album')
     assert result_array.include?('va-Official')
+    assert result_array.include?('tags')
   end
   
   def test_empty_includes
@@ -52,7 +56,8 @@ class TestArtistIncludes < Test::Unit::TestCase
       :label_rels => false,
       :url_rels => false,
       :releases => [],
-      :va_releases => []
+      :va_releases => [],
+      :tags => false
       )
     assert_equal '', includes.to_s
     

data/test/test_collection.rb

@@ -0,0 +1,66 @@
+# $Id: test_collection.rb 117 2007-07-11 21:40:05Z 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'
+include MusicBrainz
+
+# Unit test for the Collection class.
+class TestCollection < Test::Unit::TestCase
+
+  def setup
+    @artist_one   = Model::Artist.new
+    @artist_two   = Model::Artist.new
+    @artist_three = Model::Artist.new
+  end
+
+  def teardown
+  end
+  
+  def test_collection
+    collection = Model::Collection.new(102, 8)
+    assert_equal 102, collection.count
+    assert_equal 8, collection.offset
+    
+    collection.count = 99
+    collection.offset=15
+    assert_equal 99, collection.count
+    assert_equal 15, collection.offset
+    
+    assert collection.empty?
+    
+    # Fill the collection
+    assert_nothing_raised {
+      collection << @artist_one
+      collection << @artist_two
+      collection << @artist_three
+    }
+    assert_equal 3, collection.size
+    assert !collection.empty?
+    
+    # Iterate over the collection
+    n = 0
+    collection.each {|artist|
+      assert artist.is_a?(Model::Artist), artist.inspect
+      n += 1
+    }
+    assert_equal collection.size, n
+    
+    # Random access
+    assert_equal @artist_one, collection[0]
+    assert_equal @artist_two, collection[1]
+    assert_equal @artist_three, collection[2]
+    
+    # Convert collection to array
+    array = collection.to_a
+    assert_equal Array, array.class
+    assert_equal @artist_one, array[0]
+    assert_equal @artist_two, array[1]
+    assert_equal @artist_three, array[2]
+  end
+
+end