ruby-tmdb 0.1.2 → 0.1.3

data/test/fixtures/person_search.txt

@@ -1,232 +1,15 @@
-HTTP/1.1 200 OK
-Status: 200 OK
-Content-Type: text/x-yaml; charset=utf-8
-Transfer-Encoding: chunked
-Date: Sun, 16 May 2010 17:55:18 GMT
-X-Varnish: 4020117426
-Age: 0
-Via: 1.1 varnish
-Connection: keep-alive
-X-Cache: MISS
-
---- 
-- score: 25
-  popularity: 3
-  name: Vince Locke
-  id: 4484
-  biography: ""
-  url: http://www.themoviedb.org/person/4484
-  profile: []
-
-- score: 24
-  popularity: 3
-  name: Vince Deadrick Jr.
-  id: 12879
-  biography: ""
-  url: http://www.themoviedb.org/person/12879
-  profile: []
-
-- score: 23
-  popularity: 3
-  name: Vince Trankina
-  id: 91412
-  biography: ""
-  url: http://www.themoviedb.org/person/91412
-  profile: []
-
-- score: 22
-  popularity: 3
-  name: Pruitt Taylor Vince
-  id: 3201
-  biography: ""
-  url: http://www.themoviedb.org/person/3201
-  profile: []
-
-- score: 21
-  popularity: 3
-  name: Vince Edwards
-  id: 3337
-  biography: ""
-  url: http://www.themoviedb.org/person/3337
-  profile: []
-
-- score: 20
-  popularity: 3
-  name: Vince Vaughn
-  id: 4937
-  biography: ""
-  url: http://www.themoviedb.org/person/4937
-  profile: 
-  - image: 
-      type: profile
-      size: original
-      height: 1087
-      width: 800
-      url: http://i2.themoviedb.org/profiles/029/4bc9fe2c017a3c0e8b000029/vince-vaughn-original.jpg
-      id: 4bc9fe2c017a3c0e8b000029
-  - image: 
-      type: profile
-      size: profile
-      height: 251
-      width: 185
-      url: http://i2.themoviedb.org/profiles/029/4bc9fe2c017a3c0e8b000029/vince-vaughn-profile.jpg
-      id: 4bc9fe2c017a3c0e8b000029
-  - image: 
-      type: profile
-      size: thumb
-      height: 61
-      width: 45
-      url: http://i1.themoviedb.org/profiles/029/4bc9fe2c017a3c0e8b000029/vince-vaughn-thumb.jpg
-      id: 4bc9fe2c017a3c0e8b000029
-- score: 19
-  popularity: 3
-  name: William Vince
-  id: 5358
-  biography: ""
-  url: http://www.themoviedb.org/person/5358
-  profile: []
-
-- score: 18
-  popularity: 3
-  name: Vince Oddone
-  id: 9467
-  biography: ""
-  url: http://www.themoviedb.org/person/9467
-  profile: []
-
-- score: 17
-  popularity: 3
-  name: Vince Barnett
-  id: 13357
-  biography: ""
-  url: http://www.themoviedb.org/person/13357
-  profile: []
-
-- score: 16
-  popularity: 3
-  name: Vince DiCola
-  id: 16637
-  biography: ""
-  url: http://www.themoviedb.org/person/16637
-  profile: []
-
-- score: 15
-  popularity: 3
-  name: Vince Palmieri
-  id: 19446
-  biography: ""
-  url: http://www.themoviedb.org/person/19446
-  profile: []
-
-- score: 14
-  popularity: 3
-  name: Alexander Vince
-  id: 20058
-  biography: ""
-  url: http://www.themoviedb.org/person/20058
-  profile: []
-
-- score: 13
-  popularity: 3
-  name: Barrie Vince
-  id: 22154
-  biography: ""
-  url: http://www.themoviedb.org/person/22154
-  profile: []
-
-- score: 12
-  popularity: 3
-  name: Robert Vince
-  id: 25010
-  biography: ""
-  url: http://www.themoviedb.org/person/25010
-  profile: []
-
-- score: 11
-  popularity: 3
-  name: Vince Desiderio
-  id: 27591
-  biography: ""
-  url: http://www.themoviedb.org/person/27591
-  profile: []
-
-- score: 10
-  popularity: 3
-  name: Vince Giordano
-  id: 28009
-  biography: ""
-  url: http://www.themoviedb.org/person/28009
-  profile: []
-
-- score: 9
-  popularity: 3
-  name: Pruitt Taylor Vince
-  id: 28411
-  biography: ""
-  url: http://www.themoviedb.org/person/28411
-  profile: []
-
-- score: 8
-  popularity: 3
-  name: Vince Di Meglio
-  id: 29012
-  biography: ""
-  url: http://www.themoviedb.org/person/29012
-  profile: []
-
-- score: 7
-  popularity: 3
-  name: Vince Murdocco
-  id: 33585
-  biography: ""
-  url: http://www.themoviedb.org/person/33585
-  profile: []
-
-- score: 6
-  popularity: 3
-  name: Vince Martin
-  id: 45215
-  biography: ""
-  url: http://www.themoviedb.org/person/45215
-  profile: []
-
-- score: 5
-  popularity: 3
-  name: Vince Gerardis
-  id: 54268
-  biography: ""
-  url: http://www.themoviedb.org/person/54268
-  profile: []
-
-- score: 4
-  popularity: 3
-  name: Vince Gilligan
-  id: 66633
-  biography: ""
-  url: http://www.themoviedb.org/person/66633
-  profile: []
-
-- score: 3
-  popularity: 3
-  name: Nicholas Vince
-  id: 56559
-  biography: ""
-  url: http://www.themoviedb.org/person/56559
-  profile: []
-
-- score: 2
-  popularity: 3
-  name: Vince McMahon
-  id: 57342
-  biography: ""
-  url: http://www.themoviedb.org/person/57342
-  profile: []
-
-- score: 1
-  popularity: 3
-  name: Vince Vieluf
-  id: 58381
-  biography: ""
-  url: http://www.themoviedb.org/person/58381
-  profile: []
-
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 23 Aug 2010 16:39:45 GMT
+Content-Type: text/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Keep-Alive: timeout=20
+Status: 200 OK
+Cache-Control: public, max-age=21600
+X-Varnish: 2542104567 2542101419
+Age: 36
+Via: 1.1 varnish
+X-Cache: HIT
+
+[{"score":30,"popularity":3,"name":"Nicholas Vince","id":56559,"biography":"","url":"http://www.themoviedb.org/person/56559","profile":[],"version":2,"last_modified_at":"2010-07-19 18:00:13"},{"score":29,"popularity":3,"name":"Vince Guaraldi","id":124022,"biography":"","url":"http://www.themoviedb.org/person/124022","profile":[],"version":3,"last_modified_at":"2010-07-26 21:41:09"},{"score":28,"popularity":3,"name":"Vince Flaherty","id":121264,"biography":"","url":"http://www.themoviedb.org/person/121264","profile":[],"version":2,"last_modified_at":"2010-07-19 20:56:43"},{"score":27,"popularity":3,"name":"Vince Corazza","id":106711,"biography":"","url":"http://www.themoviedb.org/person/106711","profile":[],"version":2,"last_modified_at":"2010-07-19 20:13:41"},{"score":26,"popularity":3,"name":"Vince Green","id":59569,"biography":"","url":"http://www.themoviedb.org/person/59569","profile":[],"version":2,"last_modified_at":"2010-07-19 23:10:54"},{"score":25,"popularity":3,"name":"Vince Leigh","id":60419,"biography":"","url":"http://www.themoviedb.org/person/60419","profile":[],"version":2,"last_modified_at":"2010-07-19 23:18:05"},{"score":24,"popularity":3,"name":"Robert Vince","id":61248,"biography":"","url":"http://www.themoviedb.org/person/61248","profile":[],"version":2,"last_modified_at":"2010-07-26 18:35:29"},{"score":23,"popularity":3,"name":"Vince Lozano","id":88032,"biography":"","url":"http://www.themoviedb.org/person/88032","profile":[],"version":2,"last_modified_at":"2010-07-19 20:05:49"},{"score":22,"popularity":3,"name":"Vince Trankina","id":91412,"biography":"","url":"http://www.themoviedb.org/person/91412","profile":[],"version":2,"last_modified_at":"2010-07-19 17:51:39"},{"score":21,"popularity":3,"name":"Vince Martin","id":45215,"biography":"","url":"http://www.themoviedb.org/person/45215","profile":[],"version":2,"last_modified_at":"2010-07-19 18:43:43"},{"score":20,"popularity":3,"name":"Vince Vieluf","id":58381,"biography":"","url":"http://www.themoviedb.org/person/58381","profile":[],"version":4,"last_modified_at":"2010-07-26 20:41:53"},{"score":19,"popularity":3,"name":"Vince Gilligan","id":66633,"biography":"","url":"http://www.themoviedb.org/person/66633","profile":[],"version":3,"last_modified_at":"2010-07-26 18:17:51"},{"score":18,"popularity":3,"name":"Robert Vince","id":61244,"biography":"","url":"http://www.themoviedb.org/person/61244","profile":[],"version":15,"last_modified_at":"2010-07-27 15:56:39"},{"score":17,"popularity":3,"name":"Vince Clarke","id":105820,"biography":"","url":"http://www.themoviedb.org/person/105820","profile":[],"version":2,"last_modified_at":"2010-07-19 20:19:59"},{"score":16,"popularity":3,"name":"William Vince","id":5358,"biography":"","url":"http://www.themoviedb.org/person/5358","profile":[],"version":6,"last_modified_at":"2010-07-27 16:01:24"},{"score":15,"popularity":3,"name":"Alexander Vince","id":20058,"biography":"","url":"http://www.themoviedb.org/person/20058","profile":[],"version":2,"last_modified_at":"2010-07-19 21:46:32"},{"score":14,"popularity":3,"name":"Vince Palomino","id":102312,"biography":"","url":"http://www.themoviedb.org/person/102312","profile":[],"version":2,"last_modified_at":"2010-07-19 21:52:08"},{"score":13,"popularity":3,"name":"Vince Locke","id":4484,"biography":"","url":"http://www.themoviedb.org/person/4484","profile":[],"version":2,"last_modified_at":"2010-07-19 22:16:48"},{"score":12,"popularity":3,"name":"Vince Oddone","id":9467,"biography":"","url":"http://www.themoviedb.org/person/9467","profile":[],"version":2,"last_modified_at":"2010-07-19 22:39:49"},{"score":11,"popularity":3,"name":"Barrie Vince","id":22154,"biography":"","url":"http://www.themoviedb.org/person/22154","profile":[],"version":2,"last_modified_at":"2010-07-19 23:28:26"},{"score":10,"popularity":3,"name":"Vince Ravine","id":25293,"biography":"","url":"http://www.themoviedb.org/person/25293","profile":[],"version":3,"last_modified_at":"2010-07-30 13:41:37"},{"score":9,"popularity":3,"name":"Vince Barnett","id":13357,"biography":"","url":"http://www.themoviedb.org/person/13357","profile":[],"version":6,"last_modified_at":"2010-07-26 21:42:23"},{"score":8,"popularity":3,"name":"Robert Vince","id":25010,"biography":"","url":"http://www.themoviedb.org/person/25010","profile":[],"version":2,"last_modified_at":"2010-07-20 00:05:30"},{"score":7,"popularity":3,"name":"Vince Desiderio","id":27591,"biography":"","url":"http://www.themoviedb.org/person/27591","profile":[],"version":3,"last_modified_at":"2010-07-27 13:34:56"},{"score":6,"popularity":3,"name":"Vince Giordano","id":28009,"biography":"","url":"http://www.themoviedb.org/person/28009","profile":[],"version":2,"last_modified_at":"2010-07-20 00:09:10"},{"score":5,"popularity":3,"name":"Vince Murdocco","id":33585,"biography":"","url":"http://www.themoviedb.org/person/33585","profile":[],"version":3,"last_modified_at":"2010-07-26 21:15:56"},{"score":4,"popularity":3,"name":"Vince Evans","id":126201,"biography":"","url":"http://www.themoviedb.org/person/126201","profile":[],"version":3,"last_modified_at":"2010-07-25 17:03:33"},{"score":3,"popularity":3,"name":"Vince Colosimo","id":77496,"biography":"","url":"http://www.themoviedb.org/person/77496","profile":[],"version":6,"last_modified_at":"2010-07-26 19:52:22"},{"score":2,"popularity":3,"name":"Vince Gerardis","id":54268,"biography":"","url":"http://www.themoviedb.org/person/54268","profile":[],"version":3,"last_modified_at":"2010-07-28 11:00:11"},{"score":1,"popularity":3,"name":"Robert Vince","id":61245,"biography":"","url":"http://www.themoviedb.org/person/61245","profile":[],"version":2,"last_modified_at":"2010-07-26 18:35:28"}]

data/test/setup/setup_api_key.rb

@@ -1,3 +1,3 @@
-File.open(File.join(File.dirname(__FILE__), 'tmdb_api_key.txt')) do |file|
-  Tmdb.api_key = file.read
+File.open(File.join(File.dirname(__FILE__), 'tmdb_api_key.txt')) do |file|
+  Tmdb.api_key = file.read
 end

data/test/setup/test_unit_extensions.rb

@@ -1,21 +1,21 @@
-module Test::Unit
-  # Used to fix a minor minitest/unit incompatibility in flexmock
-  AssertionFailedError = Class.new(StandardError)
-  
-  class TestCase
-   
-    def self.test(name, &block)
-      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-      defined = instance_method(test_name) rescue false
-      raise "#{test_name} is already defined in #{self}" if defined
-      if block_given?
-        define_method(test_name, &block)
-      else
-        define_method(test_name) do
-          flunk "No implementation provided for #{name}"
-        end
-      end
-    end
-
-  end
+module Test::Unit
+  # Used to fix a minor minitest/unit incompatibility in flexmock
+  AssertionFailedError = Class.new(StandardError)
+  
+  class TestCase
+   
+    def self.test(name, &block)
+      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+      defined = instance_method(test_name) rescue false
+      raise "#{test_name} is already defined in #{self}" if defined
+      if block_given?
+        define_method(test_name, &block)
+      else
+        define_method(test_name) do
+          flunk "No implementation provided for #{name}"
+        end
+      end
+    end
+
+  end
 end

data/test/setup/url_mocks.rb

@@ -1,5 +1,7 @@
 def register_api_url_stubs  
   unless(TEST_LIVE_API)
+    
+  
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "movie_search.txt")) do |file|
       stub_request(:get, Regexp.new(Tmdb.base_api_url + "Movie.search/" + ".*")).to_return(file)
     end
@@ -22,11 +24,11 @@ def register_api_url_stubs
     
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "incorrect_api_url.txt")) do |file|
       stub_request(:get, Regexp.new(Tmdb.base_api_url + "Movie.blarg/" + ".*")).to_return(file)
+    end
       
-      File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "blank_result.txt")) do |file|
+    File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "blank_result.txt")) do |file|
       stub_request(:get, Regexp.new(Tmdb.base_api_url + "Search.empty/" + ".*")).to_return(file)
     end
-    end
     
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "example_com.txt")) do |file|
       stub_request(:get, Regexp.new("http://example.com.*")).to_return(file)
@@ -36,6 +38,14 @@ def register_api_url_stubs
       stub_request(:get, Regexp.new('http://i[0-9].themoviedb.org/[backdrops|posters|profiles].*')).to_return(file)
     end
     
+    File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "image.jpg")) do |file|
+      stub_request(:get, Regexp.new('http://hwcdn.themoviedb.org/[backdrops|posters|profiles].*')).to_return(file)
+    end
+    
+    File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "blank_result.txt")) do |file|
+      stub_request(:get, Regexp.new("item_not_found$")).to_return(file)
+    end
+    
     stub_request(:get, 'http://thisisaurlthatdoesntexist.co.nz').to_return(:body => "", :status => 404, :headers => {'content-length' => 0})
   end
 end

data/test/test_helper.rb

@@ -1,20 +1,20 @@
-TEST_LIVE_API = false
-
-require 'rubygems'
-require 'test/unit'
-
-unless(TEST_LIVE_API)
-  require 'webmock/test_unit'
-  include WebMock
-end
-
-require_files = []
-require_files << File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-tmdb.rb')
-require_files.concat Dir[File.join(File.dirname(__FILE__), 'setup', '*.rb')]
-
-require_files.each do |file|
-  require File.expand_path(file)
-end
-
-#load(File.join('unit', 'test_direct_require.rb'), true)
+TEST_LIVE_API = false
+
+require 'rubygems'
+require 'test/unit'
+
+unless(TEST_LIVE_API)
+  require 'webmock/test_unit'
+  include WebMock
+end
+
+require_files = []
+require_files << File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-tmdb.rb')
+require_files.concat Dir[File.join(File.dirname(__FILE__), 'setup', '*.rb')]
+
+require_files.each do |file|
+  require File.expand_path(file)
+end
+
+#load(File.join('unit', 'test_direct_require.rb'), true)
 system('ruby ' + File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'test_direct_require.rb')))

data/test/unit/test_direct_require.rb

@@ -1,25 +1,25 @@
-require "test/unit"
-
-require_files = []
-require_files << File.join(File.dirname(__FILE__), "..", "..", "lib", "ruby-tmdb.rb")
-require_files.concat Dir[File.join(File.dirname(__FILE__), '..', 'setup', '*.rb')]
-
-require_files.each do |file|
-  require File.expand_path(file)
-end
-
-class DirectRequireTest < Test::Unit::TestCase
-  
-  test "TmdbMovie should not raise exception when directly required without using rubygems" do
-    assert_nothing_raised do
-      TmdbMovie.find(:id => 187)
-    end
-  end
-  
-  test "TmdbCast should not raise exception when directly required without using rubygems" do
-    assert_nothing_raised do
-      TmdbCast.find(:id => 287)
-    end
-  end
-  
+require "test/unit"
+
+require_files = []
+require_files << File.join(File.dirname(__FILE__), "..", "..", "lib", "ruby-tmdb.rb")
+require_files.concat Dir[File.join(File.dirname(__FILE__), '..', 'setup', '*.rb')]
+
+require_files.each do |file|
+  require File.expand_path(file)
+end
+
+class DirectRequireTest < Test::Unit::TestCase
+  
+  test "TmdbMovie should not raise exception when directly required without using rubygems" do
+    assert_nothing_raised do
+      TmdbMovie.find(:id => 187)
+    end
+  end
+  
+  test "TmdbCast should not raise exception when directly required without using rubygems" do
+    assert_nothing_raised do
+      TmdbCast.find(:id => 287)
+    end
+  end
+  
 end

data/test/unit/tmdb_cast_test.rb

@@ -6,6 +6,11 @@ class TmdbCastTest < Test::Unit::TestCase
     register_api_url_stubs
   end
   
+  test "search that returns no results should create empty array" do
+    movie = TmdbCast.find(:name => "item_not_found")
+    assert_equal [], movie
+  end
+  
   test "cast data should be able to be dumped and re-loaded" do
     assert_nothing_raised do
       cast = TmdbCast.find(:id => 287)

data/test/unit/tmdb_movie_test.rb

@@ -6,6 +6,11 @@ class TmdbMovieTest < Test::Unit::TestCase
     register_api_url_stubs
   end
   
+  test "search that returns no results should create empty array" do
+    movie = TmdbMovie.find(:title => "item_not_found")
+    assert_equal [], movie
+  end
+  
   test "movie should be able to be dumped and re-loaded" do
     assert_nothing_raised do
       movie = TmdbMovie.find(:id => 187)