animoto 0.0.0.alpha0 → 0.0.0.alpha1

data/lib/animoto/client.rb

@@ -27,7 +27,7 @@ require 'animoto/rendering_job'
 
 module Animoto
   class Client
-    API_ENDPOINT      = "http://api2-staging.animoto.com/"
+    API_ENDPOINT      = "https://api2-staging.animoto.com/"
     API_VERSION       = 1
     BASE_CONTENT_TYPE = "application/vnd.animoto"
     HTTP_METHOD_MAP   = {
@@ -69,9 +69,6 @@ module Animoto
         end
       end
       @format = 'json'
-      uri = URI.parse(API_ENDPOINT)
-      @http = Net::HTTP.new uri.host, uri.port
-      # @http.use_ssl = true
     end
     
     # Finds a resource by its URL.
@@ -130,7 +127,8 @@ module Animoto
     # @param [Hash] options
     # @return [Hash] deserialized JSON response body
     def find_request klass, url, options = {}
-      request(:get, URI.parse(url).path, nil, { "Accept" => content_type_of(klass) }, options)
+      # request(:get, URI.parse(url).path, nil, { "Accept" => content_type_of(klass) }, options)
+      request(:get, URI.parse(url), nil, { "Accept" => content_type_of(klass) }, options)
     end
     
     # Builds a request requiring a manifest.
@@ -140,21 +138,47 @@ module Animoto
     # @param [Hash] options
     # @return [Hash] deserialized JSON response body
     def send_manifest manifest, endpoint, options = {}
-      request(:post, endpoint, manifest.to_json, { "Accept" => "application/#{format}", "Content-Type" => content_type_of(manifest) }, options)
+      # request(:post, endpoint, manifest.to_json, { "Accept" => "application/#{format}", "Content-Type" => content_type_of(manifest) }, options)
+      u = URI.parse(API_ENDPOINT)
+      u.path = endpoint
+      request(:post, u, manifest.to_json, { "Accept" => "application/#{format}", "Content-Type" => content_type_of(manifest) }, options)
     end
     
     # Makes a request and parses the response.
     #
     # @param [Symbol] method which HTTP method to use (should be lowercase, i.e. :get instead of :GET)
-    # @param [String] uri the request path
+    # @param [URI] uri a URI object of the request URI
     # @param [String, nil] body the request body
     # @param [Hash<String,String>] headers the request headers (will be sent as-is, which means you should
     #   specify "Content-Type" => "..." instead of, say, :content_type => "...")
     # @param [Hash] options
     # @return [Hash] deserialized JSON response body
     def request method, uri, body, headers = {}, options = {}
+      http = Net::HTTP.new uri.host, uri.port
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       req = build_request method, uri, body, headers, options
-      read_response @http.request(req)
+      if @debug
+        puts "********************* REQUEST  *******************"
+        puts "#{req.method} #{uri.to_s} HTTP/#{http.instance_variable_get(:@curr_http_version)}\r\n"
+        req.each_capitalized { |header, value| puts "#{header}: #{value}\r\n" }
+        puts "\r\n"
+        puts req.body unless req.method == 'GET'
+      end
+      response = http.request(req)
+      if @debug
+        puts "********************* RESPONSE *******************"
+        puts "#{response.code} #{response.message}\r\n"
+        response.each_capitalized { |header, value| puts "#{header}: #{value}\r\n" }
+        puts "\r\n"
+        body = response.body
+        if body.nil? || body.empty?
+          puts "(No content)"
+        else
+          puts body
+        end
+      end
+      read_response response
     end
     
     # Builds the request object.
@@ -167,7 +191,7 @@ module Animoto
     # @param [Hash] options
     # @return [Net::HTTPRequest] the request object
     def build_request method, uri, body, headers, options
-      req = HTTP_METHOD_MAP[method].new uri
+      req = HTTP_METHOD_MAP[method].new uri.path
       req.body = body
       req.initialize_http_header headers
       req.basic_auth key, secret

data/lib/animoto/resource.rb

@@ -50,13 +50,12 @@ module Animoto
       self.class.payload_key
     end
     
-    # @private
-    #
     # Makes a new instance of this class from a deserialized JSON response body. Note that
     # it assumes the hash you're passing is structured correctly and does no format checking
     # at all, so if the hash is not in the "standard envelope", this method will most likely
     # raise an error.
     #
+    # @private
     # @param [Hash] body the deserialized JSON response body
     # @return [Resource] an instance of this class
     def self.load body
@@ -87,11 +86,10 @@ module Animoto
         end
       end
 
-      # @private
-      # 
       # Registers an instance in the identity map so that subsequent finds or instantiations
       # of this resource with the same URL will return the same object.
       #
+      # @private
       # @param [Resource] instance the instance to register
       # @raise [ArgumentError] if the instance isn't of this class
       def register instance
@@ -115,22 +113,20 @@ module Animoto
       instantiate attributes
     end
     
-    # @private
-    #
     # Update this instance with new attributes from the response body.
     #
+    # @private
     # @param [Hash] body deserialized JSON from a response body
     # @return [self] this instance, updated
     def load body = {}
       instantiate unpack_standard_envelope(body)
     end
     
-    # @private
-    #
     # Since Resources can be created a number of different ways, this method does
     # the actual attribute setting for a Resource, acting much like a public version
     # of #initialize.
     #
+    # @private
     # @param [Hash] attributes hash of attributes for this resource
     # @return [self] this instance
     def instantiate attributes = {}

data/lib/animoto.rb

@@ -1,5 +1,5 @@
 module Animoto
   def self.version
-    "0.0.0.alpha0"
+    "0.0.0.alpha1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: -1710980558
+  hash: -1710980557
   prerelease: true
   segments: 
   - 0
   - 0
   - 0
-  - alpha0
-  version: 0.0.0.alpha0
+  - alpha1
+  version: 0.0.0.alpha1
 platform: ruby
 authors: 
 - Animoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency