rbrainz 0.1.1 → 0.2.0

data/test/test_tag.rb

@@ -0,0 +1,39 @@
+# $Id: test_tag.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'
+include MusicBrainz
+
+# Unit test for the Tag model.
+class TestTag < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+  end
+  
+  def test_tag
+    tag = nil
+    assert_nothing_raised {tag = Model::Tag.new}
+    tag.text = 'british'
+    tag.count = 11
+    assert_equal 'british', tag.text
+    assert_equal 'british', tag.to_s
+    assert_equal 11, tag.count
+    
+    assert_nothing_raised {tag = Model::Tag.new('british')}
+    assert_equal 'british', tag.text
+    assert_equal nil, tag.count
+  
+    assert_nothing_raised {tag = Model::Tag.new('british', 10)}
+    assert_equal 'british', tag.text
+    assert_equal 10, tag.count
+  end
+  
+end

data/test/test_track.rb

@@ -1,7 +1,9 @@
-# $Id: test_track.rb 30 2007-05-29 02:12:33Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_track.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'
 
@@ -28,6 +30,14 @@ class TestTrack < Test::Unit::TestCase
     track = nil
     assert_nothing_raised {track = Model::Track.new}
     assert track.is_a?(Model::Entity)
+    
+    mbid = Model::MBID.new('9d30e408-1559-448b-b491-2f8de1583ccf', track.entity_type)
+    assert_nothing_raised {track = Model::Track.new(
+      mbid,
+      'Indifferent Suns'
+      )}
+    assert_equal mbid, track.id
+    assert_equal 'Indifferent Suns', track.title
   end
   
   def test_title
@@ -35,6 +45,7 @@ class TestTrack < Test::Unit::TestCase
     assert track.title.nil?
     assert_nothing_raised {track.title = 'Indifferent Suns'}
     assert_equal 'Indifferent Suns', track.title
+    assert_equal 'Indifferent Suns', track.to_s
   end
   
   # Duration is given in milliseconds.

data/test/test_track_filter.rb

@@ -1,7 +1,9 @@
-# $Id: test_track_filter.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_track_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'
@@ -23,7 +25,9 @@ class TestTrackFilter < Test::Unit::TestCase
       :puid        => '26d1355d-60b7-0de2-7a57-d01d7ee9e8be',
       :count       => 12,
       :releasetype => 'Album',
-      :limit       => 10
+      :limit       => 10,
+      :offset      => 20,
+      :query       => 'arid: 9d30e408-1559-448b-b491-2f8de1583ccf'
       }
   end
 
@@ -47,6 +51,8 @@ class TestTrackFilter < Test::Unit::TestCase
     assert_equal @filter_hash[:count].to_s, result_hash['count'], filter_string
     assert_equal @filter_hash[:releasetype], result_hash['releasetype'], 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_track_includes.rb

@@ -1,7 +1,9 @@
-# $Id: test_track_includes.rb 27 2007-05-28 23:15:21Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_track_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 TestTrackIncludes < 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]
@@ -39,6 +42,7 @@ class TestTrackIncludes < 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
@@ -50,7 +54,8 @@ class TestTrackIncludes < 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_utils.rb

@@ -0,0 +1,41 @@
+# $Id: test_utils.rb 141 2007-07-17 14:21:12Z 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 methods in the Utils module.
+class TestUtils < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+  end
+  
+  def test_country_names
+    assert_equal 'Germany', Utils.get_country_name('DE')
+    assert_equal nil, Utils.get_country_name('UNKNOWN')
+  end
+  
+  def test_language_names
+    assert_equal 'English', Utils.get_language_name('ENG')
+    assert_equal nil, Utils.get_language_name('UNKNOWN')
+  end
+  
+  def test_script_names
+    assert_equal 'Cyrillic', Utils.get_script_name('Cyrl')
+    assert_equal nil, Utils.get_script_name('UNKNOWN')
+  end
+  
+  def test_release_type_names
+    assert_equal 'Bootleg', Utils.get_release_type_name(Model::Release::TYPE_BOOTLEG)
+    assert_equal nil, Utils.get_release_type_name('UNKNOWN')
+  end
+  
+end

data/test/test_webservice.rb

@@ -1,7 +1,9 @@
-# $Id: test_webservice.rb 36 2007-05-29 18:43:36Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_webservice.rb 114 2007-07-10 19:33:22Z 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'
@@ -21,7 +23,7 @@ class TestWebservice < Test::Unit::TestCase
   def test_get_success
     ws = Webservice::Webservice.new(:host => @testserver)
     assert_nothing_raised {
-      ws.get(:artist, Model::MBID.from_uuid(:artist, '10bf95b6-30e3-44f1-817f-45762cdc0de0'))
+      ws.get(:artist, :id => Model::MBID.parse('10bf95b6-30e3-44f1-817f-45762cdc0de0', :artist))
     }
   end
   
@@ -29,25 +31,16 @@ class TestWebservice < Test::Unit::TestCase
   def test_get_request_error
     ws = Webservice::Webservice.new(:host => @testserver)
     assert_raise(Webservice::RequestError) {
-      ws.get(:artist, Model::MBID.from_uuid(:artist, '10bf95b6-30e3-44f1-817f-45762cdc0de0'),
+      ws.get(:artist, :id => Model::MBID.parse('10bf95b6-30e3-44f1-817f-45762cdc0de0', :artist),
              :include => 'inc=invalid')
     }
   end
   
-  # 401 - Unauthorized
-  # Not implemented, yet.
-  #def test_get_authentication_error
-  #  ws = Webservice::Webservice.new(:host => @testserver)
-  #  assert_raise(Webservice::AuthenticationError) {
-  #  #...
-  #  }
-  #end
-  
   # 404 - Not Found
   def test_get_resource_not_found_error
     ws = Webservice::Webservice.new(:host => @testserver, :path_prefix => '/invalid')
     assert_raise(Webservice::ResourceNotFoundError) {
-      ws.get(:artist, Model::MBID.from_uuid(:artist, '10bf95b6-30e3-44f1-817f-45762cdc0de0'))
+      ws.get(:artist, :id => Model::MBID.parse('10bf95b6-30e3-44f1-817f-45762cdc0de0', :artist))
     }
   end
   
@@ -55,8 +48,14 @@ class TestWebservice < Test::Unit::TestCase
     ws = Webservice::Webservice.new(:host => 'example.org')
     ws.open_timeout = 0.1
     assert_raise(Webservice::ConnectionError) {
-      ws.get(:artist, Model::MBID.from_uuid(:artist, '10bf95b6-30e3-44f1-817f-45762cdc0de0'))
+      ws.get(:artist, :id => Model::MBID.parse('10bf95b6-30e3-44f1-817f-45762cdc0de0', :artist))
     }
   end
   
+  def test_user
+    ws = Webservice::Webservice.new()
+    assert_raise(Webservice::AuthenticationError) {
+      ws.get(:user, :filter=> Webservice::UserFilter.new("Nigel Graham"))
+    }
+  end
 end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rbrainz
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-05-29 00:00:00 +02:00
-summary: Ruby library for the MusicBrainz XML webservice.
+  version: 0.2.0
+date: 2007-07-19 00:00:00 +02:00
+summary: Ruby library for the MusicBrainz XML web service.
 require_paths: 
 - lib
 email: phw@rubyforge.org
 homepage: http://rbrainz.rubyforge.org
 rubyforge_project: rbrainz
-description: RBrainz is a Ruby client library to access the MusicBrainz XML webservice written in pure Ruby.  RBrainz follows the design of python-musicbrainz2, the reference implementation for a MusicBrainz client library. Developers used to python-musicbrainz2 should already know most of RBrainz' interface. However, RBrainz differs from python-musicbrainz2 wherever it makes the library more Ruby like or easier to use.  RBrainz supports the MusicBrainz XML Metadata Version 1.1, including support for labels and extended release events.
+description: RBrainz is a Ruby client library to access the MusicBrainz XML web service. RBrainz supports the MusicBrainz XML Metadata Version 1.2, including support for labels and extended release events.  RBrainz follows the design of python-musicbrainz2, the reference implementation for a MusicBrainz client library. Developers used to python-musicbrainz2 should already know most of RBrainz' interface. However, RBrainz differs from python-musicbrainz2 wherever it makes the library more Ruby like or easier to use.
 autorequire: rbrainz
 default_executable: 
 bindir: bin
@@ -27,114 +27,150 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Philipp Wolfer
+- - Philipp Wolfer
+  - Nigel Graham
 files: 
 - Rakefile
 - LICENSE
 - README
 - TODO
+- CHANGES
 - doc/README.rdoc
+- examples/getuser.rb
+- examples/searchartists.rb
 - examples/getartist.rb
 - lib/rbrainz.rb
-- lib/rbrainz/model.rb
 - lib/rbrainz/webservice.rb
-- lib/rbrainz/model/entity.rb
-- lib/rbrainz/model/alias.rb
-- lib/rbrainz/model/mbid.rb
+- lib/rbrainz/model.rb
+- lib/rbrainz/core_ext.rb
+- lib/rbrainz/utils.rb
+- lib/rbrainz/version.rb
+- lib/rbrainz/model/release_event.rb
+- lib/rbrainz/model/relation.rb
 - lib/rbrainz/model/label.rb
 - lib/rbrainz/model/release.rb
-- lib/rbrainz/model/relation.rb
+- lib/rbrainz/model/artist.rb
+- lib/rbrainz/model/disc.rb
 - lib/rbrainz/model/track.rb
 - lib/rbrainz/model/incomplete_date.rb
-- lib/rbrainz/model/release_event.rb
-- lib/rbrainz/model/disc.rb
-- lib/rbrainz/model/artist.rb
-- lib/rbrainz/webservice/query.rb
-- lib/rbrainz/webservice/filter.rb
-- lib/rbrainz/webservice/includes.rb
-- lib/rbrainz/webservice/webservice.rb
-- lib/rbrainz/webservice/mbxml.rb
+- lib/rbrainz/model/individual.rb
+- lib/rbrainz/model/alias.rb
+- lib/rbrainz/model/mbid.rb
+- lib/rbrainz/model/entity.rb
+- lib/rbrainz/model/user.rb
+- lib/rbrainz/model/scored_collection.rb
+- lib/rbrainz/model/tag.rb
+- lib/rbrainz/model/collection.rb
+- lib/rbrainz/model/default_factory.rb
+- lib/rbrainz/data/releasetypenames.rb
+- lib/rbrainz/data/countrynames.rb
 - lib/rbrainz/data/languagenames.rb
 - lib/rbrainz/data/scriptnames.rb
-- lib/rbrainz/data/countrynames.rb
-- test/test_track_filter.rb
+- lib/rbrainz/webservice/webservice.rb
+- lib/rbrainz/webservice/mbxml.rb
+- lib/rbrainz/webservice/filter.rb
+- lib/rbrainz/webservice/query.rb
+- lib/rbrainz/webservice/includes.rb
+- lib/rbrainz/core_ext/net_http_digest.rb
+- lib/rbrainz/core_ext/range.rb
+- lib/rbrainz/core_ext/mbid.rb
+- lib/rbrainz/core_ext/range/equality.rb
+- lib/rbrainz/utils/helper.rb
+- lib/rbrainz/utils/data.rb
+- test/test_label_filter.rb
+- test/test_mbxml.rb
 - test/test_label.rb
+- test/test_release.rb
 - test/test_disc.rb
+- test/test_release_event.rb
 - test/test_release_filter.rb
-- test/test_webservice.rb
-- test/test_mbid.rb
-- test/test_artist_includes.rb
-- test/test_release.rb
-- test/test_release_includes.rb
-- test/test_mbxml.rb
+- test/test_alias.rb
 - test/test_track_includes.rb
-- test/test_label_filter.rb
-- test/test_release_event.rb
+- test/test_collection.rb
+- test/test_incomplete_date.rb
+- test/test_artist_includes.rb
+- test/test_webservice.rb
 - test/test_track.rb
-- test/test_artist_filter.rb
+- test/test_query.rb
 - test/test_label_includes.rb
 - test/test_artist.rb
-- test/test_incomplete_date.rb
-- test/test_query.rb
+- test/test_release_includes.rb
+- test/test_track_filter.rb
+- test/test_mbid.rb
+- test/test_artist_filter.rb
 - test/test_relation.rb
-- test/test_alias.rb
-- test/lib/test_entity.rb
+- test/test_scored_collection.rb
+- test/test_range_equality.rb
+- test/test_tag.rb
+- test/test_default_factory.rb
+- test/test_utils.rb
 - test/lib/testing_helper.rb
+- test/lib/test_entity.rb
+- test/lib/mock_webservice.rb
+- test/lib/test_factory.rb
 - test/test-data/valid
 - test/test-data/invalid
 - test/test-data/README
-- test/test-data/valid/user
+- test/test-data/valid/label
 - test/test-data/valid/release
 - test/test-data/valid/track
 - test/test-data/valid/artist
-- test/test-data/valid/label
-- test/test-data/valid/user/User_1.xml
-- test/test-data/valid/release/Mission_Impossible_2.xml
+- test/test-data/valid/user
+- test/test-data/valid/label/Atlantic_Records_1.xml
+- test/test-data/valid/label/Atlantic_Records_2.xml
+- test/test-data/valid/label/Atlantic_Records_3.xml
+- test/test-data/valid/label/search_result_1.xml
+- test/test-data/valid/release/Under_the_Pink_3.xml
+- test/test-data/valid/release/search_result_1.xml
 - test/test-data/valid/release/Highway_61_Revisited_1.xml
-- test/test-data/valid/release/Little_Earthquakes_2.xml
+- test/test-data/valid/release/Highway_61_Revisited_2.xml
+- test/test-data/valid/release/Mission_Impossible_2.xml
 - test/test-data/valid/release/Little_Earthquakes_1.xml
+- test/test-data/valid/release/Little_Earthquakes_2.xml
 - test/test-data/valid/release/Under_the_Pink_1.xml
 - test/test-data/valid/release/Under_the_Pink_2.xml
-- test/test-data/valid/release/Under_the_Pink_3.xml
-- test/test-data/valid/release/search_result_1.xml
 - test/test-data/valid/track/Silent_All_These_Years_1.xml
-- test/test-data/valid/track/Silent_All_These_Years_5.xml
-- test/test-data/valid/track/Silent_All_These_Years_3.xml
 - test/test-data/valid/track/Silent_All_These_Years_2.xml
-- test/test-data/valid/track/Silent_All_These_Years_4.xml
+- test/test-data/valid/track/Silent_All_These_Years_3.xml
 - test/test-data/valid/track/search_result_1.xml
-- test/test-data/valid/artist/empty_2.xml
-- test/test-data/valid/artist/empty_1.xml
-- test/test-data/valid/artist/Tori_Amos_4.xml
-- test/test-data/valid/artist/Tori_Amos_1.xml
-- test/test-data/valid/artist/Tori_Amos_2.xml
-- test/test-data/valid/artist/Tori_Amos_3.xml
+- test/test-data/valid/track/Silent_All_These_Years_4.xml
+- test/test-data/valid/track/Silent_All_These_Years_5.xml
+- test/test-data/valid/track/Silent_All_These_Years_6.xml
 - test/test-data/valid/artist/Tori_Amos_5.xml
 - test/test-data/valid/artist/search_result_1.xml
+- test/test-data/valid/artist/Tori_Amos_1.xml
 - test/test-data/valid/artist/Tchaikovsky-1.xml
-- test/test-data/valid/label/Atlantic_Records_1.xml
-- test/test-data/valid/label/Atlantic_Records_2.xml
-- test/test-data/valid/label/search_result_1.xml
+- test/test-data/valid/artist/Tori_Amos_2.xml
+- test/test-data/valid/artist/Tchaikovsky-2.xml
+- test/test-data/valid/artist/Tori_Amos_3.xml
+- test/test-data/valid/artist/empty_1.xml
+- test/test-data/valid/artist/Tori_Amos_4.xml
+- test/test-data/valid/artist/empty_2.xml
+- test/test-data/valid/user/User_1.xml
 - test/test-data/invalid/release
 - test/test-data/invalid/track
 - test/test-data/invalid/artist
-- test/test-data/invalid/artist/basic_2.xml
-- test/test-data/invalid/artist/empty_2.xml
-- test/test-data/invalid/artist/empty_1.xml
-- test/test-data/invalid/artist/basic_1.xml
 - test/test-data/invalid/artist/empty_3.xml
+- test/test-data/invalid/artist/basic_1.xml
+- test/test-data/invalid/artist/basic_2.xml
 - test/test-data/invalid/artist/search_result_1.xml
+- test/test-data/invalid/artist/empty_1.xml
+- test/test-data/invalid/artist/tags_1.xml
+- test/test-data/invalid/artist/empty_2.xml
 test_files: []
 
 rdoc_options: []
 
 extra_rdoc_files: 
 - doc/README.rdoc
+- LICENSE
+- TODO
+- CHANGES
 executables: []
 
 extensions: []
 
 requirements: 
-- none
+- "Optional: mb-discid >= 0.1.2 (for calculating disc IDs)"
 dependencies: []