7digital 0.0.7 → 0.1.0

data/lib/sevendigital/digestion_tract/user_card_digestor.rb

@@ -6,17 +6,18 @@ module Sevendigital
     def default_element_name; :card end
     def default_list_element_name; :cards end
     
-    def from_proxy(card_proxy)
-      make_sure_not_eating_nil(card_proxy)
+    def from_xml_doc(xml_node)
+      make_sure_eating_nokogiri_node(xml_node)
 
       card = Sevendigital::Card.new(@api_client)
-      card.id = card_proxy.id.to_i
-      card.type = card_proxy.type.value.to_s
-      card.last_4_digits = card_proxy.last4digits.value.to_s
-      card.card_holder_name = card_proxy.card_holder_name.value.to_s if value_present?(card_proxy.card_holder_name)
-      card.expiry_date = card_proxy.expiry_date.value.to_s if value_present?(card_proxy.expiry_date)
 
-      return card
+      card.id = get_optional_attribute(xml_node,"id").to_i
+      card.type = get_required_value(xml_node, "type")
+      card.last_4_digits = get_required_value(xml_node, "last4digits")
+      card.card_holder_name = get_optional_value(xml_node, "cardHolderName")
+      card.expiry_date = get_optional_value(xml_node, "expiryDate")
+
+      card
     end
 
   end

data/lib/sevendigital/digestion_tract/user_digestor.rb

@@ -4,16 +4,17 @@ module Sevendigital
   class UserDigestor < Digestor # :nodoc:
 
     def default_element_name; :user end
-    
-    def from_proxy(user_proxy)
-      make_sure_not_eating_nil(user_proxy)
+
+    def from_xml_doc(xml_node)
+      make_sure_eating_nokogiri_node(xml_node)
 
       user = User.new(@api_client)
-      user.id = user_proxy.id.to_s  if !user_proxy.nil?
-      user.type = user_proxy.type.value.to_sym
-      user.email_address = user_proxy.email_address.value.to_s if value_present?(user_proxy.email_address)
 
-      return user
+      user.id = get_optional_attribute(xml_node, "id")
+      user.type = get_optional_value(xml_node, "type") {|v| v.to_sym}
+      user.email_address = get_optional_value(xml_node, "emailAddress")
+
+      user
     end
 
   end

data/lib/sevendigital/management/artist_manager.rb

@@ -1,5 +1,3 @@
-require "peachy"
-
 module Sevendigital
 
   # provides access to Artist related API methods (artist/*)
@@ -12,7 +10,7 @@ module Sevendigital
     # @return [Artist]
     def get_details(artist_id, options={})
       api_response = @api_client.make_api_request(:GET, "artist/details", {:artistId => artist_id}, options)
-      @api_client.artist_digestor.from_xml(api_response.content.artist)
+      @api_client.artist_digestor.from_xml_doc(api_response.item_xml("artist"))
     end
 
     # calls *artist/releases* API method and returns Release array
@@ -22,7 +20,7 @@ module Sevendigital
     # @return [[Artist]]
     def get_releases(artist_id, options={})
       api_response = @api_client.make_api_request(:GET, "artist/releases", {:artistId => artist_id}, options)
-      @api_client.release_digestor.list_from_xml(api_response.content.releases)
+      @api_client.release_digestor.list_from_xml_doc(api_response.item_xml("releases"))
     end
       
     # calls *artist/toptracks* API method and returns Track array
@@ -32,7 +30,7 @@ module Sevendigital
     # @return [Array<Track>]
       def get_top_tracks(artist_id, options={})
       api_response = @api_client.make_api_request(:GET, "artist/topTracks", {:artistId => artist_id}, options)
-      @api_client.track_digestor.list_from_xml(api_response.content.tracks)
+      @api_client.track_digestor.list_from_xml_doc(api_response.item_xml("tracks"))
     end
 
     # calls *artist/similar* API method and returns Artist array
@@ -42,7 +40,7 @@ module Sevendigital
     # @return [Array<Artist>]
     def get_similar(artist_id, options={})
       api_response = @api_client.make_api_request(:GET, "artist/similar", {:artistId => artist_id}, options)
-      @api_client.artist_digestor.list_from_xml(api_response.content.artists)
+      @api_client.artist_digestor.list_from_xml_doc(api_response.item_xml("artists"))
     end
 
     # calls *artist/byTag/top* API method and returns Artist array
@@ -52,7 +50,7 @@ module Sevendigital
     # @return [Array<Artist>]
     def get_top_by_tag(tags, options={})
       api_response = @api_client.make_api_request(:GET, "artist/byTag/top", {:tags => tags}, options)
-      @api_client.artist_digestor.nested_list_from_xml(api_response.content.tagged_results, :tagged_item, :tagged_results)
+      @api_client.artist_digestor.nested_list_from_xml_doc(api_response.item_xml("taggedResults"), :taggedItem, :artist)
     end
 
     # calls *artist/search* API method and returns Artist array
@@ -62,7 +60,7 @@ module Sevendigital
     # @return [Array<Artist>]
     def search(query, options={})
      api_response = @api_client.make_api_request(:GET, "artist/search", {:q => query}, options)
-     @api_client.artist_digestor.nested_list_from_xml(api_response.content.search_results, :search_result, :search_results)
+     @api_client.artist_digestor.nested_list_from_xml_doc(api_response.item_xml("searchResults"), :searchResult, :artist)
     end
 
     # calls *artist/browse* API method and returns Artist array
@@ -72,7 +70,7 @@ module Sevendigital
     # @return [Array<Artist>]
     def browse(letter, options={})
      api_response = @api_client.make_api_request(:GET, "artist/browse", {:letter => letter}, options)
-     @api_client.artist_digestor.list_from_xml(api_response.content.artists)
+     @api_client.artist_digestor.list_from_xml_doc(api_response.item_xml("artists"))
     end
 
     # calls *artist/chart* API method and returns Artist array
@@ -80,7 +78,7 @@ module Sevendigital
     # @param [Hash] options optional hash of additional API parameters, e.g. page_size => 50, etc
     def get_chart(options={})
      api_response = @api_client.make_api_request(:GET, "artist/chart", {}, options)
-     @api_client.chart_item_digestor.list_from_xml(api_response.content.chart)
+     @api_client.chart_item_digestor.list_from_xml_doc(api_response.item_xml("chart"))
     end
 
     # calls *artist/tags* API method and returns Tag array
@@ -90,7 +88,7 @@ module Sevendigital
     # @return [Array<Tag>]
     def get_tags(artist_id, options={})
       api_response = @api_client.make_api_request(:GET, "artist/tags", {:artistId => artist_id}, options)
-      @api_client.tag_digestor.list_from_xml(api_response.content.tags)
+      @api_client.tag_digestor.list_from_xml_doc(api_response.item_xml("tags"))
     end
 
 

data/lib/sevendigital/management/basket_manager.rb

@@ -4,23 +4,23 @@ module Sevendigital
 
      def get(basket_id, options={})
         api_response = @api_client.make_api_request(:GET, "basket", {:basketId => basket_id}, options)
-        @api_client.basket_digestor.from_xml(api_response.content.basket)
+        @api_client.basket_digestor.from_xml_doc(api_response.item_xml("basket"))
       end
 
       def create(options={})
         api_response = @api_client.make_api_request(:GET, "basket/create", {}, options)
-        @api_client.basket_digestor.from_xml(api_response.content.basket)
+        @api_client.basket_digestor.from_xml_doc(api_response.item_xml("basket"))
       end
 
       def add_item(basket_id, release_id, track_id=nil, options={})
         api_response = @api_client.make_api_request(:GET, "basket/addItem", {:basketId => basket_id, :releaseId => release_id, :trackId => track_id}, options)
-        @api_client.basket_digestor.from_xml(api_response.content.basket)
+        @api_client.basket_digestor.from_xml_doc(api_response.item_xml("basket"))
       end
 
 
       def remove_item(basket_id, item_id, options={})
         api_response = @api_client.make_api_request(:GET, "basket/removeItem", {:basketId => basket_id, :itemId => item_id}, options)
-        @api_client.basket_digestor.from_xml(api_response.content.basket)
+        @api_client.basket_digestor.from_xml_doc(api_response.item_xml("basket"))
       end
 
 

data/lib/sevendigital/management/country_manager.rb

@@ -0,0 +1,11 @@
+module Sevendigital
+
+  class CountryManager < Manager
+
+    def resolve(ip_address, options={})
+      api_response = @api_client.make_api_request(:GET, "country/resolve", {:ipaddress=>ip_address}, options)
+      @api_client.country_digestor.from_xml_doc(api_response.item_xml("GeoIpLookup"))
+    end
+
+  end
+end

data/lib/sevendigital/management/list_manager.rb

@@ -0,0 +1,18 @@
+module Sevendigital
+
+  # provides access to Artist related API methods (artist/*)
+  class ListManager < Manager
+
+    # calls *editorial/list* API method and returns Artist with populated details
+    #
+    # @param [String] key
+    # @param [Hash] options optional hash of additional API parameters, e.g. page_size => 50, etc
+    # @return [List]
+    def get_editorial_list(key, options={})
+      api_response = @api_client.make_api_request(:GET, "editorial/list", {:key => key}, options)
+      @api_client.list_digestor.from_xml_doc(api_response.item_xml("list"))
+    end
+
+  end
+
+end

data/lib/sevendigital/management/oauth_manager.rb

@@ -4,12 +4,12 @@ module Sevendigital
 
     def get_request_token
       api_response = @api_client.make_signed_api_request(:GET, "oauth/requestToken", {})
-      @api_client.oauth_request_token_digestor.from_xml(api_response.content.oauth_request_token, :oauth_request_token)
+      @api_client.oauth_request_token_digestor.from_xml_doc(api_response.item_xml("oauth_request_token"))
     end
 
     def get_access_token(request_token)
       api_response = @api_client.make_signed_api_request(:GET, "oauth/accessToken", {}, {}, request_token)
-      @api_client.oauth_access_token_digestor.from_xml(api_response.content.oauth_access_token, :oauth_access_token)
+      @api_client.oauth_access_token_digestor.from_xml_doc(api_response.item_xml("oauth_access_token"))
     end
 
     def authorise_request_token(username, password, request_token)

data/lib/sevendigital/management/release_manager.rb

@@ -1,23 +1,21 @@
-require "peachy"
-
 module Sevendigital
 
   class ReleaseManager < Manager
 
     def get_details(release_id, options = {})
       api_response = @api_client.make_api_request(:GET, "release/details", {:releaseId => release_id}, options)
-      @api_client.release_digestor.from_xml(api_response.content.release)
+      @api_client.release_digestor.from_xml_doc(api_response.item_xml("release"))
     end
 
     def get_tracks(release_id, options = {})
       options[:page_size] ||= 100
       api_response = @api_client.make_api_request(:GET, "release/tracks", {:releaseId => release_id}, options)
-      @api_client.track_digestor.list_from_xml(api_response.content.tracks)
+      @api_client.track_digestor.list_from_xml_doc(api_response.item_xml("tracks"))
     end
 
     def get_chart(options={})
       api_response = @api_client.make_api_request(:GET, "release/chart", {}, options)
-      @api_client.chart_item_digestor.list_from_xml(api_response.content.chart)
+      @api_client.chart_item_digestor.list_from_xml_doc(api_response.item_xml("chart"))
     end
 
     def get_by_date(from_date = nil, to_date = nil, options = {})
@@ -26,30 +24,30 @@ module Sevendigital
       parameters[:toDate] = to_date.strftime("%Y%m%d") if to_date
 
       api_response = @api_client.make_api_request(:GET, "release/byDate", parameters, options)
-      @api_client.release_digestor.list_from_xml(api_response.content.releases)
+      @api_client.release_digestor.list_from_xml_doc(api_response.item_xml("releases"))
     end
 
     def get_recommendations(release_id, options = {})
       api_response = @api_client.make_api_request(:GET, "release/recommend", {:releaseId => release_id}, options)
-      @api_client.release_digestor.nested_list_from_xml(api_response.content.recommendations, :recommended_item, :recommendations)
+      @api_client.release_digestor.nested_list_from_xml_doc(api_response.item_xml("recommendations"), :recommendedItem, :release)
     end
 
 
     def get_top_by_tag(tags, options = {})
       api_response = @api_client.make_api_request(:GET, "release/byTag/top", {:tags => tags}, options)
-      @api_client.release_digestor.nested_list_from_xml( \
-      api_response.content.tagged_results, :tagged_item, :tagged_results )
+      @api_client.release_digestor.nested_list_from_xml_doc( \
+      api_response.item_xml("taggedResults"), :taggedItem, :release )
     end
 
     def search(query, options={})
       api_response = @api_client.make_api_request(:GET, "release/search", {:q => query}, options)
-      @api_client.release_digestor.nested_list_from_xml(api_response.content.search_results, :search_result, :search_results)
+      @api_client.release_digestor.nested_list_from_xml_doc(api_response.item_xml("searchResults"), :searchResult, :release)
     end
 
 
     def get_tags(release_id, options = {})
       api_response = @api_client.make_api_request(:GET, "release/tags", {:releaseId => release_id}, options)
-      @api_client.tag_digestor.list_from_xml(api_response.content.tags)
+      @api_client.tag_digestor.list_from_xml_doc(api_response.item_xml("tags"))
     end
 
   end

data/lib/sevendigital/management/tag_manager.rb

@@ -4,7 +4,7 @@ module Sevendigital
 
     def get_tag_list(options={})
       api_response = @api_client.make_api_request(:GET, "tag", {}, options)
-      @api_client.tag_digestor.list_from_xml(api_response.content.tags)
+      @api_client.tag_digestor.list_from_xml_doc(api_response.item_xml("tags"))
     end
 
   end

data/lib/sevendigital/management/track_manager.rb

@@ -1,10 +1,8 @@
 module Sevendigital
-
   class TrackManager < Manager
-
     def get_details(id, options={})
       api_response = @api_client.make_api_request(:GET, "track/details", {:trackId => id}, options)
-      @api_client.track_digestor.from_xml(api_response.content.track)
+      @api_client.track_digestor.from_xml_doc(api_response.item_xml("track"))
     end
 
     def get_details_from_release(track_id, release_id, options={})
@@ -13,7 +11,7 @@ module Sevendigital
 
     def get_chart(options={})
       api_response = @api_client.make_api_request(:GET, "track/chart", {}, options)
-      @api_client.chart_item_digestor.list_from_xml(api_response.content.chart)
+      @api_client.chart_item_digestor.list_from_xml_doc(api_response.item_xml("chart"))
     end
 
     def build_preview_url(id, options={})
@@ -23,7 +21,8 @@ module Sevendigital
 
     def search(query, options={})
       api_response = @api_client.make_api_request(:GET, "track/search", {:q => query}, options)
-      @api_client.track_digestor.nested_list_from_xml(api_response.content.search_results, :search_result, :search_results)
+      @api_client.track_digestor.nested_list_from_xml_doc(api_response.item_xml("searchResults"), :searchResult, :track)
     end
+
   end
 end

data/lib/sevendigital/management/user_card_manager.rb

@@ -4,7 +4,7 @@ module Sevendigital
 
     def get_card_list(token, options={})
       api_response = @api_client.make_signed_api_request(:GET, "user/payment/card", {}, options, token)
-      @api_client.user_card_digestor.list_from_xml(api_response.content.cards)
+      @api_client.user_card_digestor.list_from_xml_doc(api_response.item_xml("cards"))
     end
 
     def add_card(card_number, card_type, card_holder_name, card_start_date, card_expiry_date, card_issue_number,
@@ -14,7 +14,7 @@ module Sevendigital
           :cardStartDate => card_start_date, :cardExpiryDate => card_expiry_date, :cardIssueNumber => card_issue_number,
           :cardVerificationCode => card_verification_code, :cardPostCode => card_post_code, :cardCountry => card_country
         }, options, token)
-      @api_client.user_card_digestor.from_xml(api_response.content.card)
+      @api_client.user_card_digestor.from_xml_doc(api_response.item_xml("card"))
     end
 
     def select_card(card_id, token, options={})

data/lib/sevendigital/management/user_manager.rb

@@ -2,6 +2,11 @@ module Sevendigital
 
   class UserManager < Manager
 
+    def get_details(token, options={})
+      api_response = @api_client.make_signed_api_request(:GET, "user/details", {}, options, token)
+      @locker = @api_client.user_digestor.from_xml_doc(api_response.item_xml("user"))
+    end
+
     def login(access_token)
       raise Sevendigital::SevendigitalError if !access_token.kind_of? OAuth::AccessToken
       user = Sevendigital::User.new(@api_client)
@@ -20,14 +25,14 @@ module Sevendigital
     def sign_up(email, password, options={})
       api_response = @api_client.make_signed_api_request(:POST, "user/signUp", \
         {:emailAddress => email, :password=> password}, options)
-      user = @api_client.user_digestor.from_xml(api_response.content.user)
+      user = @api_client.user_digestor.from_xml_doc(api_response.item_xml("user"))
       user.oauth_access_token = authenticate(email, password).oauth_access_token
       user
     end
 
     def get_locker(token, options={})
       api_response = @api_client.make_signed_api_request(:GET, "user/locker", {}, options, token)
-      @locker = @api_client.locker_digestor.from_xml(api_response.content.locker)
+      @locker = @api_client.locker_digestor.from_xml_doc(api_response.item_xml("locker"))
     end
 
     # <b>DEPRECATED:</b> Please use <tt>purchase_item</tt> instead.
@@ -39,13 +44,13 @@ module Sevendigital
     def purchase_item(release_id, track_id, price, token, options={})
       api_response = @api_client.make_signed_api_request(:GET, "user/purchase/item", \
         {:releaseId => release_id, :trackId => track_id, :price => price}, options, token)
-      @api_client.locker_digestor.from_xml(api_response.content.purchase)
+      @api_client.locker_digestor.from_xml_doc(api_response.item_xml("purchase"))
     end
 
     def purchase_basket(basket_id, token, options={})
       api_response = @api_client.make_signed_api_request(:GET, "user/purchase/basket", \
         {:basketId => basket_id}, options, token)
-      @api_client.locker_digestor.from_xml(api_response.content.purchase)
+      @api_client.locker_digestor.from_xml_doc(api_response.item_xml("purchase"))
     end
 
     def get_stream_track_url(release_id, track_id, token, options={})

data/lib/sevendigital/model/api_response.rb

@@ -7,17 +7,25 @@ module Sevendigital
 
     #True if no API error has been returned
     def ok?
-      return (@error_code == 0 && !@content.nil?)
+      (@error_code == 0 && !@content.nil?)
+    end
+
+    def content_xml
+      puts @content
+      @content_xml ||= Nokogiri::XML(@content)
+    end
+
+    def item_xml(element_name)
+      content_xml.at_xpath("./response/#{element_name}")
     end
 
     def _dump(depth)
-      Marshal.dump([@error_code, @error_message, @headers, @content.to_s])
+      Marshal.dump([@error_code, @error_message, @headers, @content])
     end
     
     def self._load(properties)
       response = ApiResponse.new
-      response.error_code, response.error_message, response.headers, content_xml = Marshal.load(properties)
-      response.content = Peachy::Proxy.new(content_xml).response
+      response.error_code, response.error_message, response.headers, response.content = Marshal.load(properties)
       response
     end
 

data/lib/sevendigital/model/artist.rb

@@ -32,6 +32,10 @@ class Artist < SevendigitalObject
   #@return [String]
   sevendigital_basic_property :url
 
+  #popularity of the artist (lazy loaded using #get_tags)
+  #@return [decimal] similar
+  sevendigital_basic_property :popularity
+
   #artist's releases (lazy loaded using get_releases)
   #@return [Array<Release>] 
   sevendigital_extended_property :releases
@@ -53,6 +57,7 @@ class Artist < SevendigitalObject
     def get_details(options={})
       artist_with_details = @api_client.artist.get_details(@id, options)
       copy_basic_properties_from(artist_with_details)
+      artist_with_details
     end
 
     #releases by this artist retrieved by calling *artist/releases* API method

data/lib/sevendigital/model/list.rb

@@ -0,0 +1,5 @@
+module Sevendigital
+  class List < SevendigitalObject
+    attr_accessor :id, :key, :list_items
+  end
+end

data/lib/sevendigital/model/list_item.rb

@@ -0,0 +1,9 @@
+module Sevendigital
+
+  class ListItem < SevendigitalObject
+
+    attr_accessor :id, :type, :release
+
+  end
+  
+end