netflix 0.1.1 → 0.2.0

data/.gitignore

@@ -0,0 +1 @@
+pkg/

data/Rakefile

@@ -1,17 +1,39 @@
 require 'rake/testtask'
 require 'rubygems/package_task'
 
-Rake::TestTask.new("test") { |t|
+Rake::TestTask.new("test:unit") { |t|
   t.libs << 'test'
-  t.test_files = Dir.glob( "test/**/*_test.rb" ).sort
+  t.test_files = Dir.glob( "test/*_test.rb" ).sort
 
   t.verbose = true
   t.warning = true
 }
+require File.join(File.dirname(__FILE__), 'test/integration/rake_test_helper')
+
+file "test/integration/oauth_settings.yml" do |t|
+  credentials = IntegrationTestHelper.obtain_credentials
+  open("test/integration/oauth_settings.yml", 'wb') do |f|
+    YAML.dump(credentials, f)
+  end
+end
+
+Rake::TestTask.new("test:integration") { |t|
+  #t.description = "Run integration tests against a REAL netflix account you supply"
+  t.libs << 'test'
+  t.test_files = Dir.glob( "test/integration/**/*_test.rb" ).sort
+
+  t.verbose = true
+  t.warning = true
+}
+
+task "test:integration" => "test/integration/oauth_settings.yml"
+
+desc "run unit tests only"
+task :test => "test:unit"
 
 gem_spec = Gem::Specification.new do |s|
   s.name = "netflix"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
   s.authors = ["Dean Holdren"]
   s.date = %q{2012-01-09}
   s.description = "Ruby Netflix API wrapper"

data/lib/netflix.rb

@@ -1,4 +1,6 @@
-require 'netflix/json_resource'
+#require 'netflix/json_resource'
+require 'netflix/errors'
+require 'netflix/response'
 require 'netflix/client'
 require 'netflix/user'
 require 'netflix/queue'

data/lib/netflix/client.rb

@@ -16,6 +16,8 @@ module Netflix
         :authorize_url => "https://api-user.netflix.com/oauth/login")
       if user_access_token && user_access_secret
         @oauth_access_token = oauth_access_token(user_access_token, user_access_secret)
+        #automatically determine if error should be thrown based on response codes
+        @oauth_access_token.extend(ResponseErrorDecorator)
       elsif !!user_access_token ^ !!user_access_secret
         raise ArgumentError 'Must specify both user_access_token and user_access_secret if specifying either'
       end
@@ -36,6 +38,8 @@ module Netflix
       authorize_url = request_token.authorize_url(:oauth_consumer_key => 
         Netflix::Client.consumer_key)
       Launchy.open(authorize_url)
+      puts "Go to browser, a page has been opened to establish oauth"
+      printf "Pin from Netflix:"
       pin = gets.chomp
       access_token = request_token.get_access_token(:oauth_verifier => pin)
     end

data/lib/netflix/errors.rb

@@ -0,0 +1,44 @@
+require 'json'
+
+module Netflix
+  module Error
+    class ResponseError < StandardError
+      def initialize(body, headers)
+        @body = body
+        @headers = headers
+        body_obj = JSON.parse(body)
+        message = body_obj["status"]["message"]
+        super(message)
+      end
+    end
+    #4xx level errors
+    class ClientError < ResponseError
+    end
+    #5xx level errors
+    class ServerError < ResponseError
+    end
+    #400
+    class BadRequest < ClientError
+    end
+    #403
+    class Forbidden < ClientError
+    end
+    #404
+    class NotFound < ClientError
+    end
+    #401
+    class Unauthorized < ClientError
+    end
+    #420 (?)
+    class RateLimit < ClientError
+    end
+    
+    CODEMAP = {400 => BadRequest, 403 => Forbidden, 404 => NotFound, 401 => Unauthorized, 420 => RateLimit}
+    def self.for(response)
+      #codemap = {400 => BadRequest, 403 => Forbidden, 404 => NotFound, 401 => Unauthorized, 420 => RateLimit}
+      code = response.code.to_i
+      (CODEMAP[code] || ResponseError).new(response.body, response.header)
+      #codemap[code].new(response.body, response.header)
+    end
+  end
+end

data/lib/netflix/queue.rb

@@ -22,20 +22,29 @@ module Netflix
     
     def add(title_ref, position=nil)
       response = @oauth_access_token.post "/users/#{@user_id}/queues/#{@type}?output=json", {:etag => etag, :title_ref => title_ref, :position=> position}
-      if response && response.code_type == Net::HTTPOK
-        #TODO refresh
-      else
-        raise "Error adding title #{title_ref} to user #{@user_id}"
-      end
+      #@map = retrieve
+      #netflix is wacky. GET after an add can be STALE. ughg
+      #so recreate the contents programattically instead
+      response_obj = JSON.parse(response.body)
+      new_queue_item = response_obj["status"]["resources_created"]["queue_item"]
+      new_etag = response_obj["status"]["etag"]
+      repopulate(new_queue_item, new_etag)
+      self
     end
     
     def remove(position)
-      response = @oauth_access_token.delete "/users/#{@user_id}/queues/#{@type}/available/#{position}?output=json" #, {:etag => etag})
-      if response && response.code_type == Net::HTTPOK
-        #TODO refresh
-      else
-        raise "Error removing title #{title_ref} to user #{@user_id}"
-      end
+      id = discs[position-1].id
+      #response = @oauth_access_token.delete "/users/#{@user_id}/queues/#{@type}/available/#{position}?output=json" , {'etag' => etag}
+      response = @oauth_access_token.delete "#{id}?output=json"
+      @map = retrieve
+      self
+    end
+    
+    def remove_by_title_ref(title_ref)
+      disc = discs.find {|disc| disc =~ /\/#{title_ref}\//}
+      response = @oauth_access_token.delete "#{disc.id}?output=json"
+      @map = retrieve
+      self
     end
     
     def discs
@@ -47,13 +56,35 @@ module Netflix
       end
     end
     
+    def refresh
+      @map = retrieve(etag)
+      self
+    end
+    
     private
-    def retrieve
-      response = @oauth_access_token.get "/users/#{@user_id}/queues/#{@type}?max_results=#{MAX_RESULTS}&output=json"
-      if response && response.body && response.code_type == Net::HTTPOK
-        JSON.parse(response.body)["queue"]
+    def retrieve(etag = nil)
+      url = "/users/#{@user_id}/queues/#{@type}/available?max_results=#{MAX_RESULTS}&output=json"
+      if (etag)
+        response = @oauth_access_token.get(url, { 'etag' => etag.to_s })
+      else
+        response = @oauth_access_token.get(url)
+      end
+      JSON.parse(response.body)["queue"]
+    end
+    
+    def repopulate(new_queue_item, new_etag)
+      @map["etag"] = new_etag
+      new_queue_item_index = new_queue_item["position"].to_i
+      if @map["queue_item"] #single or array
+        @map["queue_item"] = [@map["queue_item"]].flatten
+        @map["queue_item"].insert((new_queue_item_index - 1), new_queue_item)
+        @map["queue_item"][new_queue_item_index..-1].each {|queue_item| 
+          new_position = (queue_item["position"].to_i + 1).to_s
+          queue_item["position"] = new_position
+          queue_item["id"] = queue_item["id"].gsub(/\/(\d+)\/(\d+)/,"/#{new_position}/\\2")
+        }
       else
-        raise "Error retrieving queue for user #{@user_id}"
+        @map["queue_item"] = [new_queue_item]
       end
     end
   

data/lib/netflix/response.rb

@@ -0,0 +1,29 @@
+module Netflix
+  module ResponseErrorDecorator
+    def get(*args)
+      response = super(*args)
+      response_or_raise_error(response)
+    end
+    def delete(*args)
+      response = super(*args)
+      response_or_raise_error(response)
+    end
+    def post(*args)
+      response = super(*args)
+      response_or_raise_error(response)
+    end
+    def put(*args)
+      response = super(*args)
+      response_or_raise_error(response)
+    end
+    
+    private
+    def response_or_raise_error(response)
+      if response && response.is_a?(Net::HTTPSuccess)
+        response
+      else
+        raise Error.for(response)
+      end
+    end
+  end
+end

data/lib/netflix/user.rb

@@ -17,11 +17,7 @@ module Netflix
     private
     def retrieve
       response = @oauth_access_token.get "/users/#{@user_id}?output=json"
-      if response && response.body && response.code_type == Net::HTTPOK
-        JSON.parse(response.body)["user"]
-      else
-        raise "Error retrieving user #{@user_id}"
-      end
+      JSON.parse(response.body)["user"]
     end
     
   end

data/test/error_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class ErrorTest < Test::Unit::TestCase
+  def setup
+    stub_netflix_for_user('nuid_one')
+  end
+  
+  def test_handle_404_on_delete
+    #add to disc queue
+    FakeWeb.register_uri(:delete, %r|http://api\.netflix\.com/users/nuid_one/queues/disc/available|,
+                         :body => '{"status": {
+                           "message": "Title is not in Queue",
+                           "status_code": 404,
+                           "sub_code": 610
+                         }}',
+                         :status => ['404', 'Not Found'])
+    
+    user = Netflix::Client.new('nuid_access_key', 'nuid_access_secret').user('nuid_one')
+    available_disc_queue = user.available_disc_queue
+    assert available_disc_queue
+    assert_raises(Netflix::Error::NotFound) do
+      available_disc_queue.remove(2)
+    end
+
+  end
+end
+  

data/test/http_fixtures/netflix_queue_responses.yml

@@ -324,7 +324,129 @@ nuid_one:
         ]
       }}
   post:
-    body:
+    body: |
+      {"status": {
+        "resources_created": {"queue_item": {
+          "average_rating": "3.7",
+          "box_art": {
+            "large": "http://cdn-3.nflximg.com/us/boxshots/large/70071613.jpg",
+            "small": "http://cdn-3.nflximg.com/us/boxshots/tiny/70071613.jpg",
+            "medium": "http://cdn-3.nflximg.com/us/boxshots/small/70071613.jpg"
+          },
+          "category": [
+            {
+              "term": "available now",
+              "content": "Available Now",
+              "scheme": "http://api.netflix.com/categories/queue_availability",
+              "label": "available now"
+            },
+            {
+              "term": "Blu-ray",
+              "scheme": "http://api.netflix.com/categories/title_formats",
+              "label": "Blu-ray"
+            },
+            {
+              "term": "R",
+              "scheme": "http://api.netflix.com/categories/mpaa_ratings",
+              "label": "R"
+            },
+            {
+              "term": "Thrillers",
+              "scheme": "http://api.netflix.com/categories/genres",
+              "label": "Thrillers"
+            },
+            {
+              "term": "Crime Thrillers",
+              "scheme": "http://api.netflix.com/categories/genres",
+              "label": "Crime Thrillers"
+            },
+            {
+              "term": "Suspense",
+              "scheme": "http://api.netflix.com/categories/genres",
+              "label": "Suspense"
+            },
+            {
+              "term": "Dramas Based on Contemporary Literature",
+              "scheme": "http://api.netflix.com/categories/genres",
+              "label": "Dramas Based on Contemporary Literature"
+            },
+            {
+              "term": "Dramas Based on the Book",
+              "scheme": "http://api.netflix.com/categories/genres",
+              "label": "Dramas Based on the Book"
+            }
+          ],
+          "updated": "1276960028",
+          "id": "http://api.netflix.com/users/nuid_one/queues/disc/available/4/70071613",
+          "link": [
+            {
+              "href": "http://api.netflix.com/users/nuid_one/queues/disc/available",
+              "rel": "http://schemas.netflix.com/queues.available",
+              "title": "available queue"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613",
+              "rel": "http://schemas.netflix.com/catalog/title",
+              "title": "No Country for Old Men"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/synopsis",
+              "rel": "http://schemas.netflix.com/catalog/titles/synopsis",
+              "title": "synopsis"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/cast",
+              "rel": "http://schemas.netflix.com/catalog/people.cast",
+              "title": "cast"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/directors",
+              "rel": "http://schemas.netflix.com/catalog/people.directors",
+              "title": "directors"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/format_availability",
+              "rel": "http://schemas.netflix.com/catalog/titles/format_availability",
+              "title": "formats"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/awards",
+              "rel": "http://schemas.netflix.com/catalog/titles/awards",
+              "title": "awards"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/screen_formats",
+              "rel": "http://schemas.netflix.com/catalog/titles/screen_formats",
+              "title": "screen formats"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/languages_and_audio",
+              "rel": "http://schemas.netflix.com/catalog/titles/languages_and_audio",
+              "title": "languages and audio"
+            },
+            {
+              "href": "http://api.netflix.com/catalog/titles/movies/70071613/similars",
+              "rel": "http://schemas.netflix.com/catalog/titles.similars",
+              "title": "similars"
+            },
+            {
+              "href": "http://www.netflix.com/Movie/No_Country_for_Old_Men/70071613",
+              "rel": "alternate",
+              "title": "web page"
+            }
+          ],
+          "position": "4",
+          "runtime": "7320",
+          "title": {
+            "regular": "No Country for Old Men",
+            "short": "No Country for Old Men"
+          },
+          "release_year": "2007"
+        }},
+        "status_code": "201",
+        "message": "Move successful",
+        "etag": "82198468425"
+      }}
   delete:
     body: |
       {"status": {
@@ -1192,6 +1314,108 @@ empty_queue:
         "number_of_results": "0"
       }}
   post:
-    body:
+    body: |
+      {"status": {
+          "resources_created": {"queue_item": {
+            "average_rating": "3.4",
+            "box_art": {
+              "large": "http://cdn-2.nflximg.com/us/boxshots/large/70167072.jpg",
+              "small": "http://cdn-2.nflximg.com/us/boxshots/tiny/70167072.jpg",
+              "medium": "http://cdn-2.nflximg.com/us/boxshots/small/70167072.jpg"
+            },
+            "category": [
+              {
+                "term": "available now",
+                "content": "Available Now",
+                "scheme": "http://api.netflix.com/categories/queue_availability",
+                "label": "available now"
+              },
+              {
+                "term": "Blu-ray",
+                "scheme": "http://api.netflix.com/categories/title_formats",
+                "label": "Blu-ray"
+              },
+              {
+                "term": "PG-13",
+                "scheme": "http://api.netflix.com/categories/mpaa_ratings",
+                "label": "PG-13"
+              },
+              {
+                "term": "Comedy",
+                "scheme": "http://api.netflix.com/categories/genres",
+                "label": "Comedy"
+              },
+              {
+                "term": "Romantic Comedies",
+                "scheme": "http://api.netflix.com/categories/genres",
+                "label": "Romantic Comedies"
+              }
+            ],
+            "updated": "1323539988",
+            "id": "http://api.netflix.com/users/empty_queue/queues/disc/available/1/70167072",
+            "link": [
+              {
+                "href": "http://api.netflix.com/users/empty_queue/queues/disc/available",
+                "rel": "http://schemas.netflix.com/queues.available",
+                "title": "available queue"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072",
+                "rel": "http://schemas.netflix.com/catalog/title",
+                "title": "Arthur"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/synopsis",
+                "rel": "http://schemas.netflix.com/catalog/titles/synopsis",
+                "title": "synopsis"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/cast",
+                "rel": "http://schemas.netflix.com/catalog/people.cast",
+                "title": "cast"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/directors",
+                "rel": "http://schemas.netflix.com/catalog/people.directors",
+                "title": "directors"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/format_availability",
+                "rel": "http://schemas.netflix.com/catalog/titles/format_availability",
+                "title": "formats"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/screen_formats",
+                "rel": "http://schemas.netflix.com/catalog/titles/screen_formats",
+                "title": "screen formats"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/languages_and_audio",
+                "rel": "http://schemas.netflix.com/catalog/titles/languages_and_audio",
+                "title": "languages and audio"
+              },
+              {
+                "href": "http://api.netflix.com/catalog/titles/movies/70167072/similars",
+                "rel": "http://schemas.netflix.com/catalog/titles.similars",
+                "title": "similars"
+              },
+              {
+                "href": "http://www.netflix.com/Movie/Arthur/70167072",
+                "rel": "alternate",
+                "title": "web page"
+              }
+            ],
+            "position": "1",
+            "runtime": "6600",
+            "title": {
+              "regular": "Arthur",
+              "short": "Arthur"
+            },
+            "release_year": "2011"
+          }},
+          "status_code": "201",
+          "message": "Move successful",
+          "etag": "82198468425"
+        }}
   delete:
     body:

data/test/integration/.gitignore

@@ -0,0 +1 @@
+oauth_settings.yml

data/test/integration/queue_test.rb

@@ -0,0 +1,72 @@
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
+
+require 'test/unit'
+require 'yaml'
+require 'netflix'
+
+class QueueTest < Test::Unit::TestCase
+  def setup
+    @oauth_settings = YAML.load_file(File.join(File.dirname(__FILE__),"oauth_settings.yml"))
+    #puts @oauth_settings
+    Netflix::Client.consumer_key = @oauth_settings[:consumer_key]
+    Netflix::Client.consumer_secret = @oauth_settings[:consumer_secret]
+    @client = Netflix::Client.new(@oauth_settings[:user][:access_token], @oauth_settings[:user][:access_secret])
+    
+    #Do direct oauth gem retrieval of queue and deletion of all queue entries to get a clean start
+    oauth_access_token = @client.instance_variable_get(:@oauth_access_token)
+    #user_response = oauth_access_token.get "/users/current?output=json"
+    #puts "current_user: #{JSON.parse(user_response.body)}"
+    queue_response = oauth_access_token.get "/users/#{@oauth_settings[:user][:user_id]}/queues/disc/available?output=json"
+    queue_response_json = queue_response.body
+    queue_response_obj = JSON.parse(queue_response_json)
+    puts "get queue response: #{queue_response_obj}"
+    queue = queue_response_obj["queue"]
+    queue_items = queue && queue["queue_item"] && [queue["queue_item"]].flatten
+    if queue_items
+      queue_item_urls = queue_items.map() {|queue_item| queue_item["id"]}
+      queue_item_urls.reverse.each {|queue_item_url|
+        sleep 0.25 # for netflix api queries per second limit
+        response = oauth_access_token.delete queue_item_url
+        puts "delete response= #{response.body}"
+      }
+    end
+    sleep 0.25 # for netflix api queries per second limit
+    @user = @client.user(@oauth_settings[:user][:user_id])
+  end
+  
+  def test_get_available_disc_queue
+    available_disc_queue = @user.available_disc_queue
+    assert available_disc_queue, "Expecting user to have a disc_queue"
+  end
+  
+  def test_get_discs_add_and_remove
+    sleep 0.25 # for netflix api queries per second limit
+    queue = @user.available_disc_queue
+    assert queue, "Expecting queue"
+    assert_equal 0, queue.etag, "Initial etag should be 0 when no discs"
+    discs = queue.discs
+    assert discs, "Expecting the queue to respond to #discs"
+    assert_equal 0, discs.size, "Expecting the discs list to have size 0 at start"
+
+    sleep 0.25 # for netflix api queries per second limit
+    queue.add("http://api.netflix.com/catalog/titles/movies/70167072")
+    queue_after_add = @user.available_disc_queue
+    assert_not_equal 0, queue.etag, "Etag should not be 0 after a disc is added"
+    discs = queue_after_add.discs
+    assert discs, "Expecting the queue to respond to #discs"
+    assert_equal 1, discs.size, "Expecting the discs list to have size 1 after add"
+    
+    disc_one = discs[0]
+    assert_equal "http://api.netflix.com/users/#{@oauth_settings[:user][:user_id]}/queues/disc/available/1/70167072", disc_one.id
+    assert_equal "Arthur", disc_one.title
+
+    sleep 0.25 # for netflix api queries per second limit
+    queue.remove(1)
+    sleep 0.25 # for netflix api queries per second limit
+    queue_after_remove = @user.available_disc_queue
+    discs = queue_after_remove.discs
+    assert discs, "Expecting the queue to respond to #discs"
+    assert_equal 0, discs.size, "Expecting the discs list to have size 0 after remove"
+    
+  end
+end

data/test/integration/rake_test_helper.rb

@@ -0,0 +1,42 @@
+require 'oauth'
+require 'launchy'
+
+class IntegrationTestHelper
+  def self.obtain_credentials
+    puts "Enter Consumer Key/Secret info before running integration tests, you should have registered with http://developer.netflix.com"
+    printf "Consumer Key:"
+    consumer_key = STDIN.gets.chomp
+    printf "Consumer Secret:"
+    consumer_secret = STDIN. gets.chomp
+    printf "Do you have an access token/secret? ([Y]/n)"
+    answer = STDIN.gets.chomp
+    if ["N","n","No","no"].include?(answer)
+      puts "Launching netflix oauth page, login to TEST account and allow this application"
+      oauth_consumer = OAuth::Consumer.new(consumer_key, consumer_secret,
+        :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")
+      request_token = oauth_consumer.get_request_token
+      authorize_url = request_token.authorize_url(:oauth_consumer_key => consumer_key)
+      Launchy.open(authorize_url)
+      puts "Go to browser, a page has been opened to establish oauth"
+      printf "Pin from Netflix:"
+      pin = STDIN.gets.chomp
+      access_token_response = request_token.get_access_token(:oauth_verifier => pin)
+      access_token = access_token_response.token
+      access_secret = access_token_response.secret
+      user_id = access_token_response.params["user_id"]
+    else
+      printf "Access Token:"
+      access_token = STDIN.gets.chomp
+      printf "Access Secret:"
+      access_secret = STDIN.gets.chomp
+      printf "User id:"
+      user_id = STDIN.gets.chomp
+    end
+    
+    {:consumer_key => consumer_key, :consumer_secret => consumer_secret, :user => {:access_token => access_token, :access_secret => access_secret, :user_id => user_id}}
+    
+  end
+end

data/test/queue_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 class QueueTest < Test::Unit::TestCase
   def setup
     stub_netflix_for_user('nuid_one')
+    stub_netflix_for_user('nuid_sub1')
     Netflix::Client.consumer_key = 'foo_consumer_key'
     Netflix::Client.consumer_secret = 'foo_consumer_secret'
   end
@@ -25,18 +26,48 @@ class QueueTest < Test::Unit::TestCase
     assert_equal "Arthur", disc_one.title
   end
   
-  def test_add_item_to_queue
+  def test_add_item_to_queue_end_the_default
     user = Netflix::Client.new('nuid_access_key', 'nuid_access_secret').user('nuid_one')
     available_disc_queue = user.available_disc_queue
     assert available_disc_queue
-    available_disc_queue.add('70071613')
+    #pre tests
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/1/70167072", available_disc_queue.discs[0].id
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/2/70142826", available_disc_queue.discs[1].id
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/3/70108988", available_disc_queue.discs[2].id
+    assert_equal "115673854498", available_disc_queue.etag
+    #operation and tests
+    new_queue = available_disc_queue.add("http://api.netflix.com/catalog/titles/movies/70071613")
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/1/70167072", new_queue.discs[0].id
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/2/70142826", new_queue.discs[1].id
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/3/70108988", new_queue.discs[2].id
+    assert_equal "http://api.netflix.com/users/nuid_one/queues/disc/available/4/70071613", new_queue.discs[3].id
+    assert_equal "1", new_queue.discs[0].instance_variable_get(:@map)["position"]
+    assert_equal "2", new_queue.discs[1].instance_variable_get(:@map)["position"]
+    assert_equal "3", new_queue.discs[2].instance_variable_get(:@map)["position"]
+    assert_equal "4", new_queue.discs[3].instance_variable_get(:@map)["position"]
+    assert_equal "82198468425", new_queue.etag
   end
   
   def test_add_item_to_queue_top
-    user = Netflix::Client.new('nuid_access_key', 'nuid_access_secret').user('nuid_one')
+    user = Netflix::Client.new('nuid_access_key', 'nuid_access_secret').user('nuid_sub1')
     available_disc_queue = user.available_disc_queue
     assert available_disc_queue
-    available_disc_queue.add('70071613', 1)
+    #pre tests
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/1/70071613", available_disc_queue.discs[0].id
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/2/70117306", available_disc_queue.discs[1].id
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/3/70105135", available_disc_queue.discs[2].id
+    assert_equal "115673854498", available_disc_queue.etag
+    #operation and tests
+    new_queue = available_disc_queue.add("http://api.netflix.com/catalog/titles/movies/70167072", 1)
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/1/70167072", new_queue.discs[0].id
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/2/70071613", new_queue.discs[1].id
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/3/70117306", new_queue.discs[2].id
+    assert_equal "http://api.netflix.com/users/nuid_sub1/queues/disc/available/4/70105135", new_queue.discs[3].id
+    assert_equal "1", new_queue.discs[0].instance_variable_get(:@map)["position"]
+    assert_equal "2", new_queue.discs[1].instance_variable_get(:@map)["position"]
+    assert_equal "3", new_queue.discs[2].instance_variable_get(:@map)["position"]
+    assert_equal "4", new_queue.discs[3].instance_variable_get(:@map)["position"]
+    assert_equal "82198468425", new_queue.etag
   end
   
   def test_remove_item_from_queue_by_index
@@ -46,21 +77,6 @@ class QueueTest < Test::Unit::TestCase
     available_disc_queue.remove(2)
   end
   
-  #def test_add_item_to_stale_queue_fails
-  #  user = Netflix::Client.new('nuid_access_key', 'nuid_access_secret').user('nuid_one')
-  #  available_disc_queue = user.available_disc_queue
-  #  assert available_disc_queue
-  #  available_disc_queue.add('70071613')
-  #  old_available_disc_queue = available_disc_queue
-  #  
-  #  available_disc_queue = user.available_disc_queue
-  #  available_disc_queue.add('70117306')
-  #  
-  #  assert_raises() {
-  #    old_available_disc_queue.add('70105135')
-  #  }
-  #end
-  
   def test_empty_queue
     stub_netflix_for_user('empty_queue')
     user = Netflix::Client.new('nuid_access_key', 'nuid_access_secret').user('empty_queue')
@@ -68,6 +84,7 @@ class QueueTest < Test::Unit::TestCase
     assert available_disc_queue, "Expected a disc_queue"
     assert available_disc_queue.discs, "Expected the disc_queue to have a discs attribute"
     assert_equal 0, available_disc_queue.discs.size, "Expected discs to be empty array #{available_disc_queue.discs[0]}}"
+    new_queue = available_disc_queue.add("http://api.netflix.com/catalog/titles/movies/70167072")
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netflix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &2165140260 !ruby/object:Gem::Requirement
+  requirement: &2155382740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165140260
+  version_requirements: *2155382740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2165139740 !ruby/object:Gem::Requirement
+  requirement: &2155382320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165139740
+  version_requirements: *2155382320
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2165139320 !ruby/object:Gem::Requirement
+  requirement: &2155381900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165139320
+  version_requirements: *2155381900
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2165138840 !ruby/object:Gem::Requirement
+  requirement: &2155381480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165138840
+  version_requirements: *2155381480
 - !ruby/object:Gem::Dependency
   name: yaml
-  requirement: &2165138360 !ruby/object:Gem::Requirement
+  requirement: &2155381060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,24 +65,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165138360
+  version_requirements: *2155381060
 description: Ruby Netflix API wrapper
 email: deanholdren@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - lib/netflix.rb
 - lib/netflix/client.rb
 - lib/netflix/disc.rb
+- lib/netflix/errors.rb
 - lib/netflix/json_resource.rb
 - lib/netflix/queue.rb
+- lib/netflix/response.rb
 - lib/netflix/user.rb
+- test/error_test.rb
 - test/http_fixtures/netflix_queue_responses.yml
 - test/http_fixtures/netflix_user_responses.yml
+- test/integration/.gitignore
+- test/integration/queue_test.rb
+- test/integration/rake_test_helper.rb
 - test/non_user_client.rb
 - test/queue_test.rb
 - test/test_helper.rb
@@ -107,13 +114,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby Netflix API wrapper
 test_files:
+- test/error_test.rb
 - test/http_fixtures/netflix_queue_responses.yml
 - test/http_fixtures/netflix_user_responses.yml
+- test/integration/.gitignore
+- test/integration/queue_test.rb
+- test/integration/rake_test_helper.rb
 - test/non_user_client.rb
 - test/queue_test.rb
 - test/test_helper.rb