ruby-tmdb3 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/ruby-tmdb3/tmdb.rb

@@ -42,7 +42,7 @@ class Tmdb
     "http://api.themoviedb.org/3"
   end
   
-  def self.api_call(method, data, language = @@default_language)
+  def self.api_call(method, data, language = nil)
     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))
 

data/lib/ruby-tmdb3/tmdb_cast.rb

@@ -2,7 +2,8 @@ class TmdbCast
 
   def self.find(options)
     options = {
-      :expand_results => true
+      :expand_results => true,
+      :language       => Tmdb.default_language
     }.merge(options)
   
     raise ArgumentError, "At least one of: id, name, should be supplied" if(options[:id].nil? && options[:name].nil?)

data/lib/ruby-tmdb3/tmdb_movie.rb

@@ -2,7 +2,8 @@ class TmdbMovie
   
   def self.find(options)
     options = {
-      :expand_results => true
+      :expand_results => true,
+      :language       => Tmdb.default_language
     }.merge(options)
     
     raise ArgumentError, "At least one of: id, title, imdb should be supplied" if(options[:id].nil? && options[:title].nil? && options[:imdb].nil?)

data/ruby-tmdb3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-tmdb3"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   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-07-11"
+  s.date = "2012-08-20"
   s.description = "An ActiveRecord-style API wrapper for TheMovieDB.org"
   s.email = "iirineu@gmail.com"
   s.extra_rdoc_files = [

data/test/unit/tmdb_cast_test.rb

@@ -85,9 +85,11 @@ class TmdbCastTest < Test::Unit::TestCase
     end
   end
 
-  test "should not pass language to Tmdb.api_call if language is not supplied" do
-    Tmdb.expects(:api_call).with("person", {id: "1"}, nil).returns(nil)
-    Tmdb.expects(:api_call).with("search/person", {query: "1"}, nil).returns(nil)
+  test "should pass default language to Tmdb.api_call if language is not supplied" do
+    Tmdb.expects(:api_call).
+      with("person", {id: "1"}, Tmdb.default_language).returns(nil)
+    Tmdb.expects(:api_call).
+      with("search/person", {query: "1"}, Tmdb.default_language).returns(nil)
     TmdbCast.find(:id => 1, :name => 1)
   end
 
@@ -107,7 +109,7 @@ class TmdbCastTest < Test::Unit::TestCase
   private
   
     def assert_cast_methodized(actor, cast_id)
-      @cast_data = Tmdb.api_call("person", {id: cast_id.to_s})
+      @cast_data = Tmdb.api_call("person", {id: cast_id.to_s}, Tmdb.default_language)
       assert_equal @cast_data["adult"], actor.adult
       assert_equal @cast_data["also_known_as"], actor.also_known_as
       assert_equal @cast_data["biography"], actor.biography

data/test/unit/tmdb_movie_test.rb

@@ -92,9 +92,9 @@ class TmdbMovieTest < Test::Unit::TestCase
     end
   end
   
-  test "find should not pass language to Tmdb.api_call if language is not supplied" do
-    Tmdb.expects(:api_call).with("movie", {id: "1"}, nil).twice
-    Tmdb.expects(:api_call).with("search/movie", {query: "1"}, nil)
+  test "find should pass default language to Tmdb.api_call if language is not supplied" do
+    Tmdb.expects(:api_call).with("movie", {id: "1"}, Tmdb.default_language).twice
+    Tmdb.expects(:api_call).with("search/movie", {query: "1"}, Tmdb.default_language)
     TmdbMovie.find(:id => 1, :imdb => 1, :title => 1)
   end
   
@@ -117,7 +117,7 @@ class TmdbMovieTest < Test::Unit::TestCase
   private
     
     def assert_movie_methodized(movie, movie_id)
-      @movie_data = Tmdb.api_call("movie", {id: movie_id.to_s})
+      @movie_data = Tmdb.api_call("movie", {id: movie_id.to_s}, Tmdb.default_language)
       assert_equal @movie_data["adult"], movie.adult
       assert_equal @movie_data["budget"], movie.budget
       assert_equal @movie_data["homepage"], movie.homepage

data/test/unit/tmdb_test.rb

@@ -44,16 +44,6 @@ class TmdbTest < Test::Unit::TestCase
     assert_equal 404, test_response.code.to_i
   end
   
-  test "API call without explicit language setting should use default language" do
-    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)
-    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})
-  end
-  
   test "API call with explicit language setting should override default language" do
     method = "movie"
     data = "hello"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-tmdb3
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepopenstruct