lib/ruby-tmdb3/tmdb.rb in ruby-tmdb3-0.3.0 vs lib/ruby-tmdb3/tmdb.rb in ruby-tmdb3-0.3.1

@@ -8,10 +8,21 @@
   require "addressable/uri"
   
   @@api_key = ""
   @@default_language = "en"
   @@api_response = {}
+
+  # TODO: Should be refreshed and cached from API 
+  CONFIGURATION = DeepOpenStruct.load({ "images" =>
+                    { 
+                      "base_url"        => "http://cf2.imgobject.com/t/p/", 
+                      "posters_sizes"   => ["w92", "w154", "w185", "w342", "w500", "original"],
+                      "backdrops_sizes" => ["w300", "w780", "w1280", "original"],
+                      "profiles_sizes"  => ["w45", "w185", "h632", "original"],
+                      "logos_sizes"     => ["w45", "w92", "w154", "w185", "w300", "w500", "original"]
+                    }
+  })
   
   def self.api_key
     @@api_key
   end
   
@@ -26,17 +37,19 @@
   def self.default_language=(language)
     @@default_language = language
   end
   
   def self.base_api_url
-    "http://api.themoviedb.org/3/"
+    "http://api.themoviedb.org/3"
   end
   
   def self.api_call(method, data, language = @@default_language)
     raise ArgumentError, "Tmdb.api_key must be set before using the API" if(Tmdb.api_key.nil? || Tmdb.api_key.empty?)
     raise ArgumentError, "Invalid data." if(data.nil? || (data.class != Hash))
 
+    method, action = method.split '/'
+
     data = {
       api_key:  Tmdb.api_key,
       language: language
     }.merge(data)
 
@@ -53,25 +66,21 @@
     uri = Addressable::URI.new
 
     # Construct URL for queries with id
     if data.has_key?(:id)
       uri.query_values = query_values
-
-      url = Tmdb.base_api_url + method + "/" + data[:id].to_s + "?" + uri.query
-
     # Construct URL other queries
     else
       query_values = {
         query: CGI::escape(data[:query])
       }.merge(query_values)
-
       uri.query_values = query_values
-
-      url = Tmdb.base_api_url + method + "?" + uri.query
     end
+    url            = [Tmdb.base_api_url, method, data[:id], action].compact.join '/'
+    url_with_query = [url, uri.query].compact.join '?'
     
-    response = Tmdb.get_url(url)
+    response = Tmdb.get_url(url_with_query)
     if(response.code.to_i != 200)
       raise RuntimeError, "Tmdb API returned status code '#{response.code}' for URL: '#{url}'"
     end
 
     body = JSON(response.body)
@@ -98,27 +107,25 @@
       Net::HTTPBadRequest.new( '404', 404, "Not Found" )
     end
   end
   
   def self.data_to_object(data)
-    object = DeepOpenStruct.load(data)
+    object          = DeepOpenStruct.load(data)
     object.raw_data = data
-    ["posters", "backdrops", "profile"].each do |image_array_name|
-      if(object.respond_to?(image_array_name))
-        image_array = object.send(image_array_name)
-        image_array.each_index do |x|
-          image_array[x] = image_array[x].image
-          image_array[x].instance_eval <<-EOD
-            def self.data
-              return Tmdb.get_url(self.url).body
-            end
-          EOD
+    ["posters", "backdrops"].each do |image_array_name|
+      image_array = Array object.send(image_array_name)
+      single_name = image_array_name.slice 0..-2 # singularize name
+      single_path = object.send "#{single_name}_path" # default poster/backdrop image
+      image_array << object.send("#{image_array_name.slice 0..-2}=", DeepOpenStruct.load({file_path: single_path}))
+      # build a struct containing availables sizes with their urls
+      image_array.each do |image|
+        urls = CONFIGURATION.images.send("#{image_array_name}_sizes").inject({}) do |hash, size|
+          hash[size] = {'url' => [CONFIGURATION.images.base_url, size, image.file_path].join}
+          hash
         end
+        image.sizes = DeepOpenStruct.load urls
       end
-      if(object.profile)
-        object.profiles = object.profile
-      end
     end
     unless(object.cast.nil?)
       object.cast.each_index do |x|
         object.cast[x].instance_eval <<-EOD
           def self.bio
@@ -128,6 +135,6 @@
       end
     end
     return object
   end
   
-end
\ No newline at end of file
+end