.gitignore @@ -1,7 +1,7 @@ -require 'rubygems' +$:.unshift File.dirname(__FILE__) + require 'hpricot' +require 'oauth/consumer' require 'netflix/user' -require 'netflix/client' - -# require 'netflix/...' \ No newline at end of file +require 'netflix/client' \ No newline at end of file lib/netflix.rb @@ -9,7 +9,7 @@ module Netflix }.freeze # for bloed ups. - class NetflixClientError < StandardError; end + class ClientError < StandardError; end # Client class responsible for setting up api calls. class AssHat @@ -71,7 +71,7 @@ module Netflix end - class Client + class Client def self.consumer_token=(consumer_token) @consumer_token = consumer_token @@ -88,7 +88,42 @@ module Netflix def self.consumer_secret @consumer_secret end - + + def self.options + { + :scheme => :query_string, + :http_method => :post, + :signature_method => "HMAC-SHA1", + :site => "http://api.netflix.com", + :request_token_url => Netflix::OAUTH_ENDPOINTS[:request], + :access_token_url => Netflix::OAUTH_ENDPOINTS[:access], + :authorize_url => Netflix::OAUTH_ENDPOINTS[:authorize] + } + end + + def consumer + @consumer ||= begin + token = Netflix::Client.consumer_token + secret = Netflix::Client.consumer_secret + + raise(ClientError, 'Consumer token and secret are required') if (token.nil? || secret.nil?) + OAuth::Consumer.new(token, secret, self.class.options) + end + end + + def request_token + @request_token ||= self.consumer.get_request_token + end + + def access_token + @access_token ||= self.request_token.get_access_token + end + + def get + self.access_token + end + + # attr_accessor :access_token, :access_token_secret, :user_id # # def initialize(access_token, access_token_secret, user_id) lib/netflix/client.rb @@ -18,10 +18,98 @@ module Netflix describe Client, "an instance" do - it "should create a consumer from the token and supplied secret" - it "should throw an exception when creating a consumer without a supplied token & secret" - it "should create an access_token before issuing get request" + before do + Client.consumer_token = nil + Client.consumer_secret = nil + end + + it "should throw an exception when creating a consumer without a supplied token & secret" do + client = Client.new + lambda { client.consumer }.should raise_error(Netflix::ClientError) + end + + it "should have a set of options to pass to the OAuth Consumer" do + expected = { + :scheme => :query_string, + :http_method => :post, + :signature_method => "HMAC-SHA1", + :site => "http://api.netflix.com", + :request_token_url => "http://api.netflix.com/oauth/request_token", + :access_token_url => "http://api.netflix.com/oauth/access_token", + :authorize_url => "https://api-user.netflix.com/oauth/login" + } + + Netflix::Client.options.should == expected + end + it "should throw an exception when creating an access_token without a supplied access_token and access_secret" + + describe "with a consumer token and consumer secret" do + + before do + @token = 'toke' + @secret = 'secret' + + Client.consumer_token = @token + Client.consumer_secret = @secret + + @client = Client.new + end + + it "should create a consumer from the token and supplied secret" do + consumer = stub() + options = stub() + + Client.expects(:options).with().returns(options) + + OAuth::Consumer.expects(:new).with(@token, @secret, options).returns(consumer) + + @client.consumer.should == consumer + end + + it "should memoize the consumer object" do + OAuth::Consumer.expects(:new).with(@token, @secret, kind_of(Hash)).once.returns(stub()) + + 2.times { @client.consumer } + end + + it "should be able to generate a request token" do + request_token = stub() + + @client.expects(:consumer).with().returns(stub(:get_request_token => request_token)) + @client.request_token.should == request_token + end + + it "should memoize the request token" do + request_token = stub() + + consumer_mock = mock() {|m| m.expects(:get_request_token).with().once.returns(request_token) } + @client.expects(:consumer).with().returns(consumer_mock) + + 2.times { @client.request_token } + end + + it "should be able to create an access token" do + access_token = stub() + + @client.expects(:request_token).with().returns(stub(:get_access_token => access_token)) + @client.access_token.should == access_token + end + + it "should memoize the access token" do + access_token = stub() + + @client.expects(:request_token).with().returns(stub(:get_access_token => access_token)) + 2.times { @client.access_token } + end + + it "should create an access_token before issuing get request" do + @client.expects(:access_token).with().returns(stub()) + @client.get + end + + end + it "should return a hpricot document on a get request" it "should know if there were API errors when performing a get request" spec/client_spec.rb d299931d58bbba64868d5a72355ac36b2af545f0 Patrick Reagan patrick.reagan@viget.com http://github.com/rares/netflix/commit/bec89493f9fceb64823854bcc58d1d0d992ff75b bec89493f9fceb64823854bcc58d1d0d992ff75b 2009-01-03T21:26:32-08:00 2009-01-03T21:26:32-08:00 Implemented request / access token retrieval cc2bd78cd3c196608fca904b74a6403a91ffce7a Patrick Reagan patrick.reagan@viget.com