musicbrainz 0.4.10 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.5.0

data/lib/models/music_brainz.rb

@@ -2,16 +2,31 @@ module MusicBrainz
   @@last_query_time = 0
   @@query_interval = 1.5 # Min: 1.0 Safe: 1.5
   
+  WEB_SERVICE_URL = 'http://musicbrainz.org/ws/2/'
+  USER_AGENT = "gem musicbrainz (https://github.com/magnolia-fan/musicbrainz) @ " + Socket.gethostname
+  
   def self.query_interval= sec
     @@query_interval = sec.to_f
   end
+  
+  def self.load resourse, params = {}
+    url = WEB_SERVICE_URL + resourse.to_s.gsub('_', '-') + '/' + (params[:id].to_s || '')
+    params.delete(:id) unless params[:id].nil?
+    url << '?' + params.map{ |k, v|
+      k.to_s.gsub('_', '-') + '=' + (v.is_a?(Array) ? v.map{ |_| _.to_s.gsub('_', '-') }.join('+') : v.to_s)
+    }.join('&') unless params.empty?
+    self.get_contents url
+  end
+  
+private
 
-  def self.load url
-    sleep @@query_interval - (Time.now.to_f - @@last_query_time) if Time.now.to_f - @@last_query_time < @@query_interval
+  def self.get_contents url
+    time_passed = Time.now.to_f - @@last_query_time
+    sleep @@query_interval - time_passed if time_passed < @@query_interval
     response = nil
     5.times do
       begin
-        response = open(url, "User-Agent" => "gem musicbrainz (https://github.com/magnolia-fan/musicbrainz) @ " + Socket.gethostname)
+        response = open(url, "User-Agent" => USER_AGENT)
         @@last_query_time = Time.now.to_f
       rescue => e
         return nil if e.io.status[0].to_i == 404

data/lib/models/music_brainz/artist.rb

@@ -1,14 +1,12 @@
 module MusicBrainz
-  class Artist  
+  class Artist < MusicBrainz::Base
     attr_accessor :id, :type, :name, :country, :date_begin, :date_end, :urls
     @release_groups
   
     def release_groups
       if @release_groups.nil? and not self.id.nil?
         @release_groups = []
-        Nokogiri::XML(MusicBrainz.load(
-          'http://musicbrainz.org/ws/2/release-group/?artist=' + self.id
-        )).css('release-group').each do |rg|
+        Nokogiri::XML(MusicBrainz.load(:release_group, :artist => self.id)).css('release-group').each do |rg|
           @release_groups << MusicBrainz::ReleaseGroup.parse_xml(rg)
         end
       end
@@ -16,19 +14,19 @@ module MusicBrainz
     end
   
     def self.find mbid
-      res = MusicBrainz.load('http://musicbrainz.org/ws/2/artist/' + mbid + '?inc=url-rels')
+      res = MusicBrainz.load :artist, :id => mbid, :inc => [:url_rels]
       return nil if res.nil?
       @artist = self.parse_xml(Nokogiri::XML(res))
     end
   
     def self.parse_xml xml
       @artist = MusicBrainz::Artist.new
-      @artist.id = xml.css('artist').attr('id').value
-      @artist.type = xml.css('artist').attr('type').value unless xml.css('artist').nil? or xml.css('artist').attr('type').nil?
-      @artist.name = xml.css('artist > name').text
-      @artist.country = xml.css('artist > country').text unless xml.css('artist > country').empty?
-      @artist.date_begin = xml.css('artist > life-span > begin').text unless xml.css('artist > life-span > begin').empty?
-      @artist.date_end = xml.css('artist > life-span > end').text unless xml.css('artist > life-span > end').empty?
+      @artist.id = self.safe_get_attr(xml, 'artist', 'id')
+      @artist.type = self.safe_get_attr(xml, 'artist', 'type')
+      @artist.name = self.safe_get_value(xml, 'artist > name')
+      @artist.country = self.safe_get_value(xml, 'artist > country')
+      @artist.date_begin = self.safe_get_value(xml, 'artist > life-span > begin')
+      @artist.date_end = self.safe_get_value(xml, 'artist > life-span > end')
       @artist.urls = {}
       xml.css('relation-list[target-type="url"] > relation').each do |rel|
         @artist.urls[rel.attr('type').downcase.split(' ').join('_').to_sym] = rel.css('target').text
@@ -49,16 +47,14 @@ module MusicBrainz
     
     def self.search name
       artists = []
-      xml = Nokogiri::XML(MusicBrainz.load(
-        'http://musicbrainz.org/ws/2/artist/?query='+ CGI.escape(name).gsub(/\!/, '') +'~&limit=50'
-      ))
+      xml = Nokogiri::XML(MusicBrainz.load(:artist, :query => CGI.escape(name).gsub(/\!/, '') + '~', :limit => 50))
       xml.css('artist-list > artist').each do |a|
         artist = {
           :name => a.first_element_child.text,
           :weight => 0,
-          :desc => (a.css('disambiguation').text unless a.css('disambiguation').empty?),
-          :type => a.attr('type'),
-          :mbid => a.attr('id')
+          :desc => self.safe_get_value(a, 'disambiguation'),
+          :type => self.safe_get_attr(a, nil, 'type'),
+          :mbid => self.safe_get_attr(a, nil, 'id')
         }
         aliases = a.css('alias-list > alias').map{ |item| item.text }
         if aliases.include? name

data/lib/models/music_brainz/base.rb

@@ -0,0 +1,12 @@
+module MusicBrainz
+  class Base
+    def self.safe_get_attr xml, path, name
+      node = path.nil? ? xml : (xml.css(path).first unless xml.css(path).empty?)
+      node.attr(name) unless node.nil? or node.attr(name).nil?
+    end
+    
+    def self.safe_get_value xml, path
+      xml.css(path).first.text unless xml.css(path).empty?
+    end
+  end
+end

data/lib/models/music_brainz/release.rb

@@ -1,12 +1,12 @@
 module MusicBrainz
-  class Release
+  class Release < MusicBrainz::Base
     attr_accessor :id, :title, :status, :format, :date, :country
     @tracks
   
     def tracks
       if @tracks.nil? and not self.id.nil?
         @tracks = []
-        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/' + self.id + '?inc=recordings+media&limit=100')).css('medium-list > medium > track-list > track').each do |r|
+        Nokogiri::XML(MusicBrainz.load(:release, :id => self.id, :inc => [:recordings, :media], :limit => 100)).css('medium-list > medium > track-list > track').each do |r|
           @tracks << MusicBrainz::Track.parse_xml(r)
         end
       end
@@ -14,16 +14,16 @@ module MusicBrainz
     end
   
     def self.find mbid
-      xml = Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/' + mbid + '?inc=media')).css('release').first
+      xml = Nokogiri::XML(MusicBrainz.load(:release, :id => mbid, :inc => [:media])).css('release').first
       self.parse_xml(xml) unless xml.nil?
     end
   
     def self.parse_xml xml
       @release = MusicBrainz::Release.new
-      @release.id = xml.attr('id')
-      @release.title = xml.css('title').text unless xml.css('title').empty?
-      @release.status = xml.css('status').text unless xml.css('status').empty?
-      @release.format = xml.css('medium-list > medium > format').first.text unless xml.css('medium-list > medium > format').empty?
+      @release.id = self.safe_get_attr(xml, nil, 'id')
+      @release.title = self.safe_get_value(xml, 'title')
+      @release.status = self.safe_get_value(xml, 'status')
+      @release.format = self.safe_get_value(xml, 'medium-list > medium > format')
       date = xml.css('date').empty? ? '2030-12-31' : xml.css('date').text
       if date.length == 0
         date = '2030-12-31'
@@ -34,7 +34,7 @@ module MusicBrainz
       end
       date = date.split('-')
       @release.date = Time.utc(date[0], date[1], date[2])
-      @release.country = xml.css('country').text unless xml.css('country').empty?
+      @release.country = self.safe_get_value(xml, 'country')
       @release
     end
   end

data/lib/models/music_brainz/release_group.rb

@@ -1,12 +1,12 @@
 module MusicBrainz
-  class ReleaseGroup
+  class ReleaseGroup < MusicBrainz::Base
     attr_accessor :id, :type, :title, :disambiguation, :first_release_date
     @releases
   
     def releases
       if @releases.nil? and not self.id.nil?
         @releases = []
-        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/?release-group=' + self.id + '&inc=media&limit=100')).css('release').each do |r|
+        Nokogiri::XML(MusicBrainz.load(:release, :release_group => self.id, :inc => [:media], :limit => 100)).css('release').each do |r|
           @releases << MusicBrainz::Release.parse_xml(r)
         end
       end
@@ -14,16 +14,16 @@ module MusicBrainz
     end
   
     def self.find mbid
-      xml = Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release-group/' + mbid)).css('release-group').first
+      xml = Nokogiri::XML(MusicBrainz.load(:release_group, :id => mbid)).css('release-group').first
       self.parse_xml(xml) unless xml.nil?
     end
   
     def self.parse_xml xml
       @release_group = MusicBrainz::ReleaseGroup.new
-      @release_group.id = xml.attr('id')
-      @release_group.type = xml.attr('type')
-      @release_group.title = xml.css('title').text
-      @release_group.disambiguation = xml.css('disambiguation').empty? ? '' : xml.css('disambiguation').text
+      @release_group.id = self.safe_get_attr(xml, nil, 'id')
+      @release_group.type = self.safe_get_attr(xml, nil, 'type')
+      @release_group.title = self.safe_get_value(xml, 'title')
+      @release_group.disambiguation = self.safe_get_value(xml, 'disambiguation')
       date = xml.css('first-release-date').empty? ? '2030-12-31' : xml.css('first-release-date').text
       if date.length == 0
         date = '2030-12-31'

data/lib/models/music_brainz/track.rb

@@ -1,19 +1,19 @@
 module MusicBrainz
-  class Track
+  class Track < MusicBrainz::Base
     attr_accessor :position, :recording_id, :title, :length
   
     def self.find mbid
-      xml = Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/recording/' + mbid + '?limit=100'))
+      xml = Nokogiri::XML(MusicBrainz.load(:recording, :id => mbid))
       self.parse_xml(xml) unless xml.nil?
     end
   
     def self.parse_xml xml
       @track = MusicBrainz::Track.new
-      @track.position = xml.css('position').text.to_i unless xml.css('position').empty?
-      @track.recording_id = xml.css('recording').attr('id').value unless xml.css('recording').empty?
-      @track.title = xml.css('recording > title').text unless xml.css('recording > title').empty?
-      @track.length = xml.css('length').first.text.to_i unless xml.css('length').empty?
-      @track.length = xml.css('recording > length').first.text.to_i unless xml.css('recording > length').empty?
+      @track.position = self.safe_get_value(xml, 'position').to_i
+      @track.recording_id = self.safe_get_attr(xml, 'recording', 'id')
+      @track.title = self.safe_get_value(xml, 'recording > title')
+      @track.length = self.safe_get_value(xml, 'length').to_i
+      @track.length = self.safe_get_value(xml, 'recording > length').to_i
       @track
     end
   end

data/lib/musicbrainz.rb

@@ -4,6 +4,7 @@ require "nokogiri"
 require "cgi"
 
 require "models/music_brainz"
+require "models/music_brainz/base"
 require "models/music_brainz/artist"
 require "models/music_brainz/release_group"
 require "models/music_brainz/release"

data/musicbrainz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{musicbrainz}
-  s.version = "0.4.10"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Gregory Eremin"]
-  s.date = %q{2011-09-20}
+  s.authors = [%q{Gregory Eremin}]
+  s.date = %q{2011-10-06}
   s.description = %q{MusicBrainz Web Service wrapper with ActiveRecord-style models}
   s.email = %q{magnolia_fan@me.com}
   s.extra_rdoc_files = [
@@ -27,18 +27,22 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/models/music_brainz.rb",
     "lib/models/music_brainz/artist.rb",
+    "lib/models/music_brainz/base.rb",
     "lib/models/music_brainz/release.rb",
     "lib/models/music_brainz/release_group.rb",
     "lib/models/music_brainz/track.rb",
     "lib/musicbrainz.rb",
     "musicbrainz.gemspec",
     "test/helper.rb",
-    "test/test_musicbrainz.rb"
+    "test/test_musicbrainz_artist.rb",
+    "test/test_musicbrainz_release.rb",
+    "test/test_musicbrainz_release_group.rb",
+    "test/test_musicbrainz_track.rb"
   ]
   s.homepage = %q{http://github.com/magnolia-fan/musicbrainz}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{MusicBrainz Web Service wrapper}
 
   if s.respond_to? :specification_version then

data/test/test_musicbrainz_artist.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class TestMusicbrainzArtist < Test::Unit::TestCase
+  context "artist" do
+    should "load artist xml" do
+      assert_nothing_raised(Exception) do
+        MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
+      end
+    end
+    
+    should "search by name" do
+      matches = MusicBrainz::Artist.search('Kasabian')
+      assert_operator(0, :<, matches.length)
+      assert_equal("Kasabian", matches.first[:name])
+    end
+    
+    should "get correct result by name" do
+      @artist = MusicBrainz::Artist.find_by_name('Kasabian')
+      assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
+    end
+    
+    setup do
+      @artist = MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
+    end
+    
+    should "return valid instance" do
+      assert_instance_of(MusicBrainz::Artist, @artist)
+    end
+    
+    should "contain correct data" do
+      assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
+      assert_equal("Group", @artist.type)
+      assert_equal("Kasabian", @artist.name)
+      assert_equal("GB", @artist.country)
+      assert_equal("1999", @artist.date_begin)
+    end
+    
+    should "load release groups" do
+      release_groups = @artist.release_groups
+      assert_operator(16, :<=, release_groups.length)
+      assert_equal('533cbc5f-ec7e-32ab-95f3-8d1f804a5176', release_groups.first.id)
+      assert_equal('Single', release_groups.first.type)
+      assert_equal('Club Foot', release_groups.first.title)
+      assert_equal(Time.utc(2004, 5, 10), release_groups.first.first_release_date)
+    end
+  end
+end

data/test/test_musicbrainz_release.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+class TestMusicbrainzRelease < Test::Unit::TestCase
+  context "release" do
+    should "load xml" do
+      assert_nothing_raised(Exception) do
+        MusicBrainz::Release.find('2225dd4c-ae9a-403b-8ea0-9e05014c778f')
+      end
+    end
+  
+    setup do
+      @release = MusicBrainz::Release.find('2225dd4c-ae9a-403b-8ea0-9e05014c778f')
+    end
+  
+    should "return valid instance" do
+      assert_instance_of(MusicBrainz::Release, @release)
+    end
+  
+    should "contain correct data" do
+      assert_equal("2225dd4c-ae9a-403b-8ea0-9e05014c778f", @release.id)
+      assert_equal("Empire", @release.title)
+      assert_equal("Official", @release.status)
+      assert_equal(Time.utc(2006, 8, 28), @release.date)
+      assert_equal("GB", @release.country)
+    end
+  
+    should "load tracks" do
+      tracks = @release.tracks
+      assert_equal(11, tracks.length)
+      assert_equal(1, tracks.first.position)
+      assert_equal('b3015bab-1540-4d4e-9f30-14872a1525f7', tracks.first.recording_id)
+      assert_equal('Empire', tracks.first.title)
+      assert_equal(233013, tracks.first.length)
+    end
+  end
+end

data/test/test_musicbrainz_release_group.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+class TestMusicbrainzReleaseGroup < Test::Unit::TestCase
+  context "release group" do
+    should "load xml" do
+      assert_nothing_raised(Exception) do
+        MusicBrainz::ReleaseGroup.find('6f33e0f0-cde2-38f9-9aee-2c60af8d1a61')
+      end
+    end
+    
+    setup do
+      @release_group = MusicBrainz::ReleaseGroup.find('6f33e0f0-cde2-38f9-9aee-2c60af8d1a61')
+    end
+    
+    should "return valid instance" do
+      assert_instance_of(MusicBrainz::ReleaseGroup, @release_group)
+    end
+    
+    should "contain correct data" do
+      assert_equal("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61", @release_group.id)
+      assert_equal("Album", @release_group.type)
+      assert_equal("Empire", @release_group.title)
+      assert_equal(Time.utc(2006, 8, 28), @release_group.first_release_date)
+    end
+    
+    should "load releases" do
+      releases = @release_group.releases
+      assert_operator(5, :<=, releases.length)
+      assert_equal('2225dd4c-ae9a-403b-8ea0-9e05014c778f', releases.first.id)
+      assert_equal('Official', releases.first.status)
+      assert_equal('Empire', releases.first.title)
+      assert_equal(Time.utc(2006, 8, 28), releases.first.date)
+      assert_equal('GB', releases.first.country)
+    end
+  end
+end

data/test/test_musicbrainz_track.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class TestMusicbrainzTrack < Test::Unit::TestCase
+  context "track" do
+    should "load xml" do
+      assert_nothing_raised(Exception) do
+        MusicBrainz::Track.find('b3015bab-1540-4d4e-9f30-14872a1525f7')
+      end
+    end
+    
+    setup do
+      @track = MusicBrainz::Track.find('b3015bab-1540-4d4e-9f30-14872a1525f7')
+    end
+    
+    should "return valid instance" do
+      assert_instance_of(MusicBrainz::Track, @track)
+    end
+    
+    should "contain correct data" do
+      assert_equal("b3015bab-1540-4d4e-9f30-14872a1525f7", @track.recording_id)
+      assert_equal("Empire", @track.title)
+      assert_equal(233013, @track.length)
+    end
+  end
+end

metadata

@@ -1,94 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: musicbrainz
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.10
 platform: ruby
-authors: 
+authors:
 - Gregory Eremin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-20 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156435880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156435880
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156435060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156435060
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156434280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156434280
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156211980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156211980
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2156211280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156211280
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2156210560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *2156210560
 description: MusicBrainz Web Service wrapper with ActiveRecord-style models
 email: magnolia_fan@me.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .travis.yml
 - Gemfile
@@ -99,43 +95,43 @@ files:
 - VERSION
 - lib/models/music_brainz.rb
 - lib/models/music_brainz/artist.rb
+- lib/models/music_brainz/base.rb
 - lib/models/music_brainz/release.rb
 - lib/models/music_brainz/release_group.rb
 - lib/models/music_brainz/track.rb
 - lib/musicbrainz.rb
 - musicbrainz.gemspec
 - test/helper.rb
-- test/test_musicbrainz.rb
-has_rdoc: true
+- test/test_musicbrainz_artist.rb
+- test/test_musicbrainz_release.rb
+- test/test_musicbrainz_release_group.rb
+- test/test_musicbrainz_track.rb
 homepage: http://github.com/magnolia-fan/musicbrainz
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -804216001345752924
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1738320966711740487
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: MusicBrainz Web Service wrapper
 test_files: []
-

data/test/test_musicbrainz.rb

@@ -1,135 +0,0 @@
-require 'helper'
-
-class TestMusicbrainz < Test::Unit::TestCase
-  context "artist" do
-    should "load artist xml" do
-      assert_nothing_raised(Exception) do
-        MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
-      end
-    end
-    
-    should "search for artists by name" do
-      matches = MusicBrainz::Artist.search('Kasabian')
-      assert_operator(0, :<, matches.length)
-      assert_equal("Kasabian", matches.first[:name])
-    end
-    
-    should "get correct artist by name" do
-      @artist = MusicBrainz::Artist.find_by_name('Kasabian')
-      assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
-    end
-    
-    setup do
-      @artist = MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
-    end
-    
-    should "return valid instance" do
-      assert_instance_of(MusicBrainz::Artist, @artist)
-    end
-    
-    should "contain correct data" do
-      assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
-      assert_equal("Group", @artist.type)
-      assert_equal("Kasabian", @artist.name)
-      assert_equal("GB", @artist.country)
-      assert_equal("1999", @artist.date_begin)
-    end
-    
-    should "load release groups" do
-      release_groups = @artist.release_groups
-      assert_operator(16, :<=, release_groups.length)
-      assert_equal('533cbc5f-ec7e-32ab-95f3-8d1f804a5176', release_groups.first.id)
-      assert_equal('Single', release_groups.first.type)
-      assert_equal('Club Foot', release_groups.first.title)
-      assert_equal(Time.utc(2004, 5, 10), release_groups.first.first_release_date)
-    end
-  end
-  
-  context "release group" do
-    should "load release group xml" do
-      assert_nothing_raised(Exception) do
-        MusicBrainz::ReleaseGroup.find('6f33e0f0-cde2-38f9-9aee-2c60af8d1a61')
-      end
-    end
-    
-    setup do
-      @release_group = MusicBrainz::ReleaseGroup.find('6f33e0f0-cde2-38f9-9aee-2c60af8d1a61')
-    end
-    
-    should "return valid instance" do
-      assert_instance_of(MusicBrainz::ReleaseGroup, @release_group)
-    end
-    
-    should "contain correct data" do
-      assert_equal("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61", @release_group.id)
-      assert_equal("Album", @release_group.type)
-      assert_equal("Empire", @release_group.title)
-      assert_equal(Time.utc(2006, 8, 28), @release_group.first_release_date)
-    end
-    
-    should "load releases" do
-      releases = @release_group.releases
-      assert_operator(5, :<=, releases.length)
-      assert_equal('2225dd4c-ae9a-403b-8ea0-9e05014c778f', releases.first.id)
-      assert_equal('Official', releases.first.status)
-      assert_equal('Empire', releases.first.title)
-      assert_equal(Time.utc(2006, 8, 28), releases.first.date)
-      assert_equal('GB', releases.first.country)
-    end
-  end
-  
-  context "release" do
-    should "load release xml" do
-      assert_nothing_raised(Exception) do
-        MusicBrainz::Release.find('2225dd4c-ae9a-403b-8ea0-9e05014c778f')
-      end
-    end
-    
-    setup do
-      @release = MusicBrainz::Release.find('2225dd4c-ae9a-403b-8ea0-9e05014c778f')
-    end
-    
-    should "return valid instance" do
-      assert_instance_of(MusicBrainz::Release, @release)
-    end
-    
-    should "contain correct data" do
-      assert_equal("2225dd4c-ae9a-403b-8ea0-9e05014c778f", @release.id)
-      assert_equal("Empire", @release.title)
-      assert_equal("Official", @release.status)
-      assert_equal(Time.utc(2006, 8, 28), @release.date)
-      assert_equal("GB", @release.country)
-    end
-    
-    should "load tracks" do
-      tracks = @release.tracks
-      assert_equal(11, tracks.length)
-      assert_equal(1, tracks.first.position)
-      assert_equal('b3015bab-1540-4d4e-9f30-14872a1525f7', tracks.first.recording_id)
-      assert_equal('Empire', tracks.first.title)
-      assert_equal(233013, tracks.first.length)
-    end
-  end
-  
-  context "track" do
-    should "load track xml" do
-      assert_nothing_raised(Exception) do
-        MusicBrainz::Track.find('b3015bab-1540-4d4e-9f30-14872a1525f7')
-      end
-    end
-    
-    setup do
-      @track = MusicBrainz::Track.find('b3015bab-1540-4d4e-9f30-14872a1525f7')
-    end
-    
-    should "return valid instance" do
-      assert_instance_of(MusicBrainz::Track, @track)
-    end
-    
-    should "contain correct data" do
-      assert_equal("b3015bab-1540-4d4e-9f30-14872a1525f7", @track.recording_id)
-      assert_equal("Empire", @track.title)
-      assert_equal(233013, @track.length)
-    end
-  end
-end