7digital 0.0.7 → 0.1.0

data/spec/integration/user_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+require File.expand_path('../../spec_helper', __FILE__)
+require 'date'
+
+describe "User integration tests" do
+
+  before do
+    @api_client = Sevendigital::Client.new(
+          File.join(File.dirname(__FILE__),"sevendigital_spec.yml"),
+          :verbose => "verbose"
+    )
+
+  end
+
+  it "should fail to sign up an existing user" do
+    running {user = @api_client.user.sign_up("filip@7digital.com", "£$%^&*()_+")}.should raise_error(Sevendigital::SevendigitalError) { |error|
+      error.error_message.should == "User with given email already exists"
+      error.error_code.should == 2003
+    }
+  end
+
+end

data/spec/management/artist_manager_spec.rb

@@ -11,10 +11,10 @@ describe "ArtistManager" do
   it "get_details should call artist/details api method and return digested artist" do
     an_artist_id = 123
     an_artist = Sevendigital::Artist.new(@client)
-    an_api_response = fake_api_response("release/details")
+    an_api_response = fake_api_response("artist/details")
 
     mock_client_digestor(@client, :artist_digestor) \
-          .should_receive(:from_xml).with(an_api_response.content.artist).and_return(an_artist)
+          .should_receive(:from_xml_doc).with(an_api_response.item_xml("artist")).and_return(an_artist)
 
     @client.should_receive(:make_api_request) \
             .with(:GET, "artist/details", {:artistId => an_artist_id}, {}) \
@@ -30,7 +30,7 @@ describe "ArtistManager" do
     an_api_response = fake_api_response("artist/releases")
 
     mock_client_digestor(@client, :release_digestor) \
-         .should_receive(:list_from_xml).with(an_api_response.content.releases).and_return(a_list_of_releases)
+         .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("releases")).and_return(a_list_of_releases)
 
     @client.should_receive(:make_api_request) \
             .with(:GET, "artist/releases", {:artistId => an_artist_id}, {}) \
@@ -46,7 +46,7 @@ describe "ArtistManager" do
     an_api_response = fake_api_response("artist/toptracks")
     
     mock_client_digestor(@client, :track_digestor) \
-        .should_receive(:list_from_xml).with(an_api_response.content.tracks).and_return(a_top_tracks_list)
+        .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("tracks")).and_return(a_top_tracks_list)
 
     @client.should_receive(:make_api_request) \
             .with(:GET, "artist/topTracks", {:artistId => an_artist_id}, {}) \
@@ -63,7 +63,7 @@ describe "ArtistManager" do
     an_api_response = fake_api_response("artist/similar")
 
     mock_client_digestor(@client, :artist_digestor) \
-        .should_receive(:list_from_xml).with(an_api_response.content.artists).and_return(a_similar_artists_list)
+        .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("artists")).and_return(a_similar_artists_list)
 
     @client.should_receive(:make_api_request) \
             .with(:GET, "artist/similar", {:artistId => an_artist_id}, {}) \
@@ -81,8 +81,8 @@ describe "ArtistManager" do
     a_release_list = []
 
     mock_client_digestor(@client, :artist_digestor) \
-      .should_receive(:nested_list_from_xml) \
-      .with(an_api_response.content.tagged_results, :tagged_item, :tagged_results) \
+      .should_receive(:nested_list_from_xml_doc) \
+      .with(an_api_response.item_xml("taggedResults"), :taggedItem, :artist) \
       .and_return(a_release_list)
 
     @client.should_receive(:make_api_request) \
@@ -94,6 +94,27 @@ describe "ArtistManager" do
 
   end
 
+  it "search should call artist/search api method and digest the nested artist list from response" do
+
+    query = "radiohead"
+    api_response = fake_api_response("artist/search")
+    an_artist_list = []
+
+    mock_client_digestor(@client, :artist_digestor) \
+        .should_receive(:nested_list_from_xml_doc) \
+        .with(api_response.item_xml("searchResults"), :searchResult, :artist) \
+        .and_return(an_artist_list)
+
+    @client.should_receive(:make_api_request) \
+           .with(:GET, "artist/search", {:q => query}, {}) \
+           .and_return(api_response)
+
+    artists = @artist_manager.search(query)
+    artists.should == an_artist_list
+
+  end
+
+
   it "browse should call artist/browse api method and digest the artist list from response" do
 
     letter = "ra"
@@ -101,8 +122,8 @@ describe "ArtistManager" do
     an_artist_list = []
 
     mock_client_digestor(@client, :artist_digestor) \
-      .should_receive(:list_from_xml) \
-      .with(an_api_response.content.artists) \
+      .should_receive(:list_from_xml_doc) \
+      .with(an_api_response.item_xml("artists")) \
       .and_return(an_artist_list)
 
     @client.should_receive(:make_api_request) \
@@ -121,7 +142,7 @@ describe "ArtistManager" do
     a_chart = [Sevendigital::ChartItem.new(@client)]
 
     mock_client_digestor(@client, :chart_item_digestor) \
-        .should_receive(:list_from_xml).with(api_response.content.chart).and_return(a_chart)
+        .should_receive(:list_from_xml_doc).with(api_response.item_xml("chart")).and_return(a_chart)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "artist/chart", {}, {}) \
@@ -139,7 +160,7 @@ describe "ArtistManager" do
     options = {:page => 1}
 
     mock_client_digestor(@client, :tag_digestor) \
-         .should_receive(:list_from_xml).with(an_api_response.content.tags).and_return(a_list_of_tags)
+         .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("tags")).and_return(a_list_of_tags)
 
     @client.should_receive(:make_api_request) \
             .with(:GET, "artist/tags", {:artistId => an_artist_id}, options) \

data/spec/management/basket_manager_spec.rb

@@ -14,7 +14,7 @@ describe "BasketManager" do
     an_api_response = fake_api_response("basket/index")
 
     mock_client_digestor(@client, :basket_digestor) \
-          .should_receive(:from_xml).with(an_api_response.content.basket).and_return(a_basket)
+          .should_receive(:from_xml_doc).with(an_api_response.item_xml("basket")).and_return(a_basket)
 
     @client.should_receive(:make_api_request) \
               .with(:GET, "basket", {:basketId => a_basket_id}, {}) \
@@ -29,7 +29,7 @@ describe "BasketManager" do
     an_api_response = fake_api_response("basket/create")
 
     mock_client_digestor(@client, :basket_digestor) \
-          .should_receive(:from_xml).with(an_api_response.content.basket).and_return(a_basket)
+          .should_receive(:from_xml_doc).with(an_api_response.item_xml("basket")).and_return(a_basket)
 
     @client.should_receive(:make_api_request) \
               .with(:GET, "basket/create", {}, {}) \
@@ -47,7 +47,7 @@ describe "BasketManager" do
     an_api_response = fake_api_response("basket/additem")
 
     mock_client_digestor(@client, :basket_digestor) \
-          .should_receive(:from_xml).with(an_api_response.content.basket).and_return(a_basket)
+          .should_receive(:from_xml_doc).with(an_api_response.item_xml("basket")).and_return(a_basket)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "basket/addItem", {:basketId => a_basket_id, :releaseId => a_release_id, :trackId => a_track_id}, {}) \
@@ -64,7 +64,7 @@ describe "BasketManager" do
     an_api_response = fake_api_response("basket/removeitem")
 
     mock_client_digestor(@client, :basket_digestor) \
-          .should_receive(:from_xml).with(an_api_response.content.basket).and_return(a_basket)
+          .should_receive(:from_xml_doc).with(an_api_response.item_xml("basket")).and_return(a_basket)
 
     @client.should_receive(:make_api_request) \
               .with(:GET, "basket/removeItem", {:basketId => a_basket_id, :itemId => an_item_id}, {}) \

data/spec/management/country_manager_spec.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+require 'date'
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "CountryManager" do
+
+  before do
+
+    @client = stub(Sevendigital::Client)
+    @client.stub!(:operator).and_return(mock(Sevendigital::ApiOperator))
+    @country_manager = Sevendigital::CountryManager.new(@client)
+
+  end
+
+
+  it "resolve should call country/resolve api method and digest the country code from response" do
+
+    an_api_response = fake_api_response("country/resolve")
+    a_country_code = 'XX'
+    an_ip_address = '127.0.0.1'
+
+    mock_client_digestor(@client, :country_digestor) \
+        .should_receive(:from_xml_doc).with(an_api_response.item_xml("GeoIpLookup") ).and_return(a_country_code)
+
+    @client.should_receive(:make_api_request) \
+                   .with(:GET, "country/resolve", {:ipaddress => an_ip_address}, {}) \
+                   .and_return(an_api_response)
+
+
+    @country_manager.resolve(an_ip_address).should == a_country_code
+  end
+
+
+end

data/spec/management/list_manager_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "ListManager" do
+
+  before do
+    @client = stub(Sevendigital::Client)
+    @client.stub!(:operator).and_return(mock(Sevendigital::ApiOperator))
+    @list_manager = Sevendigital::ListManager.new(@client)
+  end
+
+  it "get_editorial_list should call editorial/list api method and return digested list" do
+    an_editorial_list_key = "featured"
+    an_editorial_list = Sevendigital::List.new(@client)
+    an_api_response = fake_api_response("editorial/list")
+
+    mock_client_digestor(@client, :list_digestor) \
+         .should_receive(:from_xml_doc).with(an_api_response.item_xml("list")).and_return(an_editorial_list)
+
+    @client.should_receive(:make_api_request) \
+            .with(:GET, "editorial/list", {:key => an_editorial_list_key}, {}) \
+            .and_return(an_api_response)
+    
+    list = @list_manager.get_editorial_list(an_editorial_list_key)
+    list.should == an_editorial_list
+  end
+
+end

data/spec/management/oauth_manager_spec.rb

@@ -17,8 +17,8 @@ describe "OAuthManager" do
     digestor = mock(Sevendigital::OAuthRequestTokenDigestor)
     @client.stub!(:oauth_request_token_digestor).and_return(digestor)
     
-    digestor.should_receive(:from_xml) \
-      .with(an_api_response.content.oauth_request_token, :oauth_request_token) \
+    digestor.should_receive(:from_xml_doc) \
+      .with(an_api_response.item_xml("oauth_request_token")) \
       .and_return(fake_token)
 
     @client.should_receive(:make_signed_api_request) \
@@ -39,8 +39,8 @@ describe "OAuthManager" do
     digestor = mock(Sevendigital::OAuthAccessTokenDigestor)
     @client.stub!(:oauth_access_token_digestor).and_return(digestor)
 
-    digestor.should_receive(:from_xml) \
-      .with(an_api_response.content.oauth_access_token, :oauth_access_token) \
+    digestor.should_receive(:from_xml_doc) \
+      .with(an_api_response.item_xml("oauth_access_token")) \
       .and_return(fake_token)
 
     @client.should_receive(:make_signed_api_request) \

data/spec/management/release_manager_spec.rb

@@ -18,7 +18,7 @@ describe "ReleaseManager" do
     a_release = Sevendigital::Release.new(@client)
 
     mock_client_digestor(@client, :release_digestor) \
-      .should_receive(:from_xml).with(api_response.content.release).and_return(a_release)
+      .should_receive(:from_xml_doc).with(api_response.item_xml("release")).and_return(a_release)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "release/details", {:releaseId => expected_release_id}, {}) \
@@ -35,7 +35,7 @@ describe "ReleaseManager" do
     a_track_list = []
 
     mock_client_digestor(@client, :track_digestor) \
-      .should_receive(:list_from_xml).with(api_response.content.tracks).and_return(a_track_list)
+      .should_receive(:list_from_xml_doc).with(api_response.item_xml("tracks")).and_return(a_track_list)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "release/tracks", {:releaseId=>a_release_id}, expected_options) \
@@ -53,7 +53,7 @@ describe "ReleaseManager" do
     a_track_list = []
 
     mock_client_digestor(@client, :track_digestor) \
-      .should_receive(:list_from_xml).with(api_response.content.tracks).and_return(a_track_list)
+      .should_receive(:list_from_xml_doc).with(api_response.item_xml("tracks")).and_return(a_track_list)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "release/tracks", {:releaseId => a_release_id}, {:page_size => 100}) \
@@ -71,7 +71,7 @@ describe "ReleaseManager" do
     a_chart = []
 
     mock_client_digestor(@client, :chart_item_digestor) \
-        .should_receive(:list_from_xml).with(api_response.content.chart).and_return(a_chart)
+        .should_receive(:list_from_xml_doc).with(api_response.item_xml("chart")).and_return(a_chart)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "release/chart", {}, {}) \
@@ -89,7 +89,7 @@ describe "ReleaseManager" do
     a_release_list = []
 
     mock_client_digestor(@client, :release_digestor) \
-      .should_receive(:list_from_xml).with(api_response.content.releases).and_return(a_release_list)
+      .should_receive(:list_from_xml_doc).with(api_response.item_xml("releases")).and_return(a_release_list)
 
     @client.should_receive(:make_api_request) \
          .with(:GET, "release/byDate", {:fromDate => from_date.strftime("%Y%m%d"), :toDate => to_date.strftime("%Y%m%d")}, {}) \
@@ -106,7 +106,7 @@ describe "ReleaseManager" do
     a_release_list = []
 
     mock_client_digestor(@client, :release_digestor) \
-      .should_receive(:list_from_xml).with(api_response.content.releases).and_return(a_release_list)
+      .should_receive(:list_from_xml_doc).with(api_response.item_xml("releases")).and_return(a_release_list)
 
     @client.should_receive(:make_api_request) \
          .with(:GET, "release/byDate", {}, {}) \
@@ -124,8 +124,8 @@ describe "ReleaseManager" do
     a_release_list = []
 
     mock_client_digestor(@client, :release_digestor) \
-      .should_receive(:nested_list_from_xml) \
-      .with(api_response.content.recommendations, :recommended_item, :recommendations) \
+      .should_receive(:nested_list_from_xml_doc) \
+      .with(api_response.item_xml("recommendations"), :recommendedItem, :release) \
       .and_return(a_release_list)
 
     @client.should_receive(:make_api_request) \
@@ -144,8 +144,8 @@ describe "ReleaseManager" do
     a_release_list = []
 
     mock_client_digestor(@client, :release_digestor) \
-      .should_receive(:nested_list_from_xml) \
-      .with(api_response.content.tagged_results, :tagged_item, :tagged_results) \
+      .should_receive(:nested_list_from_xml_doc) \
+      .with(api_response.item_xml("taggedResults"), :taggedItem, :release) \
       .and_return(a_release_list)
 
     @client.should_receive(:make_api_request) \
@@ -164,8 +164,8 @@ describe "ReleaseManager" do
       a_release_list = []
 
       mock_client_digestor(@client, :release_digestor) \
-        .should_receive(:nested_list_from_xml) \
-        .with(api_response.content.search_results, :search_result, :search_results) \
+        .should_receive(:nested_list_from_xml_doc) \
+        .with(api_response.item_xml("searchResults"), :searchResult, :release) \
         .and_return(a_release_list)
 
       @client.should_receive(:make_api_request) \
@@ -184,7 +184,7 @@ describe "ReleaseManager" do
     a_tag_list = []
 
     mock_client_digestor(@client, :tag_digestor) \
-      .should_receive(:list_from_xml).with(api_response.content.tags).and_return(a_tag_list)
+      .should_receive(:list_from_xml_doc).with(api_response.item_xml("tags")).and_return(a_tag_list)
 
     @client.should_receive(:make_api_request) \
       .with(:GET, "release/tags", {:releaseId=>a_release_id}, expected_options) \

data/spec/management/tag_manager_spec.rb

@@ -19,7 +19,7 @@ describe "TagManager" do
     a_tag_list = [Sevendigital::Tag.new]
 
     mock_client_digestor(@client, :tag_digestor) \
-        .should_receive(:list_from_xml).with(an_api_response.content.tags).and_return(a_tag_list)
+        .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("tags") ).and_return(a_tag_list)
 
     @client.should_receive(:make_api_request) \
                    .with(:GET, "tag", {}, {}) \

data/spec/management/track_manager_spec.rb

@@ -18,7 +18,7 @@ describe "TrackManager" do
     a_track = Sevendigital::Track.new(@client)
 
     mock_client_digestor(@client, :track_digestor) \
-      .should_receive(:from_xml).with(an_api_response.content.track).and_return(a_track)
+      .should_receive(:from_xml_doc).with(an_api_response.item_xml("track")).and_return(a_track)
 
     @client.should_receive(:make_api_request) \
                  .with(:GET, "track/details", {:trackId => a_track_id}, {}) \
@@ -54,7 +54,7 @@ describe "TrackManager" do
     a_chart = []
 
     mock_client_digestor(@client, :chart_item_digestor) \
-        .should_receive(:list_from_xml).with(an_api_response.content.chart).and_return(a_chart)
+        .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("chart")).and_return(a_chart)
 
     @client.should_receive(:make_api_request) \
                    .with(:GET, "track/chart", {}, {}) \
@@ -90,8 +90,8 @@ describe "TrackManager" do
     a_track_list = [Sevendigital::Track.new(@client)]
 
     mock_client_digestor(@client, :track_digestor) \
-      .should_receive(:nested_list_from_xml) \
-      .with(an_api_response.content.search_results, :search_result, :search_results) \
+      .should_receive(:nested_list_from_xml_doc) \
+      .with(an_api_response.item_xml("searchResults"), :searchResult, :track) \
       .and_return(a_track_list)
 
     @client.should_receive(:make_api_request) \

data/spec/management/user_card_manager_spec.rb

@@ -15,7 +15,7 @@ describe "UserCardManager" do
     options = {:pagesize => 20 }
 
     mock_client_digestor(@client, :user_card_digestor) \
-          .should_receive(:list_from_xml).with(an_api_response.content.cards).and_return(a_card_list)
+          .should_receive(:list_from_xml_doc).with(an_api_response.item_xml("cards")).and_return(a_card_list)
 
     @client.should_receive(:make_signed_api_request) \
               .with(:GET, "user/payment/card", {}, options, a_token) \
@@ -41,7 +41,7 @@ describe "UserCardManager" do
     options = {:pagesize => 20 }
 
     mock_client_digestor(@client, :user_card_digestor) \
-          .should_receive(:from_xml).with(an_api_response.content.card).and_return(a_card)
+          .should_receive(:from_xml_doc).with(an_api_response.item_xml("card")).and_return(a_card)
 
     @client.should_receive(:make_signed_api_request) \
               .with(:POST, "user/payment/card/add", {

data/spec/management/user_manager_spec.rb

@@ -21,6 +21,22 @@ describe "UserManager" do
     @user_manager = Sevendigital::UserManager.new(@client)
   end
 
+  it "get_details should call user/details api method and return user's email" do
+    an_api_response = fake_api_response("user/details")
+    a_token = OAuth::AccessToken.new(nil, "token", "token_secret")
+    fake_user = [Sevendigital::User.new(@client)]
+    options = {:sort => "random"}
+
+    mock_client_digestor(@client, :user_digestor) \
+      .should_receive(:from_xml_doc).with(an_api_response.item_xml("user")).and_return(fake_user)
+
+    @client.should_receive(:make_signed_api_request) \
+        .with(:GET, "user/details", {}, options, a_token) \
+        .and_return(an_api_response)
+
+    @user_manager.get_details(a_token, options).should == fake_user
+  end
+
   it "should log in user using an existing access token" do
     an_access_token = OAuth::AccessToken.new("aaa", "bbb", nil)
     @user = @user_manager.login(an_access_token)
@@ -39,7 +55,7 @@ describe "UserManager" do
     options = {:country => "XX"}
 
     mock_client_digestor(@client, :user_digestor) \
-      .should_receive(:from_xml).with(an_api_response.content.user).and_return(fake_user)
+      .should_receive(:from_xml_doc).with(an_api_response.item_xml("user")).and_return(fake_user)
 
     @client.should_receive(:make_signed_api_request) \
         .with(:POST, "user/signUp", {:emailAddress => @an_email, :password => @a_password}, options) \
@@ -101,7 +117,7 @@ describe "UserManager" do
     options = {:sort => "random"}
 
     mock_client_digestor(@client, :locker_digestor) \
-      .should_receive(:from_xml).with(an_api_response.content.locker).and_return(fake_locker)
+      .should_receive(:from_xml_doc).with(an_api_response.item_xml("locker")).and_return(fake_locker)
 
     @client.should_receive(:make_signed_api_request) \
         .with(:GET, "user/locker", {}, options, a_token) \
@@ -120,7 +136,7 @@ describe "UserManager" do
     fake_locker = [Sevendigital::LockerRelease.new(@client)]
 
     mock_client_digestor(@client, :locker_digestor) \
-      .should_receive(:from_xml).with(an_api_response.content.purchase).and_return(fake_locker)
+      .should_receive(:from_xml_doc).with(an_api_response.item_xml("purchase")).and_return(fake_locker)
 
     @client.should_receive(:make_signed_api_request) \
            .with(:GET, "user/purchase/item", \
@@ -139,7 +155,7 @@ describe "UserManager" do
     fake_locker = [Sevendigital::LockerRelease.new(@client)]
 
     mock_client_digestor(@client, :locker_digestor) \
-      .should_receive(:from_xml).with(an_api_response.content.purchase).and_return(fake_locker)
+      .should_receive(:from_xml_doc).with(an_api_response.item_xml("purchase")).and_return(fake_locker)
 
     @client.should_receive(:make_signed_api_request) \
            .with(:GET, "user/purchase/basket", \