ruby-tmdb3 0.3.0 → 0.3.1

data/README.rdoc

@@ -98,8 +98,9 @@ To find out more about the information each object offers on retrieved items hav
 
 === Author & Credits
 
-Author:: {Irio Irineu Musskopf Junior}[mailto:iirineu@gmail.com], {Aaron Gough}[mailto:aaron@aarongough.com]
-Contributors:: {Alex Hayes}[https://github.com/alexhayes], {Alvaro Pereyra Rabanal}[https://github.com/xenda], {Linus Oleander}[https://github.com/oleander], {aristides}[https://github.com/aristides], {Robin Boutros}[https://github.com/niuage]
+Authors:: {Irio Irineu Musskopf Junior}[mailto:iirineu@gmail.com], {Aaron Gough}[mailto:aaron@aarongough.com]
+Contributors:: {Alex Hayes}[https://github.com/alexhayes], {Alvaro Pereyra Rabanal}[https://github.com/xenda], {Linus Oleander}[https://github.com/oleander], {aristides}[https://github.com/aristides], {Robin Boutros}[https://github.com/niuage], {Loïc Guitaut}[https://github.com/Flink]
 
 Copyright (c) 2012 {Irio Irineu Musskopf Junior}[http://irio.posterous.com/] ({irio.posterous.com}[http://irio.posterous.com/])
+
 Copyright (c) 2010 {Aaron Gough}[http://thingsaaronmade.com/] ({thingsaaronmade.com}[http://thingsaaronmade.com/]), released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/ruby-tmdb3/tmdb.rb

@@ -10,6 +10,17 @@ class Tmdb
   @@api_key = ""
   @@default_language = "en"
   @@api_response = {}
+
+  # TODO: Should be refreshed and cached from API 
+  CONFIGURATION = DeepOpenStruct.load({ "images" =>
+                    { 
+                      "base_url"        => "http://cf2.imgobject.com/t/p/", 
+                      "posters_sizes"   => ["w92", "w154", "w185", "w342", "w500", "original"],
+                      "backdrops_sizes" => ["w300", "w780", "w1280", "original"],
+                      "profiles_sizes"  => ["w45", "w185", "h632", "original"],
+                      "logos_sizes"     => ["w45", "w92", "w154", "w185", "w300", "w500", "original"]
+                    }
+  })
   
   def self.api_key
     @@api_key
@@ -28,13 +39,15 @@ class Tmdb
   end
   
   def self.base_api_url
-    "http://api.themoviedb.org/3/"
+    "http://api.themoviedb.org/3"
   end
   
   def self.api_call(method, data, language = @@default_language)
     raise ArgumentError, "Tmdb.api_key must be set before using the API" if(Tmdb.api_key.nil? || Tmdb.api_key.empty?)
     raise ArgumentError, "Invalid data." if(data.nil? || (data.class != Hash))
 
+    method, action = method.split '/'
+
     data = {
       api_key:  Tmdb.api_key,
       language: language
@@ -55,21 +68,17 @@ class Tmdb
     # Construct URL for queries with id
     if data.has_key?(:id)
       uri.query_values = query_values
-
-      url = Tmdb.base_api_url + method + "/" + data[:id].to_s + "?" + uri.query
-
     # Construct URL other queries
     else
       query_values = {
         query: CGI::escape(data[:query])
       }.merge(query_values)
-
       uri.query_values = query_values
-
-      url = Tmdb.base_api_url + method + "?" + uri.query
     end
+    url            = [Tmdb.base_api_url, method, data[:id], action].compact.join '/'
+    url_with_query = [url, uri.query].compact.join '?'
     
-    response = Tmdb.get_url(url)
+    response = Tmdb.get_url(url_with_query)
     if(response.code.to_i != 200)
       raise RuntimeError, "Tmdb API returned status code '#{response.code}' for URL: '#{url}'"
     end
@@ -100,22 +109,20 @@ class Tmdb
   end
   
   def self.data_to_object(data)
-    object = DeepOpenStruct.load(data)
+    object          = DeepOpenStruct.load(data)
     object.raw_data = data
-    ["posters", "backdrops", "profile"].each do |image_array_name|
-      if(object.respond_to?(image_array_name))
-        image_array = object.send(image_array_name)
-        image_array.each_index do |x|
-          image_array[x] = image_array[x].image
-          image_array[x].instance_eval <<-EOD
-            def self.data
-              return Tmdb.get_url(self.url).body
-            end
-          EOD
+    ["posters", "backdrops"].each do |image_array_name|
+      image_array = Array object.send(image_array_name)
+      single_name = image_array_name.slice 0..-2 # singularize name
+      single_path = object.send "#{single_name}_path" # default poster/backdrop image
+      image_array << object.send("#{image_array_name.slice 0..-2}=", DeepOpenStruct.load({file_path: single_path}))
+      # build a struct containing availables sizes with their urls
+      image_array.each do |image|
+        urls = CONFIGURATION.images.send("#{image_array_name}_sizes").inject({}) do |hash, size|
+          hash[size] = {'url' => [CONFIGURATION.images.base_url, size, image.file_path].join}
+          hash
         end
-      end
-      if(object.profile)
-        object.profiles = object.profile
+        image.sizes = DeepOpenStruct.load urls
       end
     end
     unless(object.cast.nil?)
@@ -130,4 +137,4 @@ class Tmdb
     return object
   end
   
-end
+end

data/lib/ruby-tmdb3/tmdb_movie.rb

@@ -40,14 +40,22 @@ class TmdbMovie
   
   def self.new(raw_data, expand_results = false, language = nil)
     # expand the result by calling movie unless :expand_results is false or the data is already complete
-    # (as determined by checking for the runtime property in the raw data)
-    if(expand_results && !raw_data.has_key?("runtime"))
+    # (as determined by checking for the posters property in the raw data)
+    if(expand_results && (!raw_data.has_key?("posters") || !raw_data['releases'] || !raw_data['cast']))
       begin
-        expanded_data = Tmdb.api_call("movie", {id: raw_data["id"].to_s}, language)
-      rescue RuntimeError => e
-        raise ArgumentError, "Unable to fetch expanded info for Movie ID: '#{raw_data["id"]}'" if expanded_data.nil?
+        movie_id              = raw_data['id']
+        raw_data              = Tmdb.api_call 'movie', { id: movie_id }, language
+        @images_data          = Tmdb.api_call("movie/images", {id: movie_id}, language)
+        @releases_data        = Tmdb.api_call('movie/releases', {id: movie_id}, language)
+        @cast_data            = Tmdb.api_call('movie/casts', {id: movie_id}, language)
+        raw_data['posters']   = @images_data['posters']
+        raw_data['backdrops'] = @images_data['backdrops']
+        raw_data['releases']  = @releases_data['countries']
+        raw_data['cast']      = @cast_data['cast']
+        raw_data['crew']      = @cast_data['crew']
+      rescue => e
+        raise ArgumentError, "Unable to fetch expanded infos for Movie ID: '#{movie_id}'" if @images_data.nil? || @releases_data.nil? || @cast_data.nil?
       end
-      raw_data = expanded_data
     end
     return Tmdb.data_to_object(raw_data)
   end
@@ -57,4 +65,4 @@ class TmdbMovie
     return @raw_data == other.raw_data
   end
     
-end
+end

data/ruby-tmdb3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-tmdb3"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Irio Irineu Musskopf Junior", "Aaron Gough"]
-  s.date = "2012-06-19"
+  s.date = "2012-07-11"
   s.description = "An ActiveRecord-style API wrapper for TheMovieDB.org"
   s.email = "iirineu@gmail.com"
   s.extra_rdoc_files = [
@@ -30,8 +30,11 @@ Gem::Specification.new do |s|
     "test/fixtures/example_com.txt",
     "test/fixtures/image.jpg",
     "test/fixtures/incorrect_api_url.txt",
+    "test/fixtures/movie_casts.txt",
     "test/fixtures/movie_get_info.txt",
     "test/fixtures/movie_imdb_lookup.txt",
+    "test/fixtures/movie_posters.txt",
+    "test/fixtures/movie_releases.txt",
     "test/fixtures/movie_search.txt",
     "test/fixtures/person_get_info.txt",
     "test/fixtures/person_search.txt",
@@ -47,7 +50,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/Irio/ruby-tmdb"
   s.rdoc_options = ["--line-numbers", "--inline-source"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.19"
+  s.rubygems_version = "1.8.24"
   s.summary = "An ActiveRecord-style API wrapper for TheMovieDB.org"
 
   if s.respond_to? :specification_version then

data/test/fixtures/movie_casts.txt

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 23 Aug 2010 16:45:21 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: 2542127928 2542059531
+Age: 1000
+Via: 1.1 varnish
+X-Cache: HIT
+
+{"id":49517,"cast":[{"id":5472,"name":"Colin Firth","character":"Bill Haydon","order":0,"profile_path":"/gqcM1rKobitst1mZ999fRmXPjru.jpg"},{"id":2983,"name":"Mark Strong","character":"Jim Prideaux","order":1,"profile_path":"/vC1a35KBxx8f2rkMKyaik7bTOud.jpg"},{"id":2524,"name":"Tom Hardy","character":"Ricki Tarr","order":2,"profile_path":"/aYWIZ7ywOFzyK7B1HHCQj2nq8s4.jpg"},{"id":64,"name":"Gary Oldman","character":"George Smiley","order":3,"profile_path":"/kCWUeBkZ2sf8LObSpUFgRngawQb.jpg"},{"id":71580,"name":"Benedict Cumberbatch","character":"Peter Guillam","order":4,"profile_path":"/pFNkVEjlgls3e9r4PwKuN0VBLQN.jpg"},{"id":13014,"name":"Toby Jones","character":"Percy Alleline","order":5,"profile_path":"/8HDeyCbDzjeylqfDIIs8Bmv40vX.jpg"},{"id":93236,"name":"David Dencik","character":"Toby Esterhase","order":6,"profile_path":null},{"id":8785,"name":"Ciarán Hinds","character":"Roy Bland","order":7,"profile_path":"/8kOafsmtTjY5IxdDUAhFrHKALK5.jpg"},{"id":5049,"name":"John Hurt","character":"Control","order":8,"profile_path":"/zUQ7WL3xg9C532Aa8hftcJUnk9j.jpg"},{"id":42069,"name":"Zoltán Mucsi","character":"Magyar","order":9,"profile_path":"/z4S9Bg4f8gDvBtduEV3vdieHQey.jpg"},{"id":89645,"name":"Péter Kálloy Molnár","character":"Hungarian Waiter","order":10,"profile_path":null},{"id":933031,"name":"Ilona Kassai","character":"Woman in Window","order":11,"profile_path":null},{"id":82364,"name":"Imre Csuja","character":"KGB Agent","order":12,"profile_path":null},{"id":37759,"name":"Kathy Burke","character":"Connie Sachs","order":13,"profile_path":"/vqCHCywlp7HfoKBW6ZzCuQmnJx9.jpg"},{"id":1115,"name":"Stephen Graham","character":"Jerry Westerby","order":14,"profile_path":"/81VZiCA6w8nXG0UjqXCgSJare5N.jpg"},{"id":186275,"name":"Arthur Nightingale","character":"Bryant","order":15,"profile_path":null},{"id":16358,"name":"Simon McBurney","character":"Oliver Lacon","order":16,"profile_path":"/3SMFfBtmoDQncXBtICD61plB04W.jpg"},{"id":235837,"name":"Amanda Fairbank-Hynes","character":"Belinda","order":17,"profile_path":"/127xlkSaLK92NaYdStJQxWkqR1I.jpg"}],"crew":[{"id":74396,"name":"Tomas Alfredson","department":"Directing","job":"Director","profile_path":"/sRl6QzCtO7SlLspfFSvnv8u7ITi.jpg"},{"id":20422,"name":"John le Carré","department":"Writing","job":"Novel","profile_path":null},{"id":64814,"name":"Peter Straughan","department":"Writing","job":"Screenplay","profile_path":null},{"id":227094,"name":"Bridget O'Connor","department":"Writing","job":"Screenplay","profile_path":null}]}

data/test/fixtures/movie_get_info.txt

@@ -12,4 +12,4 @@ Age: 1000
 Via: 1.1 varnish
 X-Cache: HIT
 
-{"adult":false,"backdrop_path":"/kftq445wZNaKEqJ9gXwYOIfI2p1.jpg","belongs_to_collection":{"id":188,"name":"Sin City","poster_path":"/mYxbfd8pZz9YTtEFRaOcQboOvMk.jpg","backdrop_path":"/wyey4NS4Z1z7293R8FFBETL6DSr.jpg"},"budget":40000000,"genres":[{"id":28,"name":"Action"},{"id":80,"name":"Crime"},{"id":18,"name":"Drama"},{"id":53,"name":"Thriller"}],"homepage":"http://www.sincitythemovie.com/","id":187,"imdb_id":"tt0401792","original_title":"Sin City","overview":"Sin City is a neo-noir crime thriller based on Frank Miller's graphic novel series of the same name.The film is primarily based on three of Miller's works: The Hard Goodbye, about a man who embarks on a brutal rampage in search of his one-time sweetheart's killer; The Big Fat Kill, which focuses on a street war between a group of prostitutes and a group of mercenaries; and That Yellow Bastard, which follows an aging police officer who protects a young woman from a grotesquely disfigured serial killer.","popularity":1993.887,"poster_path":"/eCJkepVJslq1nEtqURLaC1zLPAL.jpg","production_companies":[{"name":"Miramax Films","id":14}],"production_countries":[{"iso_3166_1":"US","name":"United States of America"}],"release_date":"2005-04-01","revenue":158733820,"runtime":124,"spoken_languages":[{"iso_639_1":"en","name":"English"}],"tagline":"There is no justice without sin.","title":"Sin City","vote_average":8.4,"vote_count":59}
+{"adult":false,"backdrop_path":"/hqLNDL7ugQzAbK79uvzjIkmfDN2.jpg","belongs_to_collection":{"id":86311,"name":"The Avengers Theatrical Movie Collection","poster_path":"/hiLkVTP34V24JtzOQ22r7Uu8eMc.jpg","backdrop_path":"/xCbb3hIID1AnEOBxPzsnBXG3n2h.jpg"},"budget":140000000,"genres":[{"id":28,"name":"Action"},{"id":12,"name":"Adventure"},{"id":878,"name":"Science Fiction"},{"id":53,"name":"Thriller"}],"homepage":"http://www.ironmanmovie.com/","id":1726,"imdb_id":"tt0371746","original_title":"Iron Man","overview":"After escaping from kidnappers using makeshift power armor, an ultrarich inventor and weapons maker turns his creation into a force for good by using it to fight crime. But his skills are stretched to the limit when he must face the evil Iron Monger.","popularity":68803.606,"poster_path":"/s2IG9qXfhJYxIttKyroYFBsHwzQ.jpg","production_companies":[{"name":"Marvel Studios","id":420}],"production_countries":[{"iso_3166_1":"US","name":"United States of America"}],"release_date":"2008-05-02","revenue":585174222,"runtime":126,"spoken_languages":[{"iso_639_1":"en","name":"English"}],"tagline":"Heroes aren't born. They're built.","title":"Iron Man","vote_average":8.4,"vote_count":103}

data/test/fixtures/movie_imdb_lookup.txt

@@ -12,4 +12,4 @@ Age: 0
 Via: 1.1 varnish
 X-Cache: MISS
 
-{"adult":false,"backdrop_path":"/kftq445wZNaKEqJ9gXwYOIfI2p1.jpg","belongs_to_collection":{"id":188,"name":"Sin City","poster_path":"/mYxbfd8pZz9YTtEFRaOcQboOvMk.jpg","backdrop_path":"/wyey4NS4Z1z7293R8FFBETL6DSr.jpg"},"budget":40000000,"genres":[{"id":28,"name":"Action"},{"id":80,"name":"Crime"},{"id":18,"name":"Drama"},{"id":53,"name":"Thriller"}],"homepage":"http://www.sincitythemovie.com/","id":187,"imdb_id":"tt0401792","original_title":"Sin City","overview":"Sin City is a neo-noir crime thriller based on Frank Miller's graphic novel series of the same name.The film is primarily based on three of Miller's works: The Hard Goodbye, about a man who embarks on a brutal rampage in search of his one-time sweetheart's killer; The Big Fat Kill, which focuses on a street war between a group of prostitutes and a group of mercenaries; and That Yellow Bastard, which follows an aging police officer who protects a young woman from a grotesquely disfigured serial killer.","popularity":1993.887,"poster_path":"/eCJkepVJslq1nEtqURLaC1zLPAL.jpg","production_companies":[{"name":"Miramax Films","id":14}],"production_countries":[{"iso_3166_1":"US","name":"United States of America"}],"release_date":"2005-04-01","revenue":158733820,"runtime":124,"spoken_languages":[{"iso_639_1":"en","name":"English"}],"tagline":"There is no justice without sin.","title":"Sin City","vote_average":8.4,"vote_count":59}
+{"adult":false,"backdrop_path":"/hqLNDL7ugQzAbK79uvzjIkmfDN2.jpg","belongs_to_collection":{"id":86311,"name":"The Avengers Theatrical Movie Collection","poster_path":"/hiLkVTP34V24JtzOQ22r7Uu8eMc.jpg","backdrop_path":"/xCbb3hIID1AnEOBxPzsnBXG3n2h.jpg"},"budget":140000000,"genres":[{"id":28,"name":"Action"},{"id":12,"name":"Adventure"},{"id":878,"name":"Science Fiction"},{"id":53,"name":"Thriller"}],"homepage":"http://www.ironmanmovie.com/","id":1726,"imdb_id":"tt0371746","original_title":"Iron Man","overview":"After escaping from kidnappers using makeshift power armor, an ultrarich inventor and weapons maker turns his creation into a force for good by using it to fight crime. But his skills are stretched to the limit when he must face the evil Iron Monger.","popularity":68803.606,"poster_path":"/s2IG9qXfhJYxIttKyroYFBsHwzQ.jpg","production_companies":[{"name":"Marvel Studios","id":420}],"production_countries":[{"iso_3166_1":"US","name":"United States of America"}],"release_date":"2008-05-02","revenue":585174222,"runtime":126,"spoken_languages":[{"iso_639_1":"en","name":"English"}],"tagline":"Heroes aren't born. They're built.","title":"Iron Man","vote_average":8.4,"vote_count":103}

data/test/fixtures/movie_posters.txt

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 23 Aug 2010 16:45:21 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: 2542127928 2542059531
+Age: 1000
+Via: 1.1 varnish
+X-Cache: HIT
+
+{"id":49517,"backdrops":[{"file_path":"/4rYvCgyPx8eOEMLSaeuDOPdyQvB.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":8.0,"vote_count":3},{"file_path":"/jFhMjUmxSEh9vKMgHiViEqQCmiM.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":7.5,"vote_count":1},{"file_path":"/lRrYvUwR2vwxR6Fs8PKWIOSVLkp.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":6.75,"vote_count":2},{"file_path":"/97ib91kLwDlyB31pbqPtVYLzr2N.jpg","width":1600,"height":900,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":6.625,"vote_count":4},{"file_path":"/5oS5Qx6yAkdQCzLMXl5BQSCFhBI.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":6.5,"vote_count":5},{"file_path":"/dk6vIA6sWY11YHqIZWVlnp3CUhK.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":6.1,"vote_count":5},{"file_path":"/9M7aadoZIM1Atz3tToDjxJ6EJGa.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":5.833333333333333,"vote_count":6},{"file_path":"/kP09gF5nPu3OTIrhrl2x0w2LUD8.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":5.5,"vote_count":1},{"file_path":"/eDidONF03foKowW6MxJz7LTrLd1.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":5.166666666666667,"vote_count":3},{"file_path":"/68Hkre0dyPaz1FYEHvYWV3HoVM1.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":4.5,"vote_count":2},{"file_path":"/cXrJJLDQLKS5wsMjG4wS00tJ3Dn.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":4.0,"vote_count":1},{"file_path":"/cbcOWRsiMcAXGMxOu6klv4B20mp.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":3.0,"vote_count":1},{"file_path":"/8enB6zxS4ZoOoQ52TveIgJNEnAa.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.5,"vote_count":1},{"file_path":"/i1Kl77Z2Gio4ZEVZOMLjxWhBHtI.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.0,"vote_count":1},{"file_path":"/me1lCjal7vHNN5J0OefN5wmaNpp.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.0,"vote_count":1},{"file_path":"/wCcvWWzFUSQw1dUshp53wd71eKk.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.0,"vote_count":1},{"file_path":"/7mrdovWse6N66LC1XqlvkLsE2sP.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.0,"vote_count":1},{"file_path":"/l7N9SraMyj7MtGacoGnuR0bTJNG.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.0,"vote_count":1},{"file_path":"/eEKCDuZAsnugIBsksNTsPjnvI4x.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":2.0,"vote_count":1},{"file_path":"/4smv3B2gorWogu5ahMJTAjG7QG1.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":1.0,"vote_count":1},{"file_path":"/okvKba6NLBW78K5UT0qtL0wwy4K.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":0.0,"vote_count":0},{"file_path":"/ugaaNPbKF2sQAqzIOhlnSpkNpRx.jpg","width":1280,"height":720,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":0.0,"vote_count":0},{"file_path":"/6y5YQMb38aTNdAi6Li9SWtXm2IG.jpg","width":1920,"height":1080,"iso_639_1":null,"aspect_ratio":1.78,"vote_average":0.0,"vote_count":0}],"posters":[{"file_path":"/2N3P730TYXEcNL0BO8WBuMc6yJz.jpg","width":1000,"height":1500,"iso_639_1":"en","aspect_ratio":0.67,"vote_average":7.5,"vote_count":8},{"file_path":"/xXkkNXJRGEHD0QjPjHgaTtuhbZV.jpg","width":4051,"height":6001,"iso_639_1":"en","aspect_ratio":0.68,"vote_average":7.35,"vote_count":20},{"file_path":"/ggu2lYqxSAObuK82wk1TmEyyWGr.jpg","width":1000,"height":1500,"iso_639_1":"en","aspect_ratio":0.67,"vote_average":6.809523809523809,"vote_count":21},{"file_path":"/u2HlQA0VFeeNBfHesLSPoWZodwe.jpg","width":1131,"height":1600,"iso_639_1":"en","aspect_ratio":0.71,"vote_average":6.690476190476191,"vote_count":21},{"file_path":"/imDQdA47IfWOL13BiRLyDu6Q2b1.jpg","width":800,"height":1200,"iso_639_1":"ru","aspect_ratio":0.67,"vote_average":5.25,"vote_count":4},{"file_path":"/3sjSl5uaNLeIa7fySK5Cz1fF5Fz.jpg","width":1400,"height":2240,"iso_639_1":"en","aspect_ratio":0.63,"vote_average":5.125,"vote_count":8},{"file_path":"/ypCnGGSgIS93aLx0GcL8DPUbTZX.jpg","width":740,"height":1046,"iso_639_1":"de","aspect_ratio":0.71,"vote_average":4.5,"vote_count":3},{"file_path":"/49ohCbedmB4S1IgpN09Fv08B5Bf.jpg","width":420,"height":600,"iso_639_1":"it","aspect_ratio":0.7,"vote_average":4.125,"vote_count":4},{"file_path":"/aADb4oVjxeTujuisL7S25Ge4J0z.jpg","width":1181,"height":1757,"iso_639_1":"pt","aspect_ratio":0.67,"vote_average":3.75,"vote_count":2},{"file_path":"/xSFqKRbhXWMOsbDMqljwntJekue.jpg","width":1012,"height":1500,"iso_639_1":"en","aspect_ratio":0.67,"vote_average":2.4,"vote_count":5},{"file_path":"/t2gAZJuTZGTbMP4ymXyVFVmhh7R.jpg","width":1012,"height":1500,"iso_639_1":"en","aspect_ratio":0.67,"vote_average":2.0,"vote_count":4},{"file_path":"/dVaaL1NwEgKXcmlMxIOab49iuya.jpg","width":1455,"height":2081,"iso_639_1":"hu","aspect_ratio":0.7,"vote_average":1.0,"vote_count":1},{"file_path":"/5rONpcG54LqtDFcLrRrfbeUilto.jpg","width":1013,"height":1500,"iso_639_1":"en","aspect_ratio":0.68,"vote_average":0.5,"vote_count":2},{"file_path":"/1fudfIPnLOFl7jJFsRYbOPisoV6.jpg","width":1500,"height":2000,"iso_639_1":"fr","aspect_ratio":0.75,"vote_average":0.0,"vote_count":0},{"file_path":"/ozKFQ9uCyxqGxeYfJfrwkPq93r9.jpg","width":800,"height":1200,"iso_639_1":"en","aspect_ratio":0.67,"vote_average":0.0,"vote_count":0},{"file_path":"/5msUg8U2S64eFBhaVfziLpnlc2i.jpg","width":423,"height":630,"iso_639_1":"da","aspect_ratio":0.67,"vote_average":0.0,"vote_count":0},{"file_path":"/tHvYtrRU9iORz96GYlxqk98FTSN.jpg","width":458,"height":660,"iso_639_1":"es","aspect_ratio":0.69,"vote_average":0.0,"vote_count":0},{"file_path":"/qwzs6DKqb00aD7GkNbyCEQQ1CES.jpg","width":600,"height":800,"iso_639_1":"fr","aspect_ratio":0.75,"vote_average":0.0,"vote_count":0}]}

data/test/fixtures/movie_releases.txt

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 23 Aug 2010 16:45:21 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: 2542127928 2542059531
+Age: 1000
+Via: 1.1 varnish
+X-Cache: HIT
+
+{"id":49517,"countries":[{"iso_3166_1":"GB","certification":"15","release_date":"2011-09-16"},{"iso_3166_1":"US","certification":"R","release_date":"2011-12-09"},{"iso_3166_1":"IE","certification":"","release_date":"2011-09-16"},{"iso_3166_1":"AU","certification":"","release_date":"2011-10-27"},{"iso_3166_1":"DE","certification":"12","release_date":"2011-11-10"},{"iso_3166_1":"SE","certification":"","release_date":"2011-12-25"},{"iso_3166_1":"FR","certification":"","release_date":"2012-02-08"},{"iso_3166_1":"HU","certification":"16 éven aluliak számára nem ajánlott","release_date":"2012-01-26"},{"iso_3166_1":"CZ","certification":"","release_date":"2012-02-02"},{"iso_3166_1":"PT","certification":"M12","release_date":"2011-12-22"},{"iso_3166_1":"IT","certification":"","release_date":"2011-09-05"},{"iso_3166_1":"AT","certification":"","release_date":"2012-02-02"}]}

data/test/setup/setup_api_key.rb

@@ -2,9 +2,9 @@ begin
   file_path = File.absolute_path('tmdb_api_key.txt', File.dirname(__FILE__))
 
   File.open(file_path) do |file|
-    Tmdb.api_key = file.read
+    Tmdb.api_key = file.read.chomp
   end
 rescue Errno::ENOENT => e
   $stderr.puts "You need place your api key in #{file_path}"
   exit
-end
+end

data/test/setup/url_mocks.rb

@@ -2,27 +2,39 @@ 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 + "search/movie" + ".*")).to_return(file)
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + "/search/movie" + ".*")).to_return(file)
     end
     
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "movie_get_info.txt")) do |file|
-      stub_request(:get, Regexp.new(Tmdb.base_api_url + "movie/" + ".*")).to_return(file)
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + "/movie/" + ".*")).to_return(file)
+    end
+
+    File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "movie_posters.txt")) do |file|
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + '/movie/\d+/images')).to_return(file)
+    end
+
+    File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "movie_releases.txt")) do |file|
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + '/movie/\d+/releases')).to_return(file)
+    end
+
+    File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "movie_casts.txt")) do |file|
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + '/movie/\d+/casts')).to_return(file)
     end
     
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "movie_imdb_lookup.txt")) do |file|
-      stub_request(:get, Regexp.new(Tmdb.base_api_url + "movie/tt" + ".*")).to_return(file)
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + "/movie/tt" + ".*")).to_return(file)
     end
     
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "person_get_info.txt")) do |file|
-      stub_request(:get, Regexp.new(Tmdb.base_api_url + "person/" + ".*")).to_return(file)
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + "/person/" + ".*")).to_return(file)
     end
     
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "person_search.txt")) do |file|
-      stub_request(:get, Regexp.new(Tmdb.base_api_url + "search/person" + ".*")).to_return(file)
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + "/search/person" + ".*")).to_return(file)
     end
     
     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)
+      stub_request(:get, Regexp.new(Tmdb.base_api_url + "/Movie.blarg/" + ".*")).to_return(file)
     end
 
     File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "example_com.txt")) do |file|
@@ -43,4 +55,4 @@ def register_api_url_stubs
     
     stub_request(:get, 'http://thisisaurlthatdoesntexist.co.nz').to_return(:body => "", :status => 404, :headers => {'content-length' => 0})
   end
-end
+end

data/test/unit/tmdb_movie_test.rb

@@ -35,8 +35,8 @@ class TmdbMovieTest < Test::Unit::TestCase
   end
   
   test "find by title should return the full movie data when expand_results set to true" do
-    movie = TmdbMovie.find(:title => "Sin City", :limit => 1, :expand_results => true)
-    assert_movie_methodized(movie, 187)
+    movie = TmdbMovie.find(:title => "Iron Man", :limit => 1, :expand_results => true)
+    assert_movie_methodized(movie, 1726)
   end
   
   test "should raise exception if no arguments supplied to find" do
@@ -105,7 +105,10 @@ class TmdbMovieTest < Test::Unit::TestCase
   end
   
   test "TmdbMovie.new should raise error if supplied with raw data for movie that doesn't exist" do
-    Tmdb.expects(:api_call).with("movie", {id: "999999999999"}, nil).returns(nil)
+    Tmdb.expects(:api_call).with("movie", {id: 999999999999}, nil).returns(nil)
+    Tmdb.expects(:api_call).with("movie/images", {id: 999999999999}, nil).returns(nil)
+    Tmdb.expects(:api_call).with("movie/releases", {id: 999999999999}, nil).returns(nil)
+    Tmdb.expects(:api_call).with("movie/casts", {id: 999999999999}, nil).returns(nil)
     assert_raise ArgumentError do
       TmdbMovie.new({"id" => 999999999999}, true)
     end
@@ -155,4 +158,4 @@ class TmdbMovieTest < Test::Unit::TestCase
       end
     end
 
-end
+end

data/test/unit/tmdb_test.rb

@@ -31,7 +31,7 @@ class TmdbTest < Test::Unit::TestCase
   end
   
   test "should return base API url" do
-    assert_equal "http://api.themoviedb.org/3/", Tmdb.base_api_url
+    assert_equal "http://api.themoviedb.org/3", Tmdb.base_api_url
   end
 
   test "get url returns a response object" do
@@ -48,7 +48,7 @@ class TmdbTest < Test::Unit::TestCase
     method = "search/movie"
     data = "hello"
     Tmdb.default_language = "es"
-    url = Tmdb.base_api_url + method + '?api_key=' + Tmdb.api_key + '&language=' + Tmdb.default_language + '&query=' + CGI::escape(data.to_s)
+    url = Tmdb.base_api_url + '/' + method + '?api_key=' + Tmdb.api_key + '&language=' + Tmdb.default_language + '&query=' + CGI::escape(data.to_s)
     mock_response = stub(:code => "200", :body => '{"page":1,"results":[],"total_pages":0,"total_results":0}')
     Tmdb.expects(:get_url).with(url).returns(mock_response)
     Tmdb.api_call(method, {query: data})
@@ -58,7 +58,7 @@ class TmdbTest < Test::Unit::TestCase
     method = "movie"
     data = "hello"
     language = "blah"
-    url = Tmdb.base_api_url + method + "?api_key=" + Tmdb.api_key + "&language=" + language + '&query=' + CGI::escape(data.to_s)
+    url = Tmdb.base_api_url + '/' + method + "?api_key=" + Tmdb.api_key + "&language=" + language + '&query=' + CGI::escape(data.to_s)
     mock_response = stub(:code => "200", :body => '{"page":1,"results":[],"total_pages":0,"total_results":0}')
     Tmdb.expects(:get_url).with(url).returns(mock_response)
     Tmdb.api_call(method, {query: data}, language)
@@ -92,6 +92,14 @@ class TmdbTest < Test::Unit::TestCase
       assert_not_nil result[item]
     end
   end
+
+  test "should perform movie API call with an action and return a single result" do
+    result = Tmdb.api_call("movie/images", {id: "187"})
+    assert_kind_of Hash, result
+    %w(posters id).each do |item|
+      assert_not_nil result[item]
+    end
+  end
   
   test "should perform Movie.imdbLookup API call and return a single result" do
     result = Tmdb.api_call("movie", {id: "tt0401792"})
@@ -165,9 +173,7 @@ class TmdbTest < Test::Unit::TestCase
     test_data = {
       "backdrops" => [
         {
-          "image" => {
-            :test => 1
-          }
+          :test => 1
         }
       ]
     }
@@ -177,4 +183,4 @@ class TmdbTest < Test::Unit::TestCase
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-tmdb3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepopenstruct
@@ -97,8 +97,11 @@ files:
 - test/fixtures/example_com.txt
 - test/fixtures/image.jpg
 - test/fixtures/incorrect_api_url.txt
+- test/fixtures/movie_casts.txt
 - test/fixtures/movie_get_info.txt
 - test/fixtures/movie_imdb_lookup.txt
+- test/fixtures/movie_posters.txt
+- test/fixtures/movie_releases.txt
 - test/fixtures/movie_search.txt
 - test/fixtures/person_get_info.txt
 - test/fixtures/person_search.txt