tmdb_party 0.7.0 → 0.8.0

data/README.rdoc

@@ -39,6 +39,8 @@ It's a movie database, kind of like IMDB except it's more of a community wiki. T
 == Contributors
 Jon Maddox (http://github.com/maddox)
 Magnus Bergmark (http://github.com/Mange)
+Brian Lopez (https://github.com/brianmario)
+Federico Ravasio (https://github.com/razielgn)
 
 == Copyright
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:major: 0
+:minor: 8
 :patch: 0
 :build: 
-:major: 0
-:minor: 7

data/lib/tmdb_party.rb

@@ -15,11 +15,11 @@ module TMDBParty
     
     def initialize(key, lang = 'en')
       @api_key = key
-      @lang = lang
+      @default_lang = lang
     end
     
-    def search(query)
-      data = self.class.get(method_url('Movie.search', query)).parsed_response
+    def search(query, lang = @default_lang)
+      data = self.class.get(method_url('Movie.search', query, lang)).parsed_response
       if data.class != Array || data.first == "Nothing found."
         []
       else
@@ -27,8 +27,8 @@ module TMDBParty
       end
     end
     
-    def search_person(query)
-      data = self.class.get(method_url('Person.search', query)).parsed_response
+    def search_person(query, lang = @default_lang)
+      data = self.class.get(method_url('Person.search', query, lang)).parsed_response
       if data.class != Array || data.first == "Nothing found."
         []
       else
@@ -36,8 +36,8 @@ module TMDBParty
       end
     end
     
-    def imdb_lookup(imdb_id)
-      data = self.class.get(method_url('Movie.imdbLookup', imdb_id)).parsed_response
+    def imdb_lookup(imdb_id, lang = @default_lang)
+      data = self.class.get(method_url('Movie.imdbLookup', imdb_id, lang)).parsed_response
       if data.class != Array || data.first == "Nothing found."
         nil
       else
@@ -45,23 +45,30 @@ module TMDBParty
       end
     end
     
-    def get_info(id)
-      data = self.class.get(method_url('Movie.getInfo', id)).parsed_response
+    def get_info(id, lang = @default_lang)
+      data = self.class.get(method_url('Movie.getInfo', id, lang)).parsed_response
       Movie.new(data.first, self)
     end
     
-    def get_person(id)
-      data = self.class.get(method_url('Person.getInfo', id)).parsed_response
+    def get_person(id, lang = @default_lang)
+      data = self.class.get(method_url('Person.getInfo', id, lang)).parsed_response
       Person.new(data.first, self)
     end
     
+    def get_genres(lang = @default_lang)
+      data = self.class.get(method_url('Genres.getList', nil, lang)).parsed_response
+      data[1..-1].collect { |genre| Genre.new(genre) } # Skips the first, see spec/fixtures/genres_results.json
+    end
+    
     private
       def default_path_items
-        [@lang, 'json', @api_key]
+        ['json', @api_key]
       end
       
-      def method_url(method, value)
-        '/' + ([method] + default_path_items + [URI.escape(value.to_s)]).join('/')
+      def method_url(method, value, lang)
+        url = [method, lang, default_path_items]
+        url << URI.escape(value.to_s) if value
+        '/' + url.join('/')
       end
   end
 end

data/lib/tmdb_party/genre.rb

@@ -1,6 +1,7 @@
 module TMDBParty
   class Genre
     include Attributes
+    attributes :id, :type => Integer
     attributes :name, :url
     
     def initialize(values)

data/spec/fixtures/genres_results.json

@@ -0,0 +1,168 @@
+[{
+    "translated": true
+},
+{
+    "name": "Action",
+    "id": 28,
+    "url": "http://www.themoviedb.org/genre/action"
+},
+{
+    "name": "Adventure",
+    "id": 12,
+    "url": "http://www.themoviedb.org/genre/adventure"
+},
+{
+    "name": "Animation",
+    "id": 16,
+    "url": "http://www.themoviedb.org/genre/animation"
+},
+{
+    "name": "Comedy",
+    "id": 35,
+    "url": "http://www.themoviedb.org/genre/comedy"
+},
+{
+    "name": "Crime",
+    "id": 80,
+    "url": "http://www.themoviedb.org/genre/crime"
+},
+{
+    "name": "Disaster",
+    "id": 105,
+    "url": "http://www.themoviedb.org/genre/disaster"
+},
+{
+    "name": "Documentary",
+    "id": 99,
+    "url": "http://www.themoviedb.org/genre/documentary"
+},
+{
+    "name": "Drama",
+    "id": 18,
+    "url": "http://www.themoviedb.org/genre/drama"
+},
+{
+    "name": "Eastern",
+    "id": 82,
+    "url": "http://www.themoviedb.org/genre/eastern"
+},
+{
+    "name": "Erotic",
+    "id": 2916,
+    "url": "http://www.themoviedb.org/genre/erotic"
+},
+{
+    "name": "Family",
+    "id": 10751,
+    "url": "http://www.themoviedb.org/genre/family"
+},
+{
+    "name": "Fan Film",
+    "id": 10750,
+    "url": "http://www.themoviedb.org/genre/fan-film"
+},
+{
+    "name": "Fantasy",
+    "id": 14,
+    "url": "http://www.themoviedb.org/genre/fantasy"
+},
+{
+    "name": "Film Noir",
+    "id": 10753,
+    "url": "http://www.themoviedb.org/genre/film-noir"
+},
+{
+    "name": "History",
+    "id": 36,
+    "url": "http://www.themoviedb.org/genre/history"
+},
+{
+    "name": "Holiday",
+    "id": 10595,
+    "url": "http://www.themoviedb.org/genre/holiday"
+},
+{
+    "name": "Horror",
+    "id": 27,
+    "url": "http://www.themoviedb.org/genre/horror"
+},
+{
+    "name": "Indie",
+    "id": 10756,
+    "url": "http://www.themoviedb.org/genre/indie"
+},
+{
+    "name": "Music",
+    "id": 10402,
+    "url": "http://www.themoviedb.org/genre/music"
+},
+{
+    "name": "Musical",
+    "id": 22,
+    "url": "http://www.themoviedb.org/genre/musical"
+},
+{
+    "name": "Mystery",
+    "id": 9648,
+    "url": "http://www.themoviedb.org/genre/mystery"
+},
+{
+    "name": "Neo-noir",
+    "id": 10754,
+    "url": "http://www.themoviedb.org/genre/neo-noir"
+},
+{
+    "name": "Road Movie",
+    "id": 1115,
+    "url": "http://www.themoviedb.org/genre/road-movie"
+},
+{
+    "name": "Romance",
+    "id": 10749,
+    "url": "http://www.themoviedb.org/genre/romance"
+},
+{
+    "name": "Science Fiction",
+    "id": 878,
+    "url": "http://www.themoviedb.org/genre/science-fiction"
+},
+{
+    "name": "Short",
+    "id": 10755,
+    "url": "http://www.themoviedb.org/genre/short"
+},
+{
+    "name": "Sport",
+    "id": 9805,
+    "url": "http://www.themoviedb.org/genre/sport"
+},
+{
+    "name": "Sporting Event",
+    "id": 10758,
+    "url": "http://www.themoviedb.org/genre/sporting-event"
+},
+{
+    "name": "Sports Film",
+    "id": 10757,
+    "url": "http://www.themoviedb.org/genre/sports-film"
+},
+{
+    "name": "Suspense",
+    "id": 10748,
+    "url": "http://www.themoviedb.org/genre/suspense"
+},
+{
+    "name": "Thriller",
+    "id": 53,
+    "url": "http://www.themoviedb.org/genre/thriller"
+},
+{
+    "name": "War",
+    "id": 10752,
+    "url": "http://www.themoviedb.org/genre/war"
+},
+{
+    "name": "Western",
+    "id": 37,
+    "url": "http://www.themoviedb.org/genre/western"
+}]

data/spec/lib/tmdb_party/genre_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe TMDBParty::Genre do
+  let :genre do
+    { "name" => "Action", "id" => 28, "url" => "http://www.themoviedb.org/genre/action" }
+  end
+  
+  it "should have a name" do
+    TMDBParty::Genre.new(genre).name.should == 'Action'
+  end
+  
+  it "should have a url" do
+    TMDBParty::Genre.new(genre).url.should == 'http://www.themoviedb.org/genre/action'
+  end
+  
+  it "should have an id" do
+    TMDBParty::Genre.new(genre).id.should == 28
+  end
+  
+  it ".parse should return an array" do
+    TMDBParty::Genre.parse(genre).should be_instance_of(Array)
+    TMDBParty::Genre.parse(genre).first.should be_instance_of(TMDBParty::Genre)
+  end
+end

data/spec/lib/tmdb_party_spec.rb

@@ -29,7 +29,7 @@ describe TMDBParty::Base do
       stub_get('/Movie.search/en/json/key/Transformers', 'shitty_shit_result.json')
       stub_get('/Movie.search/sv/json/key/Transformers', 'search.json')
       
-      TMDBParty::Base.new('key', 'sv').search('Transformers').should have(5).movies
+      tmdb.search('Transformers', 'sv').should have(5).movies
     end
   end
   
@@ -48,7 +48,7 @@ describe TMDBParty::Base do
       stub_get('/Movie.imdbLookup/en/json/key/tt0418279', 'shitty_shit_result.json')
       stub_get('/Movie.imdbLookup/sv/json/key/tt0418279', 'imdb_search.json')
       
-      TMDBParty::Base.new('key', 'sv').imdb_lookup('tt0418279').should_not be_nil
+      tmdb.imdb_lookup('tt0418279', 'sv').should_not be_nil
     end
   end
   
@@ -62,7 +62,7 @@ describe TMDBParty::Base do
       stub_get('/Movie.getInfo/en/json/key/1858', 'shitty_shit_result.json')
       stub_get('/Movie.getInfo/sv/json/key/1858', 'transformers.json')
       
-      TMDBParty::Base.new('key', 'sv').get_info(1858).should_not be_nil
+      tmdb.get_info(1858, 'sv').should_not be_nil
     end
   end
   
@@ -82,7 +82,7 @@ describe TMDBParty::Base do
       stub_get('/Person.search/en/json/key/Megan%20Fox', 'shitty_shit_result.json')
       stub_get('/Person.search/sv/json/key/Megan%20Fox', 'search_person.json')
       
-      TMDBParty::Base.new('key', 'sv').search_person('Megan Fox').should have(1).movie
+      tmdb.search_person('Megan Fox', 'sv').should have(1).movie
     end
   end
   
@@ -96,8 +96,22 @@ describe TMDBParty::Base do
       stub_get('/Person.getInfo/en/json/key/19537', 'shitty_shit_result.json')
       stub_get('/Person.getInfo/sv/json/key/19537', 'megan_fox.json')
       
-      TMDBParty::Base.new('key', 'sv').get_person(19537).name.should == 'Megan Fox'
+      tmdb.get_person(19537, 'sv').name.should == 'Megan Fox'
     end
   end
   
+  describe "#get_genres" do
+    it "should return instances of Genre" do
+      stub_get('/Genres.getList/en/json/key', 'genres_results.json')
+      tmdb.get_genres.should have(33).genre
+      tmdb.get_genres.first.should be_instance_of(TMDBParty::Genre)
+    end
+    
+    it "should use the preferred language" do
+      stub_get('/Genres.getList/en/json/key', 'shitty_shit_result.json')
+      stub_get('/Genres.getList/sv/json/key', 'genres_results.json')
+      
+      tmdb.get_genres('sv').first.name.should == 'Action'
+    end
+  end
 end

data/tmdb_party.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmdb_party}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Duff", "Jon Maddox"]
-  s.date = %q{2011-01-15}
+  s.date = %q{2011-01-29}
   s.email = %q{duff.john@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/tmdb_party/person.rb",
     "lib/tmdb_party/studio.rb",
     "lib/tmdb_party/video.rb",
+    "spec/fixtures/genres_results.json",
     "spec/fixtures/imdb_no_results.json",
     "spec/fixtures/imdb_search.json",
     "spec/fixtures/megan_fox.json",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/transformers.json",
     "spec/lib/tmdb_party/cast_member_spec.rb",
     "spec/lib/tmdb_party/country_spec.rb",
+    "spec/lib/tmdb_party/genre_spec.rb",
     "spec/lib/tmdb_party/image_spec.rb",
     "spec/lib/tmdb_party/movie_spec.rb",
     "spec/lib/tmdb_party/person_spec.rb",
@@ -64,6 +66,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/lib/tmdb_party/cast_member_spec.rb",
     "spec/lib/tmdb_party/country_spec.rb",
+    "spec/lib/tmdb_party/genre_spec.rb",
     "spec/lib/tmdb_party/image_spec.rb",
     "spec/lib/tmdb_party/movie_spec.rb",
     "spec/lib/tmdb_party/person_spec.rb",

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tmdb_party
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - John Duff
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-01-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 6
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -91,6 +87,7 @@ files:
 - lib/tmdb_party/person.rb
 - lib/tmdb_party/studio.rb
 - lib/tmdb_party/video.rb
+- spec/fixtures/genres_results.json
 - spec/fixtures/imdb_no_results.json
 - spec/fixtures/imdb_search.json
 - spec/fixtures/megan_fox.json
@@ -104,6 +101,7 @@ files:
 - spec/fixtures/transformers.json
 - spec/lib/tmdb_party/cast_member_spec.rb
 - spec/lib/tmdb_party/country_spec.rb
+- spec/lib/tmdb_party/genre_spec.rb
 - spec/lib/tmdb_party/image_spec.rb
 - spec/lib/tmdb_party/movie_spec.rb
 - spec/lib/tmdb_party/person_spec.rb
@@ -127,7 +125,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -136,7 +133,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -150,6 +146,7 @@ summary: Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/do
 test_files: 
 - spec/lib/tmdb_party/cast_member_spec.rb
 - spec/lib/tmdb_party/country_spec.rb
+- spec/lib/tmdb_party/genre_spec.rb
 - spec/lib/tmdb_party/image_spec.rb
 - spec/lib/tmdb_party/movie_spec.rb
 - spec/lib/tmdb_party/person_spec.rb