7digital 0.1.2 → 0.1.5

data/lib/sevendigital/management/basket_manager.rb

@@ -1,29 +1,29 @@
-module Sevendigital
-
-  class BasketManager < Manager
-
-     def get(basket_id, options={})
-        api_response = @api_client.make_api_request(:GET, "basket", {:basketId => basket_id}, options)
-        @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_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_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_doc(api_response.item_xml("basket"))
-      end
-
-
-  end
-
-end
+module Sevendigital
+
+  class BasketManager < Manager
+
+     def get(basket_id, options={})
+        api_response = @api_client.make_api_request(:GET, "basket", {:basketId => basket_id}, options)
+        @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_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_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_doc(api_response.item_xml("basket"))
+      end
+
+
+  end
+
+end

data/lib/sevendigital/management/country_manager.rb

@@ -1,11 +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
+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

@@ -1,18 +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
+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/manager.rb

@@ -1,12 +1,12 @@
-module Sevendigital
-
-  #@private
-  class Manager # :nodoc:
-
-    def initialize(api_client)
-      @api_client =  api_client
-    end
-
-  end
-
-end
+module Sevendigital
+
+  #@private
+  class Manager # :nodoc:
+
+    def initialize(api_client)
+      @api_client =  api_client
+    end
+
+  end
+
+end

data/lib/sevendigital/management/oauth_manager.rb

@@ -1,23 +1,23 @@
-module Sevendigital
-
-  class OAuthManager < Manager
-
-    def get_request_token
-      api_response = @api_client.make_signed_api_request(:GET, "oauth/requestToken", {})
-      @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_doc(api_response.item_xml("oauth_access_token"))
-    end
-
-    def authorise_request_token(username, password, request_token)
-      api_response = @api_client.make_signed_api_request(:GET, "oauth/requestToken/authorise", \
-        {:username => username, :password => password, :token => request_token.token})
-      api_response.ok?
-    end
-
-  end
-
-end
+module Sevendigital
+
+  class OAuthManager < Manager
+
+    def get_request_token
+      api_response = @api_client.make_signed_api_request(:GET, "oauth/requestToken", {})
+      @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_doc(api_response.item_xml("oauth_access_token"))
+    end
+
+    def authorise_request_token(username, password, request_token)
+      api_response = @api_client.make_signed_api_request(:GET, "oauth/requestToken/authorise", \
+        {:username => username, :password => password, :token => request_token.token})
+      api_response.ok?
+    end
+
+  end
+
+end

data/lib/sevendigital/management/release_manager.rb

@@ -1,55 +1,55 @@
-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_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_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_doc(api_response.item_xml("chart"))
-    end
-
-    def get_by_date(from_date = nil, to_date = nil, options = {})
-      parameters = Hash.new
-      parameters[:fromDate] = from_date.strftime("%Y%m%d") if from_date
-      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_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_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_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_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_doc(api_response.item_xml("tags"))
-    end
-
-  end
-
+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_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_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_doc(api_response.item_xml("chart"))
+    end
+
+    def get_by_date(from_date = nil, to_date = nil, options = {})
+      parameters = Hash.new
+      parameters[:fromDate] = from_date.strftime("%Y%m%d") if from_date
+      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_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_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_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_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_doc(api_response.item_xml("tags"))
+    end
+
+  end
+
 end

data/lib/sevendigital/management/tag_manager.rb

@@ -1,11 +1,11 @@
-module Sevendigital
-
-  class TagManager < Manager
-
-    def get_tag_list(options={})
-      api_response = @api_client.make_api_request(:GET, "tag", {}, options)
-      @api_client.tag_digestor.list_from_xml_doc(api_response.item_xml("tags"))
-    end
-
-  end
+module Sevendigital
+
+  class TagManager < Manager
+
+    def get_tag_list(options={})
+      api_response = @api_client.make_api_request(:GET, "tag", {}, options)
+      @api_client.tag_digestor.list_from_xml_doc(api_response.item_xml("tags"))
+    end
+
+  end
 end

data/lib/sevendigital/management/track_manager.rb

@@ -1,28 +1,30 @@
-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_doc(api_response.item_xml("track"))
-    end
-
-    def get_details_from_release(track_id, release_id, options={})
-      @api_client.release.get_tracks(release_id, options).find {|track| track.id == track_id}
-    end
-
-    def get_chart(options={})
-      api_response = @api_client.make_api_request(:GET, "track/chart", {}, options)
-      @api_client.chart_item_digestor.list_from_xml_doc(api_response.item_xml("chart"))
-    end
-
-    def build_preview_url(id, options={})
-      api_request = @api_client.create_api_request(:GET, "track/preview", {:trackId => id}, options)
-      @api_client.operator.get_request_uri(api_request)
-    end
-
-    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_doc(api_response.item_xml("searchResults"), :searchResult, :track)
-    end
-
-  end
+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_doc(api_response.item_xml("track"))
+    end
+
+    def get_details_from_release(track_id, release_id, options={})
+      @api_client.release.get_tracks(release_id, options).find {|track| track.id == track_id}
+    end
+
+    def get_chart(options={})
+      api_response = @api_client.make_api_request(:GET, "track/chart", {}, options)
+      @api_client.chart_item_digestor.list_from_xml_doc(api_response.item_xml("chart"))
+    end
+
+    def build_preview_url(id, options={})
+      api_request = @api_client.create_api_request(:GET, "clip/#{id}", {}, options)
+      api_request.api_service = :previews
+      api_request.require_signature
+      @api_client.operator.get_request_uri(api_request)
+    end
+
+    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_doc(api_response.item_xml("searchResults"), :searchResult, :track)
+    end
+
+  end
 end

data/lib/sevendigital/management/user_card_manager.rb

@@ -1,27 +1,27 @@
-module Sevendigital
-
-  class UserCardManager < Manager
-
-    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_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,
-            card_verification_code, card_post_code, card_country, token, options={})
-      api_response = @api_client.make_signed_api_request(:POST, "user/payment/card/add", {
-          :cardNumber => card_number, :cardType => card_type, :cardHolderName => card_holder_name,
-          :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_doc(api_response.item_xml("card"))
-    end
-
-    def select_card(card_id, token, options={})
-      api_response = @api_client.make_signed_api_request(
-              :POST, "user/payment/card/select", {:cardId => card_id}, options, token)
-      api_response.ok?
-    end
-
-  end
+module Sevendigital
+
+  class UserCardManager < Manager
+
+    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_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,
+            card_verification_code, card_post_code, card_country, token, options={})
+      api_response = @api_client.make_signed_api_request(:POST, "user/payment/card/add", {
+          :cardNumber => card_number, :cardType => card_type, :cardHolderName => card_holder_name,
+          :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_doc(api_response.item_xml("card"))
+    end
+
+    def select_card(card_id, token, options={})
+      api_response = @api_client.make_signed_api_request(
+              :POST, "user/payment/card/select", {:cardId => card_id}, options, token)
+      api_response.ok?
+    end
+
+  end
 end

data/lib/sevendigital/management/user_manager.rb

@@ -1,76 +1,76 @@
-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)
-      user.oauth_access_token = access_token
-      user
-    end
-
-    def authenticate(email, password)
-      request_token = @api_client.oauth.get_request_token
-      return nil unless @api_client.oauth.authorise_request_token(email, password, request_token)
-      user = Sevendigital::User.new(@api_client)
-      user.oauth_access_token = @api_client.oauth.get_access_token(request_token)
-      user
-    end
-
-    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_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_doc(api_response.item_xml("locker"))
-    end
-
-    # <b>DEPRECATED:</b> Please use <tt>purchase_item</tt> instead.
-    def purchase(release_id, track_id, price, token, options={})
-      warn "[DEPRECATION] 'purchase' is deprecated.  Please use 'purchase_item' instead."
-      purchase_item(release_id, track_id, price, token, options)
-    end
-      
-    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_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_doc(api_response.item_xml("purchase"))
-    end
-
-    def get_stream_track_url(release_id, track_id, token, options={})
-        api_request = @api_client.create_api_request(:GET, "user/streamtrack", {:releaseId => release_id, :trackId => track_id}, options)
-        api_request.api_service = :media
-        api_request.require_signature
-        api_request.token = token
-        @api_client.operator.get_request_uri(api_request)
-    end
-
-    def get_add_card_url(return_url, token, options={})
-        api_request = @api_client.create_api_request(:GET, "payment/addcard", {:returnUrl => return_url}, options)
-        api_request.api_service = :account
-        api_request.require_signature
-        api_request.require_secure_connection
-        api_request.token = token
-        @api_client.operator.get_request_uri(api_request)
-    end
-
-
-  end
-
-end
+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)
+      user.oauth_access_token = access_token
+      user
+    end
+
+    def authenticate(email, password)
+      request_token = @api_client.oauth.get_request_token
+      return nil unless @api_client.oauth.authorise_request_token(email, password, request_token)
+      user = Sevendigital::User.new(@api_client)
+      user.oauth_access_token = @api_client.oauth.get_access_token(request_token)
+      user
+    end
+
+    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_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_doc(api_response.item_xml("locker"))
+    end
+
+    # <b>DEPRECATED:</b> Please use <tt>purchase_item</tt> instead.
+    def purchase(release_id, track_id, price, token, options={})
+      warn "[DEPRECATION] 'purchase' is deprecated.  Please use 'purchase_item' instead."
+      purchase_item(release_id, track_id, price, token, options)
+    end
+      
+    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_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_doc(api_response.item_xml("purchase"))
+    end
+
+    def get_stream_track_url(release_id, track_id, token, options={})
+        api_request = @api_client.create_api_request(:GET, "user/streamtrack", {:releaseId => release_id, :trackId => track_id}, options)
+        api_request.api_service = :media
+        api_request.require_signature
+        api_request.token = token
+        @api_client.operator.get_request_uri(api_request)
+    end
+
+    def get_add_card_url(return_url, token, options={})
+        api_request = @api_client.create_api_request(:GET, "payment/addcard", {:returnUrl => return_url}, options)
+        api_request.api_service = :account
+        api_request.require_signature
+        api_request.require_secure_connection
+        api_request.token = token
+        @api_client.operator.get_request_uri(api_request)
+    end
+
+
+  end
+
+end