rbrainz 0.4.2 → 0.5.0

data/examples/searchtracks.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 #
 # Example script which searches the database for
 # tracks and displays the track data.
 # 
-# $Id: searchtracks.rb 160 2007-07-27 13:18:04Z phw $
+# $Id: searchtracks.rb 254 2009-05-13 20:04:36Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.
@@ -32,4 +33,4 @@ tracks = query.get_tracks(track_filter)
 # indicates how good the track matches the search parameters.
 tracks.each do |entry|
   print "%s: \"%s\" (%i%%)\r\n" % [entry.entity.artist, entry.entity.title, entry.score]
-end
+end

data/examples/submit_isrcs.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+#
+# Example for submitting ISRCs to MusicBrainz.
+# This script will submit the ISRCs for the release Clayman by In Flames
+# (http://musicbrainz.org/album/1de625a1-55a5-4f8a-96f9-6d0a2a37ddcd.html).
+# The ISRCs were taken from the GEMA database at
+# http://mgonline.gema.de/soundcarrier/searchTracks.do?id=370495&seq=1&title=CLAYMAN
+#
+# $Id: submit_isrcs.rb 273 2009-05-24 22:29:04Z phw $
+
+# Just make sure we can run this example from the command
+# line even if RBrainz is not yet installed properly.
+$: << 'lib/' << '../lib/'
+
+# Load RBrainz and include the MusicBrainz namespace.
+require 'rbrainz'
+include MusicBrainz
+
+# Get the username and password
+print 'Username: ' unless ARGV[0]
+username = ARGV[0] ? ARGV[0] : STDIN.gets.strip
+print 'Password: ' unless ARGV[1]
+password = ARGV[1] ? ARGV[1] : STDIN.gets.strip
+
+# Set the authentication for the webservice.
+ws = Webservice::Webservice.new(
+       :host     => 'musicbrainz.org',
+       :username => username,
+       :password => password
+) 
+
+# Create a new Query object which will provide
+# us an interface to the MusicBrainz web service.
+query = Webservice::Query.new(ws, :client_id => 'RBrainz test ' + RBRAINZ_VERSION)
+
+# Submit the ISRCs for some tracks.
+query.submit_isrcs([
+  ['7f574ec1-344c-4ae1-970d-3c757f9a717e', 'DED830049301'],
+  ['1393122c-364c-4fb6-9a4b-17eddce90152', 'DED830049302'],
+  ['2634965c-5299-4958-b0dc-47b166bb6898', 'DED830049303'],
+  ['dad6b8a4-0412-4a80-9123-3e0ebddaf82d', 'DED830049304'],
+  ['e1f7e805-33f3-4663-b294-3805b82405f9', 'DED830049305'],
+  ['d9f932ad-de0d-44ca-bf35-ae8184f63909', 'DED830049306'],
+  ['c983b62d-f528-433f-a402-a6317ce3d2d8', 'DED830049307'],
+  ['9d50b06a-4136-427f-8d11-b2efb0141da6', 'DED830049308'],
+  ['f2af3e3f-3f9f-4f8d-8b60-1d1b709aaf69', 'DED830049309'],
+  ['059384bc-fb45-445e-ab77-950d6ccf587a', 'DED830049310'],
+  ['2f4d7b47-a4ba-495a-b447-60b8287ed9c9', 'DED830049311'],
+])
+
+puts "ISRCs submitted."

data/examples/tag.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 #
 # Example script showing the use of folksonomy tagging with RBrainz.
 # It asks the user for his username and password and a MBID and queries the
 # MusicBrainz server for the tags, the user has applied to the entitity with
 # the given MBID. Afterwards the user can submit new tags.
 # 
-# $Id: getuser.rb 145 2007-07-19 13:11:44Z phw $
+# $Id: tag.rb 273 2009-05-24 22:29:04Z phw $
 
 # Just make sure we can run this example from the command
 # line even if RBrainz is not yet installed properly.
@@ -40,4 +41,4 @@ puts tags.to_a.join(', ')
 # Ask the user for new tags and submit them
 print 'Enter new tags: '
 new_tags = STDIN.gets.strip
-query.submit_user_tags(mbid, new_tags)
+query.submit_user_tags(mbid, new_tags)

data/lib/rbrainz.rb

@@ -1,4 +1,5 @@
-# $Id: rbrainz.rb 145 2007-07-19 13:11:44Z phw $
+# -*- coding: utf-8 -*-
+# $Id: rbrainz.rb 254 2009-05-13 20:04:36Z phw $
 #
 # This is actually just a convenient shortcut that allows
 # the user to use RBrainz by just using <tt>require 'rbrainz'</tt>.

data/lib/rbrainz/core_ext.rb

@@ -1,4 +1,5 @@
-# $Id: core_ext.rb 132 2007-07-12 19:55:52Z phw $
+# -*- coding: utf-8 -*-
+# $Id: core_ext.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer

data/lib/rbrainz/core_ext/mbid.rb

@@ -1,4 +1,5 @@
-# $Id: mbid.rb 148 2007-07-19 17:26:33Z phw $
+# -*- coding: utf-8 -*-
+# $Id: mbid.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Core extensions to add a to_mbid conversion to existing classes.
 # 

data/lib/rbrainz/core_ext/net_http_digest.rb

@@ -1,4 +1,5 @@
-# $Id: net_http_digest.rb 182 2007-10-16 14:46:17Z nigel_graham $
+# -*- coding: utf-8 -*-
+# $Id: net_http_digest.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -86,4 +87,4 @@ module Net # :nodoc:
       return header
     end
   end
-end
+end

data/lib/rbrainz/core_ext/range.rb

@@ -1,4 +1,5 @@
-# $Id: range.rb 154 2007-07-24 12:39:02Z phw $
+# -*- coding: utf-8 -*-
+# $Id: range.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -12,4 +13,4 @@ class Range  #:nodoc:
   # Extend Range with additional comparison operations.
   include MusicBrainz::CoreExtensions::Range::Equality
   
-end
+end

data/lib/rbrainz/core_ext/range/equality.rb

@@ -1,4 +1,5 @@
-# $Id: equality.rb 154 2007-07-24 12:39:02Z phw $
+# -*- coding: utf-8 -*-
+# $Id: equality.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Nigel Graham (mailto:nigel_graham@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer

data/lib/rbrainz/data/countrynames.rb

@@ -1,4 +1,5 @@
-# $Id: countrynames.rb 141 2007-07-17 14:21:12Z phw $
+# -*- coding: utf-8 -*-
+# $Id: countrynames.rb 259 2009-05-17 17:44:00Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -242,7 +243,9 @@ module MusicBrainz
     	'MZ' => 'Mozambique',
     	'BA' => 'Bosnia and Herzegovina',
     	'CD' => 'Congo, The Democratic Republic of the',
-    	'CS' => 'Serbia and Montenegro',
+    	'CS' => 'Serbia and Montenegro (historical, 2003-2006)',
+    	'RS' => 'Serbia',
+    	'ME' => 'Montenegro',
     	'HR' => 'Croatia',
     	'KP' => 'Korea (North), Democratic People\'s Republic of',
     	'KR' => 'Korea (South), Republic of',
@@ -258,4 +261,4 @@ module MusicBrainz
     }
 
   end
-end
+end

data/lib/rbrainz/data/languagenames.rb

@@ -1,4 +1,5 @@
-# $Id: languagenames.rb 141 2007-07-17 14:21:12Z phw $
+# -*- coding: utf-8 -*-
+# $Id: languagenames.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -404,4 +405,4 @@ module MusicBrainz
 		'SQI' => 'Albanian',
 	}
   end
-end
+end

data/lib/rbrainz/data/releasetypenames.rb

@@ -1,4 +1,5 @@
-# $Id: releasetypenames.rb 141 2007-07-17 14:21:12Z phw $
+# -*- coding: utf-8 -*-
+# $Id: releasetypenames.rb 273 2009-05-24 22:29:04Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -31,4 +32,4 @@ module MusicBrainz
     }
 
   end
-end
+end

data/lib/rbrainz/data/scriptnames.rb

@@ -1,4 +1,5 @@
-# $Id: scriptnames.rb 141 2007-07-17 14:21:12Z phw $
+# -*- coding: utf-8 -*-
+# $Id: scriptnames.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -64,4 +65,4 @@ module MusicBrainz
     }
 
   end
-end
+end

data/lib/rbrainz/model.rb

@@ -1,4 +1,5 @@
-# $Id: model.rb 143 2007-07-18 11:40:55Z phw $
+# -*- coding: utf-8 -*-
+# $Id: model.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -37,4 +38,4 @@ module MusicBrainz # :nodoc:
     VARIOUS_ARTISTS_ID = MBID.new('89ad4ac3-39f7-470e-963a-56509c546377', Artist.entity_type)
   
   end 
-end
+end

data/lib/rbrainz/model/alias.rb

@@ -1,4 +1,5 @@
-# $Id: alias.rb 145 2007-07-19 13:11:44Z phw $
+# -*- coding: utf-8 -*-
+# $Id: alias.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -44,4 +45,4 @@ module MusicBrainz
     end
 
   end
-end
+end

data/lib/rbrainz/model/artist.rb

@@ -1,4 +1,5 @@
-# $Id: artist.rb 140 2007-07-17 13:27:54Z phw $
+# -*- coding: utf-8 -*-
+# $Id: artist.rb 258 2009-05-17 17:43:58Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -6,7 +7,6 @@
 #             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'rbrainz/model/individual'
-require 'rbrainz/model/alias'
 
 module MusicBrainz
   module Model
@@ -37,7 +37,15 @@ module MusicBrainz
       # See Entity::ENTITY_TYPE.
       ENTITY_TYPE = :artist # :nodoc:
       
+      # A Collection of release groups of this artist.
+      attr_reader :release_groups
+      
+      def initialize(id=nil, type=nil, name=nil, sort_name=nil)
+        super id, type, name, sort_name
+        @release_groups = Collection.new
+      end
+      
     end
 
   end
-end
+end

data/lib/rbrainz/model/collection.rb

@@ -1,4 +1,5 @@
-# $Id: collection.rb 172 2007-08-24 11:19:19Z phw $
+# -*- coding: utf-8 -*-
+# $Id: collection.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -101,4 +102,4 @@ module MusicBrainz
     end
     
   end
-end
+end

data/lib/rbrainz/model/default_factory.rb

@@ -1,4 +1,5 @@
-# $Id: default_factory.rb 143 2007-07-18 11:40:55Z phw $
+# -*- coding: utf-8 -*-
+# $Id: default_factory.rb 273 2009-05-24 22:29:04Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -7,6 +8,7 @@
 
 require 'rbrainz/model/artist'
 require 'rbrainz/model/label'
+require 'rbrainz/model/release_group'
 require 'rbrainz/model/release'
 require 'rbrainz/model/track'
 require 'rbrainz/model/user'
@@ -21,13 +23,15 @@ module MusicBrainz
       # <tt>:label</tt>, <tt>:release</tt> or <tt>:track</tt>).
       def new_entity(entity_type)
         case entity_type
-          when :artist
+          when Artist.entity_type
             new_artist
-          when :label
+          when Label.entity_type
             new_label
-          when :release
+          when ReleaseGroup.entity_type
+            new_release_group
+          when Release.entity_type
             new_release
-          when :track
+          when Track.entity_type
             new_track
         end
       end
@@ -40,6 +44,10 @@ module MusicBrainz
         Label.new
       end
       
+      def new_release_group
+        ReleaseGroup.new
+      end
+      
       def new_release
         Release.new
       end
@@ -68,6 +76,10 @@ module MusicBrainz
         Tag.new
       end
       
+      def new_rating
+        Rating.new
+      end
+      
       def new_user
         User.new
       end
@@ -75,4 +87,4 @@ module MusicBrainz
     end
     
   end
-end
+end

data/lib/rbrainz/model/disc.rb

@@ -1,4 +1,5 @@
-# $Id: disc.rb 141 2007-07-17 14:21:12Z phw $
+# -*- coding: utf-8 -*-
+# $Id: disc.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -64,4 +65,4 @@ module MusicBrainz
     end
 
   end
-end
+end

data/lib/rbrainz/model/entity.rb

@@ -1,4 +1,5 @@
-# $Id: entity.rb 162 2007-07-29 17:44:11Z phw $
+# -*- coding: utf-8 -*-
+# $Id: entity.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -6,10 +7,6 @@
 #             See LICENSE[file:../LICENSE.html] for permissions.
  
 require 'rbrainz/model/mbid'
-require 'rbrainz/model/relation'
-require 'rbrainz/model/collection'
-require 'rbrainz/model/tag'
-require 'set'
 
 module MusicBrainz
   module Model
@@ -45,21 +42,10 @@ module MusicBrainz
       # The MusicBrainz ID. A MBID containing an absolute URI.
       attr_reader :id
       
-      # A Collection of Tag objects assigned to this entity.
-      attr_reader :tags
-      
       # Create a new Entity. You can assign a MusicBrainz identifier to the
       # created entity with the parameter _mbid_ (see id=).
       def initialize(mbid=nil)
         self.id = mbid
-        @tags = Collection.new
-        @relations = {
-          Relation::TO_ARTIST  => Collection.new,
-          Relation::TO_RELEASE => Collection.new,
-          Relation::TO_TRACK   => Collection.new,
-          Relation::TO_LABEL   => Collection.new,
-          Relation::TO_URL     => Collection.new,
-        }
       end
       
       # Set the MBID.
@@ -97,92 +83,6 @@ module MusicBrainz
         self.class.entity_type
       end
       
-      #
-      # Adds a relation.
-      #
-      # This method adds _relation_ to the list of relations. The
-      # given relation has to be initialized, at least the target
-      # type has to be set.
-      #
-      def add_relation(relation)
-        @relations[relation.target_type] << relation
-      end
-      
-      #
-      # Returns a list of relations.
-      #
-      # If _target_type_ is given, only relations of that target
-      # type are returned. For MusicBrainz, the following target
-      # types are defined:
-      # - Relation::TO_ARTIST
-      # - Relation::TO_RELEASE
-      # - Relation::TO_TRACK
-      # - Relation::TO_URL
-      # 
-      # If _target_type_ is Relation::TO_ARTIST, for example,
-      # this method returns all relations between this Entity and
-      # artists.
-      #
-      # You may use the _relation_type_ parameter to further restrict
-      # the selection. If it is set, only relations with the given
-      # relation type are returned. The _required_attributes_ sequence
-      # lists attributes that have to be part of all returned relations.
-      #
-      # If _direction_ is set, only relations with the given reading
-      # direction are returned. You can use the Relation::DIR_FORWARD,
-      # Relation::DIR_BACKWARD, and Relation::DIR_BOTH constants
-      # for this.
-      #
-      def get_relations(options = {:target_type => nil, :relation_type => nil,
-                                   :required_attributes => [], :direction => nil})
-        Utils.check_options options, 
-            :target_type, :relation_type, :required_attributes, :direction
-        
-        target_type   = Utils.add_namespace(options[:target_type], NS_REL_1)
-        relation_type = Utils.add_namespace(options[:relation_type], NS_REL_1)
-        required_attributes = 
-          options[:required_attributes] ? options[:required_attributes] : []
-        direction = options[:direction]
-        
-        # Select all relevant relations depending on the requested target type
-        if target_type
-          result = @relations[target_type].to_a
-        else
-          result = @relations.values.flatten
-        end
-        
-        # Filter for direction
-        #
-        result = result.find_all { |r| r.direction == direction } if direction
-        
-        # Filter for relation type
-        #
-        result = result.find_all{ |r| r.type == relation_type } if relation_type
-        
-        # Filter for attributes
-        #
-        required = required_attributes.map{|a| Utils.add_namespace(a, NS_REL_1)}.to_set
-        result.find_all do |r|
-             required.subset?( r.attributes.to_set )
-        end
-      end
-      
-      #
-      # Returns a list of target types available for this entity.
-      # 
-      # Use this to find out to which types of targets this entity
-      # has relations. If the entity only has relations to tracks and
-      # artists, for example, then a list containg the strings
-      # Relation::TO_TRACK and Relation::TO_ARTIST is returned.
-      #
-      def relation_target_types
-        result = []
-        @relations.each_pair {|type, relations|
-          result << type unless relations.empty?
-        }
-        return result
-      end
-      
     end
     
   end