7digital 0.0.5 → 0.0.6

data/spec/model/track_spec.rb

@@ -1,144 +1,145 @@
-require "date"
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe "Track" do
-
-  before do
-    @client = stub(Sevendigital::Client)
-    @track_manager = mock(Sevendigital::TrackManager)
-    @client.stub!(:track).and_return @track_manager
-    
-    @track = Sevendigital::Track.new(@client)
-    @track.id = 1234
-    @track.release = Sevendigital::Release.new(@client)
-    @track.release.id = 5678
-  end
-
-  it "get_details should get track's basic details from track manager " do
-    expected_options = {:page => 2}
-    fresh_track = fake_track_with_details
-
-    @track_manager.should_receive(:get_details_from_release) { |track_id, release_id, options|
-      track_id.should == @track.id
-      release_id.should == @track.release.id
-      (options.keys & expected_options.keys).should == expected_options.keys
-      fresh_track
-    }
-    @track.get_details(expected_options)
-    
-    @track.track_number.should == fresh_track.track_number
-    @track.duration.should == fresh_track.duration
-    @track.explicit_content.should == fresh_track.explicit_content
-    @track.isrc.should == fresh_track.isrc
-    @track.release.id.should == fresh_track.release.id
-    @track.url.should == fresh_track.url
-
-  end
-
-  it "preview_url should get preview URL from manager" do
-    expected_options = {:country => "mx"}
-    fake_preview_url = "http://preview.com/trackid/123456"
-
-    @track_manager.should_receive(:build_preview_url) { |track_id, options|
-      track_id.should == @track.id
-      (options.keys & expected_options.keys).should == expected_options.keys
-      fake_preview_url
-    }
-    
-    @track.preview_url(expected_options).should == fake_preview_url
-
-  end
-
-  it "should have a short title without any version in brackets" do
-
-    @track.title = "Girl With One Eye (Bayou Percussion Version)"
-    @track.short_title.should == "Girl With One Eye"
-
-    @track.title = "The Thing I Like Best About Him Is His Girlfriend (Gr's Man-Made Island Edition)"
-    @track.short_title.should == "The Thing I Like Best About Him Is His Girlfriend"
-
-    @track.title = "Your Head to Your Toes (Live at the BBC)"
-    @track.short_title.should == "Your Head to Your Toes"
-
-    @track.title = "Welcome To The World of The Plastic Beach (Feat. Snoop Dogg and Hypnotic Brass Ensemble)"
-    @track.short_title.should == "Welcome To The World of The Plastic Beach"
-
-    @track.title = "(lp version)"
-    @track.short_title.should == "(lp version)"
-
-    @track.title = "What's the Story (Morning Glory)"
-    @track.short_title.should == "What's the Story (Morning Glory)"
-
-    @track.title = "track 1 (something else)"
-    @track.short_title.should == "track 1 (something else)"
-
-    @track.title = "track 1 (dj remix)"
-    @track.short_title.should == "track 1"
-
-    @track.title = "track  1  (  dj mix  )"
-    @track.short_title.should == "track  1"
- end
-
-  describe "alternate_version?" do
-
-    before do
-      @artist1 = Sevendigital::Artist.new(@client)
-      @artist2 = Sevendigital::Artist.new(@client)
-      @track1 = Sevendigital::Track.new(@client)
-      @track1.artist = @artist1
-      @track2 = Sevendigital::Track.new(@client)
-      @track2.artist = @artist2
-
-      @artist1.name = "artist 1"
-      @track1.title = "track 1"
-
-    end
-
-    it "should be considered alternate version if artist names and titles match"  do
-      @artist2.name = "Artist 1"
-      @track2.title = "Track 1"
-
-      @track1.alternate_version_of?(@track2).should == true
-    end
-
-    it "should be considered alternate version if artist names and short titles match"  do
-      @track1.title = "track 1 (uk version)"
-     
-      @artist2.name = "Artist 1"
-      @track2.title = "TRACK 1 (us remix)"
-
-      @track1.alternate_version_of?(@track2).should == true
-    end
-
-    it "should not be considered alternate version if artist names don't match" do
-      @artist2.name = "artist 2"
-      @track2.title = "track 1"
-
-      @track1.alternate_version_of?(@track2).should == false
-    end
-
-    it "should not be considered alternate version if short titles don't match" do
-      @artist2.name = "artist 1"
-      @track2.title = "track 2"
-
-      @track1.alternate_version_of?(@track2).should == false
-    end
-
-
-  end
-
-  def fake_track_with_details
-    track = Sevendigital::Track.new(@client)
-    track.title = "Song 1"
-    track.version = "Version 2"
-    track.artist = Sevendigital::Artist.new(@client)
-    track.track_number = 7
-    track.duration = 77
-    track.explicit_content = true
-    track.isrc = "7D"
-    track.release = Sevendigital::Release.new(@client)
-    track.release.id = 5678
-    track.url = "http://aaa.bbb.ccc/"
-    track
-  end
+require "date"
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "Track" do
+
+  before do
+    @client = stub(Sevendigital::Client)
+    @track_manager = mock(Sevendigital::TrackManager)
+    @client.stub!(:track).and_return @track_manager
+    @client.stub!(:configuration).and_return OpenStruct.new
+    
+    @track = Sevendigital::Track.new(@client)
+    @track.id = 1234
+    @track.release = Sevendigital::Release.new(@client)
+    @track.release.id = 5678
+  end
+
+  it "get_details should get track's basic details from track manager " do
+    expected_options = {:page => 2}
+    fresh_track = fake_track_with_details
+
+    @track_manager.should_receive(:get_details_from_release) { |track_id, release_id, options|
+      track_id.should == @track.id
+      release_id.should == @track.release.id
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fresh_track
+    }
+    @track.get_details(expected_options)
+    
+    @track.track_number.should == fresh_track.track_number
+    @track.duration.should == fresh_track.duration
+    @track.explicit_content.should == fresh_track.explicit_content
+    @track.isrc.should == fresh_track.isrc
+    @track.release.id.should == fresh_track.release.id
+    @track.url.should == fresh_track.url
+
+  end
+
+  it "preview_url should get preview URL from manager" do
+    expected_options = {:country => "mx"}
+    fake_preview_url = "http://preview.com/trackid/123456"
+
+    @track_manager.should_receive(:build_preview_url) { |track_id, options|
+      track_id.should == @track.id
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fake_preview_url
+    }
+    
+    @track.preview_url(expected_options).should == fake_preview_url
+
+  end
+
+  it "should have a short title without any version in brackets" do
+
+    @track.title = "Girl With One Eye (Bayou Percussion Version)"
+    @track.short_title.should == "Girl With One Eye"
+
+    @track.title = "The Thing I Like Best About Him Is His Girlfriend (Gr's Man-Made Island Edition)"
+    @track.short_title.should == "The Thing I Like Best About Him Is His Girlfriend"
+
+    @track.title = "Your Head to Your Toes (Live at the BBC)"
+    @track.short_title.should == "Your Head to Your Toes"
+
+    @track.title = "Welcome To The World of The Plastic Beach (Feat. Snoop Dogg and Hypnotic Brass Ensemble)"
+    @track.short_title.should == "Welcome To The World of The Plastic Beach"
+
+    @track.title = "(lp version)"
+    @track.short_title.should == "(lp version)"
+
+    @track.title = "What's the Story (Morning Glory)"
+    @track.short_title.should == "What's the Story (Morning Glory)"
+
+    @track.title = "track 1 (something else)"
+    @track.short_title.should == "track 1 (something else)"
+
+    @track.title = "track 1 (dj remix)"
+    @track.short_title.should == "track 1"
+
+    @track.title = "track  1  (  dj mix  )"
+    @track.short_title.should == "track  1"
+ end
+
+  describe "alternate_version?" do
+
+    before do
+      @artist1 = Sevendigital::Artist.new(@client)
+      @artist2 = Sevendigital::Artist.new(@client)
+      @track1 = Sevendigital::Track.new(@client)
+      @track1.artist = @artist1
+      @track2 = Sevendigital::Track.new(@client)
+      @track2.artist = @artist2
+
+      @artist1.name = "artist 1"
+      @track1.title = "track 1"
+
+    end
+
+    it "should be considered alternate version if artist names and titles match"  do
+      @artist2.name = "Artist 1"
+      @track2.title = "Track 1"
+
+      @track1.alternate_version_of?(@track2).should == true
+    end
+
+    it "should be considered alternate version if artist names and short titles match"  do
+      @track1.title = "track 1 (uk version)"
+     
+      @artist2.name = "Artist 1"
+      @track2.title = "TRACK 1 (us remix)"
+
+      @track1.alternate_version_of?(@track2).should == true
+    end
+
+    it "should not be considered alternate version if artist names don't match" do
+      @artist2.name = "artist 2"
+      @track2.title = "track 1"
+
+      @track1.alternate_version_of?(@track2).should == false
+    end
+
+    it "should not be considered alternate version if short titles don't match" do
+      @artist2.name = "artist 1"
+      @track2.title = "track 2"
+
+      @track1.alternate_version_of?(@track2).should == false
+    end
+
+
+  end
+
+  def fake_track_with_details
+    track = Sevendigital::Track.new(@client)
+    track.title = "Song 1"
+    track.version = "Version 2"
+    track.artist = Sevendigital::Artist.new(@client)
+    track.track_number = 7
+    track.duration = 77
+    track.explicit_content = true
+    track.isrc = "7D"
+    track.release = Sevendigital::Release.new(@client)
+    track.release.id = 5678
+    track.url = "http://aaa.bbb.ccc/"
+    track
+  end
 end

data/spec/model/user_spec.rb

@@ -1,98 +1,161 @@
-require "date"
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe "User" do
-
-  before do
-    @client = stub(Sevendigital::Client)
-    @user_manager = mock(Sevendigital::UserManager)
-    @client.stub!(:user).and_return @user_manager
-    
-    @user = Sevendigital::User.new(@client)
-  end
-
-  it "should not be authorised if does not have access_token" do
-    @user.oauth_access_token = nil
-    @user.authenticated?.should == false
-  end
-
-  it "should be authorised if does have access_token" do
-    @user.oauth_access_token = "something"
-    @user.authenticated?.should == true
-  end
-
-  it "should get user's locker from locker manager" do
-    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
-    fake_locker = [Sevendigital::LockerRelease.new(@client)]
-    expected_options = {:page => 2}
-
-    @user_manager.should_receive(:get_locker) { |token, options|
-      token.should == @user.oauth_access_token
-      (options.keys & expected_options.keys).should == expected_options.keys
-      fake_locker
-    }
-    locker = @user.get_locker(expected_options)
-    locker.should == fake_locker
-  end
-
-  it "should get user manager to make a purchase" do
-    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
-    a_release_id = 123
-    a_track_id = 456
-    a_price = 1.29
-    fake_locker = [Sevendigital::LockerRelease.new(@client)]
-    expected_options = {:page => 2}
-
-    @user_manager.should_receive(:purchase) { |release_id, track_id, price, token, options|
-      token.should == @user.oauth_access_token
-      release_id.should == a_release_id
-      track_id.should == a_track_id
-      price.should == a_price
-      (options.keys & expected_options.keys).should == expected_options.keys
-      fake_locker
-    }
-    purchase_locker = @user.purchase!(a_release_id, a_track_id, a_price, expected_options)
-    purchase_locker.should == fake_locker
-  end
-
-  it "should get stream track url from user manager" do
-    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
-    a_track_id = 456
-    a_release_id = 123
-    a_stream_track_url = "http://whatever"
-    expected_options = {:page => 2}
-
-    @user_manager.should_receive(:get_stream_track_url) { |release_id, track_id, token, options|
-      token.should == @user.oauth_access_token
-      track_id.should == a_track_id
-      release_id.should == a_release_id
-      (options.keys & expected_options.keys).should == expected_options.keys
-      a_stream_track_url
-    }
-    @user.stream_track_url(a_release_id, a_track_id, expected_options).should == a_stream_track_url
-  end
-
-  it "should not get a stream tack url but raise Sevendigital::Error if user is not authenticated" do
-    running {@user.get_locker}.should raise_error(Sevendigital::SevendigitalError)
-  end
-
-  it "should get an add card url from user manager" do
-    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
-    a_stream_track_url = "http://whatever"
-    a_return_url = "http://example.com"
-    expected_options = {:page => 2}
-
-    @user_manager.should_receive(:get_add_card_url) { |return_url, token, options|
-      return_url.should == a_return_url
-      token.should == @user.oauth_access_token
-      (options.keys & expected_options.keys).should == expected_options.keys
-      a_stream_track_url
-    }
-    @user.add_card_url(a_return_url, expected_options).should == a_stream_track_url
-  end
-
-  it "should not get a stream tack url but raise Sevendigital::Error if user is not authenticated" do
-    running {@user.get_locker}.should raise_error(Sevendigital::SevendigitalError)
-  end
-
+require "date"
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "User" do
+
+  before do
+    @client = stub(Sevendigital::Client)
+    @user_manager = mock(Sevendigital::UserManager)
+    @user_card_manager = mock(Sevendigital::UserCardManager)
+    @client.stub!(:user).and_return @user_manager
+    @client.stub!(:user_payment_card).and_return @user_card_manager
+
+    @user = Sevendigital::User.new(@client)
+  end
+
+  it "should not be authorised if does not have access_token" do
+    @user.oauth_access_token = nil
+    @user.authenticated?.should == false
+  end
+
+  it "should be authorised if does have access_token" do
+    @user.oauth_access_token = "something"
+    @user.authenticated?.should == true
+  end
+
+  it "should get user's locker from locker manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    fake_locker = [Sevendigital::LockerRelease.new(@client)]
+    expected_options = {:page => 2}
+
+    @user_manager.should_receive(:get_locker) { |token, options|
+      token.should == @user.oauth_access_token
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fake_locker
+    }
+    locker = @user.get_locker(expected_options)
+    locker.should == fake_locker
+  end
+
+  it "should get user's payment cards from user card manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    fake_card_list = [Sevendigital::Card.new(@client)]
+    expected_options = {:page => 2}
+
+    @user_card_manager.should_receive(:get_card_list) { |token, options|
+      token.should == @user.oauth_access_token
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fake_card_list
+    }
+    cards = @user.get_cards(expected_options)
+    cards.should == fake_card_list
+  end
+
+  it "should add payment card for user using user card manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    card_number = "4444333322221111"
+    card_type = "VISA"
+    card_holder_name = "Mr John Simth"
+    card_start_date = "200909"
+    card_expiry_date = "201109"
+    card_issue_number = "1"
+    card_verification_code ="123"
+    card_post_code = "EC2A 4HJ"
+    card_country = "GB"
+    fake_card = Sevendigital::Card.new(@client)
+
+    @user_card_manager.should_receive(:add_card).with(
+            card_number, card_type, card_holder_name, card_start_date, card_expiry_date, card_issue_number,
+            card_verification_code, card_post_code, card_country, @user.oauth_access_token, {}).and_return(fake_card)
+    card = @user.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)
+    card.should == fake_card
+  end
+
+  it "should select a default payment card for user using user card manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    card_id = 123456
+
+    @user_card_manager.should_receive(:select_card).with(
+            card_id, @user.oauth_access_token, {}).and_return(true)
+    @user.select_card(card_id).should == true
+  end
+
+
+  it "should purchase a track using user manger" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    a_release_id = 123
+    a_track_id = 456
+    a_price = 1.29
+    fake_locker = [Sevendigital::LockerRelease.new(@client)]
+    expected_options = {:page => 2}
+
+    @user_manager.should_receive(:purchase_item) { |release_id, track_id, price, token, options|
+      token.should == @user.oauth_access_token
+      release_id.should == a_release_id
+      track_id.should == a_track_id
+      price.should == a_price
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fake_locker
+    }
+    purchase_locker = @user.purchase_item!(a_release_id, a_track_id, a_price, expected_options)
+    purchase_locker.should == fake_locker
+  end
+
+  it "should purchase a basket using user manger" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    a_basket_id = 123
+    fake_locker = [Sevendigital::LockerRelease.new(@client)]
+    expected_options = {:page => 2}
+
+    @user_manager.should_receive(:purchase_basket) { |basket_id, token, options|
+      token.should == @user.oauth_access_token
+      basket_id.should == a_basket_id
+      (options.keys & expected_options.keys).should == expected_options.keys
+      fake_locker
+    }
+    purchase_locker = @user.purchase_basket!(a_basket_id, expected_options)
+    purchase_locker.should == fake_locker
+  end
+
+  it "should get stream track url from user manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    a_track_id = 456
+    a_release_id = 123
+    a_stream_track_url = "http://whatever"
+    expected_options = {:page => 2}
+
+    @user_manager.should_receive(:get_stream_track_url) { |release_id, track_id, token, options|
+      token.should == @user.oauth_access_token
+      track_id.should == a_track_id
+      release_id.should == a_release_id
+      (options.keys & expected_options.keys).should == expected_options.keys
+      a_stream_track_url
+    }
+    @user.stream_track_url(a_release_id, a_track_id, expected_options).should == a_stream_track_url
+  end
+
+  it "should not get a stream tack url but raise Sevendigital::Error if user is not authenticated" do
+    running {@user.get_locker}.should raise_error(Sevendigital::SevendigitalError)
+  end
+
+  it "should get an add card url from user manager" do
+    @user.oauth_access_token = OAuth::AccessToken.new(nil, "TOKEN", "SECRET")
+    a_stream_track_url = "http://whatever"
+    a_return_url = "http://example.com"
+    expected_options = {:page => 2}
+
+    @user_manager.should_receive(:get_add_card_url) { |return_url, token, options|
+      return_url.should == a_return_url
+      token.should == @user.oauth_access_token
+      (options.keys & expected_options.keys).should == expected_options.keys
+      a_stream_track_url
+    }
+    @user.add_card_url(a_return_url, expected_options).should == a_stream_track_url
+  end
+
+  it "should not get a stream tack url but raise Sevendigital::Error if user is not authenticated" do
+    running {@user.get_locker}.should raise_error(Sevendigital::SevendigitalError)
+  end
+
 end