ruby-tmdb3 0.3.1 → 0.3.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/ruby-tmdb3/tmdb.rb +1 -1
- data/lib/ruby-tmdb3/tmdb_cast.rb +2 -1
- data/lib/ruby-tmdb3/tmdb_movie.rb +2 -1
- data/ruby-tmdb3.gemspec +2 -2
- data/test/unit/tmdb_cast_test.rb +6 -4
- data/test/unit/tmdb_movie_test.rb +4 -4
- data/test/unit/tmdb_test.rb +0 -10
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.2
|
data/lib/ruby-tmdb3/tmdb.rb
CHANGED
@@ -42,7 +42,7 @@ class Tmdb
|
|
42
42
|
"http://api.themoviedb.org/3"
|
43
43
|
end
|
44
44
|
|
45
|
-
def self.api_call(method, data, language =
|
45
|
+
def self.api_call(method, data, language = nil)
|
46
46
|
raise ArgumentError, "Tmdb.api_key must be set before using the API" if(Tmdb.api_key.nil? || Tmdb.api_key.empty?)
|
47
47
|
raise ArgumentError, "Invalid data." if(data.nil? || (data.class != Hash))
|
48
48
|
|
data/lib/ruby-tmdb3/tmdb_cast.rb
CHANGED
@@ -2,7 +2,8 @@ class TmdbCast
|
|
2
2
|
|
3
3
|
def self.find(options)
|
4
4
|
options = {
|
5
|
-
:expand_results => true
|
5
|
+
:expand_results => true,
|
6
|
+
:language => Tmdb.default_language
|
6
7
|
}.merge(options)
|
7
8
|
|
8
9
|
raise ArgumentError, "At least one of: id, name, should be supplied" if(options[:id].nil? && options[:name].nil?)
|
@@ -2,7 +2,8 @@ class TmdbMovie
|
|
2
2
|
|
3
3
|
def self.find(options)
|
4
4
|
options = {
|
5
|
-
:expand_results => true
|
5
|
+
:expand_results => true,
|
6
|
+
:language => Tmdb.default_language
|
6
7
|
}.merge(options)
|
7
8
|
|
8
9
|
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
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "ruby-tmdb3"
|
8
|
-
s.version = "0.3.
|
8
|
+
s.version = "0.3.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Irio Irineu Musskopf Junior", "Aaron Gough"]
|
12
|
-
s.date = "2012-
|
12
|
+
s.date = "2012-08-20"
|
13
13
|
s.description = "An ActiveRecord-style API wrapper for TheMovieDB.org"
|
14
14
|
s.email = "iirineu@gmail.com"
|
15
15
|
s.extra_rdoc_files = [
|
data/test/unit/tmdb_cast_test.rb
CHANGED
@@ -85,9 +85,11 @@ class TmdbCastTest < Test::Unit::TestCase
|
|
85
85
|
end
|
86
86
|
end
|
87
87
|
|
88
|
-
test "should
|
89
|
-
Tmdb.expects(:api_call).
|
90
|
-
|
88
|
+
test "should pass default language to Tmdb.api_call if language is not supplied" do
|
89
|
+
Tmdb.expects(:api_call).
|
90
|
+
with("person", {id: "1"}, Tmdb.default_language).returns(nil)
|
91
|
+
Tmdb.expects(:api_call).
|
92
|
+
with("search/person", {query: "1"}, Tmdb.default_language).returns(nil)
|
91
93
|
TmdbCast.find(:id => 1, :name => 1)
|
92
94
|
end
|
93
95
|
|
@@ -107,7 +109,7 @@ class TmdbCastTest < Test::Unit::TestCase
|
|
107
109
|
private
|
108
110
|
|
109
111
|
def assert_cast_methodized(actor, cast_id)
|
110
|
-
@cast_data = Tmdb.api_call("person", {id: cast_id.to_s})
|
112
|
+
@cast_data = Tmdb.api_call("person", {id: cast_id.to_s}, Tmdb.default_language)
|
111
113
|
assert_equal @cast_data["adult"], actor.adult
|
112
114
|
assert_equal @cast_data["also_known_as"], actor.also_known_as
|
113
115
|
assert_equal @cast_data["biography"], actor.biography
|
@@ -92,9 +92,9 @@ class TmdbMovieTest < Test::Unit::TestCase
|
|
92
92
|
end
|
93
93
|
end
|
94
94
|
|
95
|
-
test "find should
|
96
|
-
Tmdb.expects(:api_call).with("movie", {id: "1"},
|
97
|
-
Tmdb.expects(:api_call).with("search/movie", {query: "1"},
|
95
|
+
test "find should pass default language to Tmdb.api_call if language is not supplied" do
|
96
|
+
Tmdb.expects(:api_call).with("movie", {id: "1"}, Tmdb.default_language).twice
|
97
|
+
Tmdb.expects(:api_call).with("search/movie", {query: "1"}, Tmdb.default_language)
|
98
98
|
TmdbMovie.find(:id => 1, :imdb => 1, :title => 1)
|
99
99
|
end
|
100
100
|
|
@@ -117,7 +117,7 @@ class TmdbMovieTest < Test::Unit::TestCase
|
|
117
117
|
private
|
118
118
|
|
119
119
|
def assert_movie_methodized(movie, movie_id)
|
120
|
-
@movie_data = Tmdb.api_call("movie", {id: movie_id.to_s})
|
120
|
+
@movie_data = Tmdb.api_call("movie", {id: movie_id.to_s}, Tmdb.default_language)
|
121
121
|
assert_equal @movie_data["adult"], movie.adult
|
122
122
|
assert_equal @movie_data["budget"], movie.budget
|
123
123
|
assert_equal @movie_data["homepage"], movie.homepage
|
data/test/unit/tmdb_test.rb
CHANGED
@@ -44,16 +44,6 @@ class TmdbTest < Test::Unit::TestCase
|
|
44
44
|
assert_equal 404, test_response.code.to_i
|
45
45
|
end
|
46
46
|
|
47
|
-
test "API call without explicit language setting should use default language" do
|
48
|
-
method = "search/movie"
|
49
|
-
data = "hello"
|
50
|
-
Tmdb.default_language = "es"
|
51
|
-
url = Tmdb.base_api_url + '/' + method + '?api_key=' + Tmdb.api_key + '&language=' + Tmdb.default_language + '&query=' + CGI::escape(data.to_s)
|
52
|
-
mock_response = stub(:code => "200", :body => '{"page":1,"results":[],"total_pages":0,"total_results":0}')
|
53
|
-
Tmdb.expects(:get_url).with(url).returns(mock_response)
|
54
|
-
Tmdb.api_call(method, {query: data})
|
55
|
-
end
|
56
|
-
|
57
47
|
test "API call with explicit language setting should override default language" do
|
58
48
|
method = "movie"
|
59
49
|
data = "hello"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ruby-tmdb3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2012-
|
13
|
+
date: 2012-08-20 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: deepopenstruct
|