themoviedb-api 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14edf0a2a2427cd9a7328e8aea3d31a87583ac15
-  data.tar.gz: fe1022c42327fa44e4472bd1be859d93916b1f43
+  metadata.gz: 2aba6c94c6369309248ddeed88a7f4a9b74f9500
+  data.tar.gz: 8f23a1ed62c018889f8c1eb8d091b5853f4796f3
 SHA512:
-  metadata.gz: db74bcb88901c2e8a540f8f76f64aa3fe574acb62ddfa1538044bf8b85098aa63da87090ee3f99f8836d1928c320053bd66313fc3a0245a480a7533eaebb355b
-  data.tar.gz: 3a82e3150b2876c01fc929955a9a793e485e094fb773b4c0f9ec56352b16906f05d401096298330ae04d7b326b3735874137d0cd49f2c693552a5d8c52a58a43
+  metadata.gz: f217055c0600582e588bf59f303b5e474e15c007fd2bbd5bd2fec7db1188094402b8e7028d0abb722422023eef54fbb0d87a202245b1ea0d767ae652e5aa8cdc
+  data.tar.gz: fb67bd6ae1a0e97b0a7fe8714c71c59d50975ce7da1d3a474fbebb97948d93c341aa6e6f8ca71312bb5925e6599a2cea530578b0e9657bd6185bb6b55b2d0304

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.4 (2016-01-11)
+
+Improvement:
+
+  - Tmdb::Search methods now return correct Tmdb::Result objects
+
 ## 1.0.3 (2015-09-29)
 
 Improvement:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    themoviedb-api (1.0.3)
+    themoviedb-api (1.0.4)
       httparty (~> 0.13.7, >= 0.13.7)
 
 GEM
@@ -79,4 +79,4 @@ DEPENDENCIES
   webmock (~> 1.21.0, >= 1.21.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/tmdb.rb

@@ -35,6 +35,7 @@ require 'tmdb/person'
 require 'tmdb/poster'
 require 'tmdb/rating'
 require 'tmdb/release'
+require 'tmdb/result'
 require 'tmdb/review'
 require 'tmdb/search'
 require 'tmdb/translation'

data/lib/tmdb/result.rb

@@ -0,0 +1,4 @@
+module Tmdb
+  class Result < Struct
+  end
+end

data/lib/tmdb/search.rb

@@ -4,59 +4,107 @@ module Tmdb
     def self.company(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/company', filters).get
-      Company.new(result)
+      get_result = Resource.new('/search/company', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        Company.new(movie)
+      end
+
+      result
     end
 
     def self.collection(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/collection', filters).get
-      Collection.new(result)
+      get_result = Resource.new('/search/collection', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        Collection.new(movie)
+      end
+
+      result
     end
 
     def self.keyword(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/keyword', filters).get
-      Keyword.new(result)
+      get_result = Resource.new('/search/keyword', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        Keyword.new(movie)
+      end
+
+      result
     end
 
     def self.list(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/list', filters).get
-      Tmdb::List.new(result)
+      get_result = Resource.new('/search/list', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        Tmdb::List.new(movie)
+      end
+
+      result
     end
 
     def self.movie(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/movie', filters).get
-      Movie.new(result)
+      get_result = Resource.new('/search/movie', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        Movie.new(movie)
+      end
+
+      result
     end
 
     def self.multi(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/multi', filters).get
-      Multi.new(result)
+      get_result = Resource.new('/search/multi', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        Multi.new(movie)
+      end
+
+      result
     end
 
     def self.person(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/person', filters).get
-      person = Person.new(result)
-      person.convert_known_for_multiple!
-      person
+      get_result = Resource.new('/search/person', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        person = Person.new(movie)
+        person.convert_known_for!
+        person
+      end
+
+      result
     end
 
     def self.tv(query, filters={})
       filters.merge!(query: clean_query_param(query))
 
-      result = Resource.new('/search/tv', filters).get
-      TV.new(result)
+      get_result = Resource.new('/search/tv', filters).get
+
+      result = Result.new(get_result.except('results'))
+      result.results = get_result['results'].map do |movie|
+        TV.new(movie)
+      end
+
+      result
     end
 
     def self.clean_query_param(query)

data/lib/tmdb/version.rb

@@ -1,3 +1,3 @@
 module Tmdb
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/search_spec.rb

@@ -34,7 +34,7 @@ describe Tmdb::Search do
 
     subject { company }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::Company) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::Company' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::Company)
@@ -50,7 +50,7 @@ describe Tmdb::Search do
 
     subject { collection }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::Collection) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::Collection' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::Collection)
@@ -66,7 +66,7 @@ describe Tmdb::Search do
 
     subject { keyword }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::Keyword) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::Keyword' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::Keyword)
@@ -82,7 +82,7 @@ describe Tmdb::Search do
 
     subject { list }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::List) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::List' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::List)
@@ -98,7 +98,7 @@ describe Tmdb::Search do
 
     subject { movie }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::Movie) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::Movie' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::Movie)
@@ -114,7 +114,7 @@ describe Tmdb::Search do
 
     subject { multi }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::Multi) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::Multi' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::Multi)
@@ -130,7 +130,7 @@ describe Tmdb::Search do
 
     subject { person }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::Person) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::Person' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::Person)
@@ -151,7 +151,7 @@ describe Tmdb::Search do
 
     subject { tv }
 
-    it { expect(subject).to be_an_instance_of(Tmdb::TV) }
+    it { expect(subject).to be_an_instance_of(Tmdb::Result) }
 
     it 'should have results of kind Tmdb::TV' do
       expect(subject.results.sample).to be_an_instance_of(Tmdb::TV)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: themoviedb-api
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - 18Months
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -200,6 +200,7 @@ files:
 - lib/tmdb/rating.rb
 - lib/tmdb/release.rb
 - lib/tmdb/resource.rb
+- lib/tmdb/result.rb
 - lib/tmdb/review.rb
 - lib/tmdb/search.rb
 - lib/tmdb/struct.rb