ruby-tmdb 0.0.21 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.1.0

data/lib/ruby-tmdb/tmdb.rb

@@ -23,13 +23,19 @@ class Tmdb
   def self.api_call(method, data, language = "en")
     raise ArgumentError, "Tmdb.api_key must be set before using the API" if(Tmdb.api_key.nil? || Tmdb.api_key.empty?)
     url = Tmdb.base_api_url + method + '/' + language + '/yaml/' + Tmdb.api_key + '/' + CGI::escape(data.to_s)
+    # Memoize this API call
     response = @@api_response[url] ||= begin
       Tmdb.get_url(url)
     end
     if(response.code.to_i != 200)
-      return []
+      return nil
+    end
+    body = YAML::load(response.body)
+    if( body.first.include?("Nothing found"))
+      return nil
+    else
+      return body
     end
-    YAML::load(response.body)
   end
 
   # Get a URL and return a response object, follow upto 'limit' re-directs on the way

data/ruby-tmdb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-tmdb}
-  s.version = "0.0.21"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Gough"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-07-21}
   s.description = %q{An ActiveRecord-style API wrapper for TheMovieDB.org}
   s.email = %q{aaron@aarongough.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/ruby-tmdb/tmdb_cast.rb",
      "lib/ruby-tmdb/tmdb_movie.rb",
      "ruby-tmdb.gemspec",
+     "test/fixtures/blank_result.txt",
      "test/fixtures/example_com.txt",
      "test/fixtures/image.jpg",
      "test/fixtures/incorrect_api_url.txt",

data/test/fixtures/blank_result.txt

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Wed, 21 Jul 2010 19:39:08 GMT
+Content-Type: text/x-yaml; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Keep-Alive: timeout=20
+Status: 200 OK
+Cache-Control: public, max-age=43200
+X-Varnish: 2146446054 2146440076
+Age: 28
+Via: 1.1 varnish
+X-Cache: HIT
+
+--- 
+- Nothing found.

data/test/setup/url_mocks.rb

@@ -22,6 +22,10 @@ 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)
+      
+      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|

data/test/unit/tmdb_test.rb

@@ -97,10 +97,16 @@ class TmdbTest < Test::Unit::TestCase
     end
   end
   
-  test "failed API call should return empty array" do
+  test "failed API call should return nil" do
     movies = Tmdb.api_call('Movie.blarg', 'Transformers')
-    assert_kind_of Array, movies
-    assert movies.empty?
+    assert_kind_of NilClass, movies
+    assert_nil movies
+  end
+  
+  test "API call that finds no results should return nil" do
+    movies = Tmdb.api_call('Search.empty', 'Transformers')
+    assert_kind_of NilClass, movies
+    assert_nil movies
   end
   
   test "API call cache should not be changed when data altered in the receiving method" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-tmdb
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 21
-  version: 0.0.21
+  version: 0.1.0
 platform: ruby
 authors: 
 - Aaron Gough
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-07-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,6 +50,7 @@ files:
 - lib/ruby-tmdb/tmdb_cast.rb
 - lib/ruby-tmdb/tmdb_movie.rb
 - ruby-tmdb.gemspec
+- test/fixtures/blank_result.txt
 - test/fixtures/example_com.txt
 - test/fixtures/image.jpg
 - test/fixtures/incorrect_api_url.txt
@@ -85,7 +84,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -94,7 +92,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"