test/fixtures/nil_video.xml test/fixtures/nine_inch_nails.xml test/fixtures/radiohead.xml test/fixtures/sailing_three_tuesdays.xml test/fixtures/there_there.xml test/test_helper.rb test/test_mtv_music_artist.rb test/test_mtv_music_video.rb @@ -15,6 +15,6 @@ module MTV API_VERSION = '1' API_URL = "http://api.mtvnservices.com/#{API_VERSION}/" - MTV::Music::Base::connection = REST::Connection.new(API_URL, :rate_limit => 0.5) + MTV::Music::Base::connection = REST::Connection.new(API_URL, :rate_limit => 0.68) end end \ No newline at end of file lib/mtv-music.rb @@ -1,19 +1,18 @@ module MTV module Music - class Artist < Base - attribute :uri, String, :matcher => "author/uri" + class Artist < Base attribute :name, String, :matcher => "author/name" attribute :thumbnail_url, String, :matcher => "media:thumbnail", :attribute => "url" - - def initialize_without_polymorphism(xml) - super - @id = @uri.split('/').last - end def videos xml = Video.fetch_and_parse(self.class.api_path(:videos, self.id)) return xml.search("entry/id").collect{|elem| Video.new(Video.fetch_and_parse(elem.inner_text))} end + + def related + xml = Artist.fetch_and_parse(self.class.api_path(:related, self.id)) + return xml.search("entry/id").collect{|elem| Artist.new(Artist.fetch_and_parse(elem.inner_text))} + end end end end \ No newline at end of file lib/mtv-music/artist.rb @@ -3,7 +3,7 @@ module MTV class Base class << self - attr_accessor :attributes + cattr_accessor :attributes cattr_accessor :connection def attribute(*args) @@ -67,13 +67,21 @@ module MTV end end - attr_accessor :id - + attr_accessor :id, :uri + def initialize(xml) raise ArgumentError unless xml.kind_of?(Hpricot) - + + if xml.at(:uri).inner_text == "http://api.mtvnservices.com/1/" + raise MTVNetworkServiceError, xml.at(:title).inner_text, xml.at(:content).inner_text + end + + @uri = xml.at(:id).inner_text + @id = @uri.split('/').last + self.class.attributes.each do |attribute, options| element = xml.search(options[:matcher]).first + next if element.nil? value = options[:attribute] ? element.attributes[options[:attribute]] : element.inner_text# rescue nil begin if options[:type] == Integer @@ -87,6 +95,7 @@ module MTV self.instance_variable_set("@#{attribute}", value) end end + end def initialize_with_polymorphism(arg) @@ -107,7 +116,7 @@ module MTV protected def query_by_string(string) - xml = self.class.fetch_and_parse(self.class.api_path(nil, string)) + xml = self.class.fetch_and_parse(self.class.api_path(nil, string.gsub(/\s+/, '_'))) return xml.at(:entry) end lib/mtv-music/base.rb @@ -1,19 +1,13 @@ module MTV module Music class Video < Base - attribute :uri, String, :matcher => "id" - attribute :media_uri, String, :matcher => "media:content", :attribute => "url" - attribute :artist_uri, String, :matcher => "author/uri" - attribute :title, String, :matcher => "media:title" - attribute :description, String, :matcher => "media:description" - attribute :director, String, :matcher => "media:credit[@role^='director']" - attribute :released_on, Date, :matcher => "published" - attribute :updated_on, Date, :matcher => "updated" - - def initialize_without_polymorphism(xml) - super - @id = @uri.split('/').last - end + attribute :media_uri, String, :matcher => "media:content", :attribute => "url" + attribute :artist_uri, String, :matcher => "author/uri" + attribute :title, String, :matcher => "media:title" + attribute :description, String, :matcher => "media:description" + attribute :director, String, :matcher => "media:credit[@role^='director']" + attribute :released_on, Date, :matcher => "published" + attribute :updated_on, Date, :matcher => "updated" # <embed src="http://media.mtvnservices.com/mgid:uma:video:api.mtvnservices.com:235854" # width="448" height="366" type="application/x-shockwave-flash" @@ -35,6 +29,14 @@ module MTV end alias_method :to_html, :embed_code + + class << self + # Workaround for case-sensitivity for Video aliases + def api_path(method, id = nil) + parameters = [self.name.downcase, id, method].compact + return parameters.collect!{|param| CGI::escape(param.to_s)}.join('/') + end + end end # Taken from ActionView#TagHelper lib/mtv-music/video.rb feb5063dab452e8d24de8e3c27f8b98c90ba852f Mattt Thompson mail@matttthompson.com http://github.com/mattt/mtv-music/commit/3dc042663fe229051460bf48d668a4d5f04015e6 3dc042663fe229051460bf48d668a4d5f04015e6 2008-11-12T14:57:25-08:00 2008-11-12T14:57:25-08:00 Added preliminary unit tests 0bf7301c36678f849e006c5866f860cf10944bed Mattt Thompson mail@matttthompson.com