tmdb_party 0.3.1 → 0.4.0

data/README.rdoc

@@ -3,7 +3,7 @@
 Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/docs/) using HTTParty
 
 = usage:
-  sudo gem install jduff-tmdb_party
+  sudo gem install tmdb_party -s http://gemcutter.org
   require 'tmdb_party'
 
 = example:
@@ -20,7 +20,7 @@ Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/docs/) usin
     # => 31
   transformers.score
     # => 1.0
-  transformers.imdb
+  transformers.imdb_id
     # => 'tt0418279'
 
   # some attributes don't come back with the search result, they are lazily loaded on demand
@@ -29,7 +29,7 @@ Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/docs/) usin
   transformers.trailer.url
     # => "http://www.youtube.com/watch?v=eduwcuq1Exg"
 
-  transformers.categories.collect{|cat| cat.name}.include?("Adventure Film")
+  transformers.genres.collect{|cat| cat.name}.include?("Adventure")
     # => true
 
 = what is themoviedb.org?

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 0
 :major: 0
-:minor: 3
-:patch: 1
+:minor: 4

data/lib/tmdb_party/attributes.rb

@@ -22,7 +22,6 @@ module TMDBParty
       def attribute(name, options)
         options.replace({:type => 'nil', :lazy=>false}.merge(options))
         raise "Name can't be empty" if name.blank?
-
         lazy_load = "self.#{options[:lazy]} unless self.loaded?" if options[:lazy]
         class_eval <<-EOS
   def #{name}

data/lib/tmdb_party/genre.rb

@@ -0,0 +1,21 @@
+module TMDBParty
+  class Genre
+    include Attributes
+    attributes :name, :url
+    
+    def initialize(values)
+      self.attributes = values
+    end
+    
+    def self.parse(data)
+      return unless data
+      if data.is_a?(Array)
+        data.collect do |g|
+          Genre.new(g)
+        end
+      else
+        [Genre.new(data)]
+      end
+    end
+  end
+end

data/lib/tmdb_party/image.rb

@@ -1,18 +1,23 @@
 module TMDBParty
   class Image
-    attr_reader :url
+    attr_reader :url, :type, :size
     
-    def initialize(url)
-      @url = url
+    def initialize(options={})
+      @url = options["url"]
+      @type = options["type"]
+      @size = options["size"]
     end
     
     def self.parse(data)
+      puts data.inspect
+      puts
+      puts
       if data.is_a?(Array)
-        data.collect do |url|
-          Image.new(url)
+        data.collect do |image|
+          Image.new(image["image"])
         end
       else
-        Image.new(data)
+        Image.new(image["image"])
       end
     end
   end

data/lib/tmdb_party/movie.rb

@@ -3,16 +3,20 @@ module TMDBParty
     include Attributes
     attr_reader :tmdb
     
-    attributes :title, :short_overview, :id, :score, :imdb, :type, :url, :popularity, :alternative_title
-    attributes :release, :type=>DateTime
-    attributes :id, :runtime, :type => Integer
+    attributes :name, :overview, :id, :score, :imdb_id, :movie_type, :url, :popularity, :alternative_title
+    attributes :released
+    attributes :id, :type => Integer
     attributes :popularity, :score, :type => Float
-    attributes :poster, :backdrop, :type => Image
     
+    attributes :posters, :backdrops, :lazy => :get_info!
     attributes :homepage, :lazy => :get_info!
-    attributes :trailer, :lazy => :get_info!, :type=> Video
-    attributes :categories, :lazy => :get_info!, :type=> Category
-    attributes :people, :lazy => :get_info!, :type=> Person
+    attributes :trailer, :lazy => :get_info!
+    attributes :runtime, :lazy => :get_info!, :type => Integer
+    attributes :genres, :lazy => :get_info!, :type => Genre
+    attributes :cast, :lazy => :get_info!, :type => Person
+    
+    alias_method :flattened_posters, :posters
+    alias_method :flattened_backdrops, :backdrops
     
     def initialize(values, tmdb)
       @tmdb = tmdb
@@ -26,23 +30,44 @@ module TMDBParty
     end
 
     def directors
-      find_people('director')
+      find_cast('Director')
     end
 
     def actors
-      find_people('actor')
+      find_cast('Actor')
     end
 
     def writers
-      find_people('writer')
+      find_cast('Writer')
+    end
+    
+    def posters
+      process_art(flattened_posters)
+    end
+
+    def backdrops
+      process_art(flattened_backdrops)
     end
     
     
     private
     
-    def find_people(type)
-      return [] unless people
-      people.select{|p| p.job == type}
+    def process_art(art)
+      image_groups = {}
+      art.each do |image_hash|
+        the_image = image_hash["image"]
+        if image_groups[the_image["id"]]
+          image_groups[the_image["id"]][the_image["size"]] = the_image["url"]
+        else
+          image_groups[the_image["id"]] = {the_image["size"] => the_image["url"]}
+        end
+      end
+      image_groups.values
+    end
+    
+    def find_cast(type)
+      return [] unless cast
+      guys = cast.select{|c| c.job == type}
     end
 
   end

data/lib/tmdb_party/person.rb

@@ -9,7 +9,6 @@ module TMDBParty
     
     def self.parse(data)
       return unless data
-      data = data["person"]
       if data.is_a?(Array)
         data.collect do |person|
           Person.new(person)

data/lib/tmdb_party.rb

@@ -4,7 +4,7 @@ require 'tmdb_party/core_extensions'
 require 'tmdb_party/httparty_icebox'
 require 'tmdb_party/attributes'
 require 'tmdb_party/video'
-require 'tmdb_party/category'
+require 'tmdb_party/genre'
 require 'tmdb_party/person'
 require 'tmdb_party/image'
 require 'tmdb_party/movie'
@@ -15,39 +15,40 @@ module TMDBParty
     include HTTParty::Icebox
     cache :store => 'file', :timeout => 120, :location => Dir.tmpdir
 
-    base_uri 'http://api.themoviedb.org/2.0'
-    format :xml
+    base_uri 'http://api.themoviedb.org/2.1'
+    format :json
     
     def initialize(key)
-      self.class.default_params :api_key => key
+      @api_key = key
+    end
+    
+    def default_path_items
+      path_items = ['en']
+      path_items << 'json'
+      path_items << @api_key
     end
     
     def search(query)
-      data = self.class.get('/Movie.search', :query=>{:title=>query})
-      
-      case data['results']['moviematches']['movie']
-      when Array
-        data['results']['moviematches']['movie'].collect { |movie| Movie.new(movie, self) }
-      when Hash
-        [Movie.new(data['results']['moviematches']['movie'], self)]
-      else
+      data = self.class.get("/Movie.search/" + default_path_items.join('/') + '/' + URI.escape(query))
+      if data.first == "Nothing found."
         []
+      else
+        data.collect { |movie| Movie.new(movie, self) }
       end
     end
     
     def imdb_lookup(imdb_id)
-      data = self.class.get('/Movie.imdbLookup', :query=>{:imdb_id=>imdb_id})
-      case data['results']['moviematches']['movie']
-      when String
-        return nil
-      when Hash
-        Movie.new(data['results']['moviematches']['movie'], self)
+      data = self.class.get("/Movie.imdbLookup/" + default_path_items.join('/') + '/' + imdb_id)
+      if data.first == "Nothing found."
+        nil
+      else
+        Movie.new(data.first, self)
       end
     end
     
     def get_info(id)
-      data = self.class.get('/Movie.getInfo', :query=>{:id=>id})
-      Movie.new(data['results']['moviematches']['movie'], self)
+      data = self.class.get("/Movie.getInfo/" + default_path_items.join('/') + '/' + id.to_s)
+      Movie.new(data.first, self)
     end
   end
 end

data/test/fixtures/imdb_no_results.json

@@ -0,0 +1 @@
+["Nothing found."]