lib/ruby-tmdb/tmdb_movie.rb in ruby-tmdb-0.1.0 vs lib/ruby-tmdb/tmdb_movie.rb in ruby-tmdb-0.1.1

@@ -1,16 +1,21 @@
 class TmdbMovie
   
   def self.find(options)
+    options = {
+      :expand_results => true
+    }.merge(options)
+    
     raise ArgumentError, "At least one of: id, title, imdb should be supplied" if(options[:id].nil? && options[:imdb].nil? && options[:title].nil?)
     
     results = []
     unless(options[:id].nil? || options[:id].to_s.empty?)
       results << Tmdb.api_call("Movie.getInfo", options[:id])
     end
     unless(options[:imdb].nil? || options[:imdb].to_s.empty?)
       results << Tmdb.api_call("Movie.imdbLookup", options[:imdb])
+      options[:expand_results] = true
     end
     unless(options[:title].nil? || options[:title].to_s.empty?)
       results << Tmdb.api_call("Movie.search", options[:title])
     end
     
@@ -19,62 +24,21 @@
     unless(options[:limit].nil?)
       raise ArgumentError, ":limit must be an integer greater than 0" unless(options[:limit].is_a?(Fixnum) && options[:limit] > 0)
       results = results.slice(0, options[:limit])
     end
     
-    results.map!{|m| TmdbMovie.new(m) }
+    results.map!{|m| TmdbMovie.new(m, options[:expand_results]) }
     
     if(results.length == 1)
       return results[0]
     else
       return results
     end
   end
   
-  def initialize(raw_data)
-    @raw_data = raw_data
-    @raw_data = Tmdb.api_call('Movie.getInfo', @raw_data["id"]).first
-    @raw_data.each_pair do |key, value|
-      instance_eval <<-EOD
-        def #{key}
-          @raw_data["#{key}"]
-        end
-      EOD
-      if(value.is_a?(Array))
-        value.each_index do |x|
-          if(value[x].is_a?(Hash) && value[x].length == 1)
-            if(value[x].keys[0] == "image")
-              value[x][value[x].keys[0]].instance_eval <<-EOD
-                def self.data
-                  Tmdb.get_url(self["url"]).body
-                end
-              EOD
-            end
-            value[x] = value[x][value[x].keys[0]]
-          end
-          if(value[x].is_a?(Hash))
-            value[x].each_pair do |key2, value2|
-              value[x].instance_eval <<-EOD
-                def self.#{key2}
-                  self["#{key2}"]
-                end
-              EOD
-              if(key == "cast")
-                value[x].instance_eval <<-EOD
-                  def self.bio
-                    TmdbCast.find(:id => #{value[x]["id"]}, :limit => 1)
-                  end
-                EOD
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-  
-  def raw_data
-    @raw_data
+  def self.new(raw_data, expand_results = false)
+    raw_data = Tmdb.api_call('Movie.getInfo', raw_data["id"]).first if(expand_results)
+    return Tmdb.data_to_object(raw_data)
   end
   
   def ==(other)
     return false unless(other.is_a?(TmdbMovie))
     return @raw_data == other.raw_data
\ No newline at end of file