tmdb_party 0.4.1 → 0.5.0

data/README.rdoc

@@ -4,6 +4,7 @@ Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/docs/) usin
 
 = usage:
   sudo gem install tmdb_party -s http://gemcutter.org
+  require 'rubygems'
   require 'tmdb_party'
 
 = example:
@@ -14,7 +15,7 @@ Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/docs/) usin
   results.length
     # => 5
 
-  transformers = results.detect{|m| m.title == "Transformers"}
+  transformers = results.detect{|m| m.name == "Transformers"}
 
   transformers.popularity
     # => 31
@@ -37,6 +38,7 @@ 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)
 
 == Copyright
 

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.add_dependency('httparty', '>= 0.4.3')
     
     gem.add_development_dependency('fakeweb')
-    gem.add_development_dependency('context')
+    gem.add_development_dependency('rspec')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -20,28 +20,18 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+desc "Run all examples"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new('rcov') do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rcov = true
 end
 
-
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -57,4 +47,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/VERSION.yml

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

data/lib/tmdb_party.rb

@@ -1,13 +1,9 @@
 # gem 'httparty'
 require 'httparty'
-require 'tmdb_party/core_extensions'
-require 'tmdb_party/httparty_icebox'
-require 'tmdb_party/attributes'
-require 'tmdb_party/video'
-require 'tmdb_party/genre'
-require 'tmdb_party/person'
-require 'tmdb_party/image'
-require 'tmdb_party/movie'
+
+%w[core_extensions httparty_icebox attributes video genre person image country studio cast_member movie].each do |class_name|
+  require "tmdb_party/#{class_name}"
+end
 
 module TMDBParty
   class Base
@@ -18,18 +14,13 @@ module TMDBParty
     base_uri 'http://api.themoviedb.org/2.1'
     format :json
     
-    def initialize(key)
+    def initialize(key, lang = 'en')
       @api_key = key
-    end
-    
-    def default_path_items
-      path_items = ['en']
-      path_items << 'json'
-      path_items << @api_key
+      @lang = lang
     end
     
     def search(query)
-      data = self.class.get("/Movie.search/" + default_path_items.join('/') + '/' + URI.escape(query))
+      data = self.class.get(method_url('Movie.search', query))
       if data.class != Array || data.first == "Nothing found."
         []
       else
@@ -37,8 +28,17 @@ module TMDBParty
       end
     end
     
+    def search_person(query)
+      data = self.class.get(method_url('Person.search', query))
+      if data.class != Array || data.first == "Nothing found."
+        []
+      else
+        data.collect { |person| Person.new(person, self) }
+      end
+    end
+    
     def imdb_lookup(imdb_id)
-      data = self.class.get("/Movie.imdbLookup/" + default_path_items.join('/') + '/' + imdb_id)
+      data = self.class.get(method_url('Movie.imdbLookup', imdb_id))
       if data.class != Array || data.first == "Nothing found."
         nil
       else
@@ -47,8 +47,22 @@ module TMDBParty
     end
     
     def get_info(id)
-      data = self.class.get("/Movie.getInfo/" + default_path_items.join('/') + '/' + id.to_s)
+      data = self.class.get(method_url('Movie.getInfo', id))
       Movie.new(data.first, self)
     end
+    
+    def get_person(id)
+      data = self.class.get(method_url('Person.getInfo', id))
+      Person.new(data.first, self)
+    end
+    
+    private
+      def default_path_items
+        [@lang, 'json', @api_key]
+      end
+      
+      def method_url(method, value)
+        '/' + ([method] + default_path_items + [URI.escape(value.to_s)]).join('/')
+      end
   end
 end

data/lib/tmdb_party/attributes.rb

@@ -20,15 +20,14 @@ module TMDBParty
       end
 
       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}
-    #{lazy_load}
-    @#{name} ||= decode_raw_attribute(@attributes['#{name}'], #{options[:type]}) if @attributes
-  end
-  EOS
+        options = {:type => 'nil', :lazy => false}.merge(options)
+        raise ArgumentError, "Name can't be empty" if name.blank?
+        
+        class_eval <<-EVAL
+          def #{name}
+            read_or_load_attribute('#{name}', #{options[:type]}, #{options[:lazy].inspect})
+          end
+        EVAL
       end
 
     end
@@ -43,10 +42,27 @@ module TMDBParty
       end
 
       private
-      def decode_raw_attribute(value, type)
-        return nil unless value
-        type.respond_to?(:parse) ? type.parse(value) : value
-      end
+        def read_or_load_attribute(name, type, lazy_method)
+          if lazy_method.is_a?(Symbol) and raw_attribute_missing?(name) and not loaded?
+            self.send(lazy_method)
+          end
+          read_attribute(name, type)
+        end
+        
+        def read_attribute(name, type = nil)
+          @attributes_cache ||= {}
+          @attributes_cache[name] ||= decode_raw_attribute(@attributes[name], type) if @attributes
+        end
+        
+        def raw_attribute_missing?(name)
+          not @attributes.has_key?(name.to_s)
+        end
+        
+        def decode_raw_attribute(value, type)
+          return nil unless value
+          type.respond_to?(:parse) ? type.parse(value) : value
+        end
+        
     end
   end
 end

data/lib/tmdb_party/cast_member.rb

@@ -0,0 +1,36 @@
+module TMDBParty
+  class CastMember
+    include Attributes
+    attr_reader :tmdb
+    attributes :name, :url, :job, :department
+    attributes :id, :type => Integer
+    
+    def initialize(values, tmdb)
+      @tmdb = tmdb
+      self.attributes = values
+    end
+    
+    def character_name
+      read_attribute('character')
+    end
+    
+    def image_url
+      read_attribute('profile')
+    end
+    
+    def person
+      tmdb.get_person(id)
+    end
+    
+    def self.parse(data, tmdb)
+      return unless data
+      if data.is_a?(Array)
+        data.collect do |person|
+          CastMember.new(person, tmdb)
+        end
+      else
+        [CastMember.new(data, tmdb)]
+      end
+    end
+  end
+end

data/lib/tmdb_party/country.rb

@@ -0,0 +1,25 @@
+module TMDBParty
+  class Country
+    include Attributes
+    attributes :name, :code, :url
+    alias_method :code_string, :code
+    
+    def self.parse(data)
+      return unless data
+      if data.is_a?(Array)
+        data.map { |row| Country.new(row) }
+      else
+        [Country.new(data)]
+      end
+    end
+    
+    def initialize(attributes)
+      self.attributes = attributes
+    end
+    
+    def code
+      code_string.downcase.to_sym
+    end
+    
+  end
+end

data/lib/tmdb_party/image.rb

@@ -1,24 +1,49 @@
 module TMDBParty
   class Image
-    attr_reader :url, :type, :size
+    def initialize(attributes)
+      @attributes = attributes
+    end
     
-    def initialize(options={})
-      @url = options["url"]
-      @type = options["type"]
-      @size = options["size"]
+    def id
+      @attributes['id']
     end
     
-    def self.parse(data)
-      puts data.inspect
-      puts
-      puts
-      if data.is_a?(Array)
-        data.collect do |image|
-          Image.new(image["image"])
-        end
+    def type
+      @attributes['type'].downcase.to_sym
+    end
+    
+    def sizes
+      @attributes['sizes'].map { |size| size.downcase.to_sym }.to_set
+    end
+    
+    def url
+      original_url
+    end
+    
+    def method_missing(*args, &block)
+      if args.first.to_s =~ /\A(.*)_url\Z/
+        @attributes["#{$1}_url"]
       else
-        Image.new(image["image"])
+        super
       end
     end
+    
+    class << self
+      def parse(data)
+        data.map { |row| row['image'] }.group_by { |row| row['id'] }.map do |id, images|
+          Image.new(reduce_images(images))
+        end
+      end
+      
+      protected
+        def reduce_images(images)
+          images.inject({'sizes' => []}) do |image, row|
+            image["#{row['size']}_url"] = row.delete('url')
+            image['sizes'] << row.delete('size')
+            image.merge(row)
+          end
+        end
+    end
+    
   end
 end

data/lib/tmdb_party/movie.rb

@@ -3,20 +3,21 @@ module TMDBParty
     include Attributes
     attr_reader :tmdb
     
-    attributes :name, :overview, :id, :score, :imdb_id, :movie_type, :url, :popularity, :alternative_title
+    attributes :name, :overview, :id, :imdb_id, :movie_type, :url, :alternative_title, :translated, :certification
     attributes :released
-    attributes :id, :type => Integer
-    attributes :popularity, :score, :type => Float
+    attributes :id, :popularity, :type => Integer
+    attributes :score, :type => Float
     
-    attributes :posters, :backdrops, :lazy => :get_info!
+    attributes :tagline, :lazy => :get_info!
+    attributes :posters, :backdrops, :lazy => :get_info!, :type => Image
     attributes :homepage, :lazy => :get_info!
     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
+    attributes :countries, :lazy => :get_info!, :type => Country
+    attributes :studios, :lazy => :get_info!, :type => Studio
     
-    alias_method :flattened_posters, :posters
-    alias_method :flattened_backdrops, :backdrops
+    alias_method :translated?, :translated
     
     def initialize(values, tmdb)
       @tmdb = tmdb
@@ -29,45 +30,41 @@ module TMDBParty
       @loaded = true
     end
 
+    def cast
+      # TODO: This needs refactoring
+      CastMember.parse(read_or_load_attribute('cast', nil, :get_info!), tmdb)
+    end
+
+    def language
+      read_attribute('language').downcase.to_sym
+    end
+
+    def last_modified_at
+      # Date from TMDB is always in MST, but no timezone is present in date string
+      Time.parse(read_attribute('last_modified_at') + ' MST')
+    end
+
     def directors
-      find_cast('Director')
+      find_cast('Directing')
     end
 
     def actors
-      find_cast('Actor')
+      find_cast('Actors')
     end
 
     def writers
-      find_cast('Writer')
-    end
-    
-    def posters
-      process_art(flattened_posters)
+      find_cast('Writing')
     end
 
-    def backdrops
-      process_art(flattened_backdrops)
+    def producers
+      find_cast('Production')
     end
     
-    
     private
     
-    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}
+      guys = cast.select{|c| c.department == type}
     end
 
   end

data/lib/tmdb_party/person.rb

@@ -1,21 +1,29 @@
 module TMDBParty
   class Person
     include Attributes
-    attributes :name, :url, :job
+    attr_reader :tmdb
+    attributes :id, :popularity, :type => Integer
+    attributes :score, :type => Float
+    attributes :name, :url, :biography
     
-    def initialize(values)
+    attributes :birthplace, :birthday, :lazy => :get_info!
+    
+    def initialize(values, tmdb)
+      @tmdb = tmdb
       self.attributes = values
     end
     
-    def self.parse(data)
-      return unless data
-      if data.is_a?(Array)
-        data.collect do |person|
-          Person.new(person)
-        end
-      else
-        [Person.new(data)]
-      end
+    def biography
+      # HTTParty does not parse the encoded hexadecimal properly. It does not consider 000F to be a hex, but 000f is
+      # A bug has been submitted about this
+      read_attribute('biography').gsub("\\n", "\n").gsub(/\\u([0-9A-F]{4})/) { [$1.hex].pack("U") }
+    end
+    
+    
+    def get_info!
+      person = tmdb.get_person(self.id)
+      @attributes.merge!(person.attributes) if person
+      @loaded = true
     end
   end
 end