cfoundry 0.3.46 → 0.3.47

data/lib/cfoundry/baseclient.rb

@@ -1,4 +1,5 @@
-require "restclient"
+require "net/https"
+require "net/http/post/multipart"
 require "multi_json"
 require "fileutils"
 
@@ -16,22 +17,9 @@ module CFoundry
       @log = false
     end
 
-    def request_path(method, path, types = {}, options = {})
+    def request_path(method, path, options = {})
       path = url(path) if path.is_a?(Array)
 
-      unless types.empty?
-        if params = types.delete(:params)
-          options[:params] = params
-        end
-
-        if types.size > 1
-          raise "request types must contain only one Content-Type => Accept"
-        end
-
-        options[:type] = types.keys.first
-        options[:accept] = types.values.first
-      end
-
       request(method, path, options)
     end
 
@@ -60,10 +48,20 @@ module CFoundry
     end
 
     def request(method, path, options = {})
+      request_uri(URI.parse(@target + path), method, options)
+    end
+
+    def request_uri(uri, method, options = {})
+      uri = URI.parse(@target + uri.to_s) unless uri.host
+
+      # keep original options in case there's a redirect to follow
+      original_options = options.dup
+
       accept = options.delete(:accept)
-      type = options.delete(:type)
+      content = options.delete(:content)
       payload = options.delete(:payload)
       params = options.delete(:params)
+      return_headers = options.delete(:return_headers)
 
       headers = {}
       headers["Authorization"] = @token if @token
@@ -73,12 +71,12 @@ module CFoundry
         headers["Accept"] = accept_type
       end
 
-      if content_type = mimetype(type)
+      if content_type = mimetype(content)
         headers["Content-Type"] = content_type
       end
 
       unless payload.is_a?(String)
-        case type
+        case content
         when :json
           payload = MultiJson.dump(payload)
         when :form
@@ -86,35 +84,62 @@ module CFoundry
         end
       end
 
-      headers["Content-Length"] = payload ? payload.size : 0
+      if payload.is_a?(String)
+        headers["Content-Length"] = payload.size
+      elsif !payload
+        headers["Content-Length"] = 0
+      end
 
       headers.merge!(options[:headers]) if options[:headers]
 
       if params
-        uri = URI.parse(path)
-        path += (uri.query ? "&" : "?") + encode_params(params)
+        if uri.query
+          uri.query += "&" + encode_params(params)
+        else
+          uri.query = encode_params(params)
+        end
+      end
+
+      if payload && payload.is_a?(Hash)
+        multipart = method.const_get(:Multipart)
+        request = multipart.new(uri.request_uri, payload)
+      else
+        request = method.new(uri.request_uri)
+        request.body = payload if payload
       end
 
-      req = options.dup
-      req[:method] = method
-      req[:url] = @target + path
-      req[:headers] = headers
-      req[:payload] = payload
+      request["Authorization"] = @token if @token
+      request["Proxy-User"] = @proxy if @proxy
 
-      json = accept == :json
+      headers.each do |k, v|
+        request[k] = v
+      end
 
-      before = Time.now
+      # TODO: test http proxies
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      if uri.is_a?(URI::HTTPS)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
 
-      RestClient::Request.execute(req) do |response, request, result, &block|
+      print_request(request) if @trace
+
+      before = Time.now
+      http.start do
+        response = http.request(request)
         time = Time.now - before
 
-        print_trace(request, response, caller) if @trace
+        print_response(response) if @trace
+        print_backtrace(caller) if @trace
+
         log_request(time, request, response)
 
-        if [:get, :head].include?(method) && \
-            [301, 302, 307].include?(response.code) && \
-            accept != :headers
-          response.follow_redirection(request, result, &block)
+        if return_headers
+          sane_headers(response)
+        elsif [Net::HTTP::Get, Net::HTTP::Head].include?(method) && \
+            response.is_a?(Net::HTTPRedirection)
+          request_uri(URI.parse(response["location"]), method, original_options)
         else
           handle_response(response, accept)
         end
@@ -123,10 +148,10 @@ module CFoundry
       raise TargetRefused, e.message
     end
 
-    def mimetype(type)
-      case type
+    def mimetype(content)
+      case content
       when String
-        type
+        content
       when :json
         "application/json"
       when :form
@@ -134,10 +159,8 @@ module CFoundry
       when nil
         nil
       # return request headers (not really Accept)
-      when :headers
-        nil
       else
-        raise "unknown mimetype #{type.inspect}"
+        raise "unknown mimetype #{content.inspect}"
       end
     end
 
@@ -150,28 +173,26 @@ module CFoundry
       end.join("&")
     end
 
-    def request_with_types(method, path, options = {})
-      if path.last.is_a?(Hash)
-        types = path.pop
-      end
+    def request_with_options(method, path, options = {})
+      options.merge!(path.pop) if path.last.is_a?(Hash)
 
-      request_path(method, url(path), types || {}, options)
+      request_path(method, url(path), options)
     end
 
     def get(*path)
-      request_with_types(:get, path)
+      request_with_options(Net::HTTP::Get, path)
     end
 
     def delete(*path)
-      request_with_types(:delete, path)
+      request_with_options(Net::HTTP::Delete, path)
     end
 
     def post(payload, *path)
-      request_with_types(:post, path, :payload => payload)
+      request_with_options(Net::HTTP::Post, path, :payload => payload)
     end
 
     def put(payload, *path)
-      request_with_types(:put, path, :payload => payload)
+      request_with_options(Net::HTTP::Put, path, :payload => payload)
     end
 
     def url(segments)
@@ -188,12 +209,12 @@ module CFoundry
       { :time => time,
         :request => {
           :method => request.method,
-          :url => request.url,
-          :headers => request.headers
+          :url => request.path,
+          :headers => sane_headers(request)
         },
         :response => {
           :code => response.code,
-          :headers => response.headers
+          :headers => sane_headers(response)
         }
       }
     end
@@ -243,20 +264,22 @@ module CFoundry
       end
     end
 
-    def print_trace(request, response, locs)
+    def print_request(request)
       $stderr.puts ">>>"
-      $stderr.puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
-      $stderr.puts "REQUEST: #{request.method} #{request.url}"
-      $stderr.puts "RESPONSE_HEADERS:"
-      response.headers.each do |key, value|
-        $stderr.puts "    #{key} : #{value}"
-      end
+      $stderr.puts "REQUEST: #{request.method} #{request.path}"
       $stderr.puts "REQUEST_HEADERS:"
-      request.headers.each do |key, value|
-        $stderr.puts "    #{key} : #{value}"
+      request.each_header do |key, value|
+        $stderr.puts "  #{key} : #{value}"
       end
-      $stderr.puts "REQUEST_BODY: #{request.payload}" if request.payload
+      $stderr.puts "REQUEST_BODY: #{request.body}" if request.body
+    end
+
+    def print_response(response)
       $stderr.puts "RESPONSE: [#{response.code}]"
+      $stderr.puts "RESPONSE_HEADERS:"
+      response.each_header do |key, value|
+        $stderr.puts "  #{key} : #{value}"
+      end
       begin
         parsed_body = MultiJson.load(response.body)
         $stderr.puts MultiJson.dump(parsed_body, :pretty => true)
@@ -264,7 +287,9 @@ module CFoundry
         $stderr.puts "#{response.body}"
       end
       $stderr.puts "<<<"
+    end
 
+    def print_backtrace(locs)
       return unless @backtrace
 
       interesting_locs = locs.drop_while { |loc|
@@ -285,30 +310,34 @@ module CFoundry
     end
 
     def handle_response(response, accept)
-      json = accept == :json
-
-      case response.code
-      when 200, 201, 204, 301, 302, 307
-        if accept == :headers
-          return response.headers
-        end
-
-        if json
-          if response.code == 204
+      case response
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        if accept == :json
+          if response.is_a?(Net::HTTPNoContent)
             raise "Expected JSON response, got 204 No Content"
           end
 
-          parse_json(response)
+          parse_json(response.body)
         else
-          response
+          response.body
         end
 
-      when 404
+      when Net::HTTPNotFound
         raise CFoundry::NotFound
 
       else
-        raise CFoundry::BadResponse.new(response.code, response)
+        raise CFoundry::BadResponse.new(response.code, response.body)
       end
     end
+
+    def sane_headers(obj)
+      hds = {}
+
+      obj.each_header do |k, v|
+        hds[k] = v
+      end
+
+      hds
+    end
   end
 end

data/lib/cfoundry/client.rb

@@ -19,7 +19,7 @@ module CFoundry
     end
 
     def info
-      get("info", nil => :json)
+      get("info", :accept => :json)
     end
   end
 end

data/lib/cfoundry/uaaclient.rb

@@ -13,7 +13,7 @@ module CFoundry
     end
 
     def prompts
-      get("login", nil => :json)[:prompts]
+      get("login", :accept => :json)[:prompts]
     end
 
     def authorize(credentials)
@@ -27,12 +27,14 @@ module CFoundry
         post(
           { :credentials => credentials },
           "oauth", "authorize",
-          :form => :headers,
-          :params => query)[:location])
+          :return_headers => true,
+          :content => :form,
+          :accept => :json,
+          :params => query)["location"])
     end
 
     def users
-      get("Users", nil => :json)
+      get("Users", :accept => :json)
     end
 
     def change_password(guid, new, old)
@@ -42,54 +44,44 @@ module CFoundry
           :oldPassword => old
         },
         "User", guid, "password",
-        :json => nil)
+        :content => :json)
     end
 
     private
 
     def handle_response(response, accept)
-      json = accept == :json
-
-      case response.code
-      when 200, 204, 302
-        if accept == :headers
-          return response.headers
-        end
-
-        if json
-          if response.code == 204
+      case response
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        if accept == :json
+          if response.is_a?(Net::HTTPNoContent)
             raise "Expected JSON response, got 204 No Content"
           end
 
-          parse_json(response)
+          parse_json(response.body)
         else
-          response
+          response.body
         end
 
-      when 400, 403
-        info = parse_json(response)
-        raise Denied.new(403, info[:error_description])
-
-      when 401
-        info = parse_json(response)
-        raise Denied.new(401, info[:error_description])
+      when Net::HTTPBadRequest, Net::HTTPUnauthorized, Net::HTTPForbidden
+        info = parse_json(response.body)
+        raise Denied.new(response.code, info[:error_description])
 
-      when 404
+      when Net::HTTPNotFound
         raise NotFound
 
-      when 409
-        info = parse_json(response)
-        raise CFoundry::Denied.new(409, info[:message])
+      when Net::HTTPConflict
+        info = parse_json(response.body)
+        raise CFoundry::Denied.new(response.code, info[:message])
 
-      when 411, 500, 504
+      when Net::HTTPServerError
         begin
-          raise_error(parse_json(response))
+          raise_error(parse_json(response.body))
         rescue MultiJson::DecodeError
-          raise BadResponse.new(response.code, response)
+          raise BadResponse.new(response.code, response.body)
         end
 
       else
-        raise BadResponse.new(response.code, response)
+        raise BadResponse.new(response.code, response.body)
       end
     end
 

data/lib/cfoundry/v1/base.rb

@@ -34,62 +34,63 @@ module CFoundry::V1
 
     # Cloud metadata
     def info
-      get("info", nil => :json)
+      get("info", :accept => :json)
     end
 
     def system_services
-      get("info", "services", nil => :json)
+      get("info", "services", :accept => :json)
     end
 
     def system_runtimes
-      get("info", "runtimes", nil => :json)
+      get("info", "runtimes", :accept => :json)
     end
 
     # Users
     def users
-      get("users", nil => :json)
+      get("users", :accept => :json)
     end
 
     def create_user(payload)
-      post(payload, "users", :json => nil)
+      post(payload, "users", :content => :json)
     end
 
     def user(email)
-      get("users", email, nil => :json)
+      get("users", email, :accept => :json)
     end
 
     def delete_user(email)
-      delete("users", email, nil => :json)
+      delete("users", email, :accept => :json)
       true
     end
 
     def update_user(email, payload)
-      put(payload, "users", email, :json => nil)
+      put(payload, "users", email, :content => :json)
     end
 
     def create_token(payload, email)
-      post(payload, "users", email, "tokens", :json => :json)
+      post(payload, "users", email, "tokens",
+           :content => :json, :accept => :json)
     end
 
     # Applications
     def apps
-      get("apps", nil => :json)
+      get("apps", :accept => :json)
     end
 
     def create_app(payload)
-      post(payload, "apps", :json => :json)
+      post(payload, "apps", :content => :json, :accept => :json)
     end
 
     def app(name)
-      get("apps", name, nil => :json)
+      get("apps", name, :accept => :json)
     end
 
     def instances(name)
-      get("apps", name, "instances", nil => :json)[:instances]
+      get("apps", name, "instances", :accept => :json)[:instances]
     end
 
     def crashes(name)
-      get("apps", name, "crashes", nil => :json)[:crashes]
+      get("apps", name, "crashes", :accept => :json)[:crashes]
     end
 
     def files(name, instance, *path)
@@ -98,7 +99,7 @@ module CFoundry::V1
     alias :file :files
 
     def update_app(name, payload)
-      put(payload, "apps", name, :json => nil)
+      put(payload, "apps", name, :content => :json)
     end
 
     def delete_app(name)
@@ -107,86 +108,81 @@ module CFoundry::V1
     end
 
     def stats(name)
-      get("apps", name, "stats", nil => :json)
+      get("apps", name, "stats", :accept => :json)
     end
 
     def check_resources(fingerprints)
-      post(fingerprints, "resources", :json => :json)
+      post(fingerprints, "resources", :content => :json, :accept => :json)
     end
 
     def upload_app(name, zipfile, resources = [])
       payload = {
         :_method => "put",
         :resources => MultiJson.dump(resources),
-        :multipart => true,
         :application =>
-          if zipfile.is_a? File
-            zipfile
-          elsif zipfile.is_a? String
-            File.new(zipfile, "rb")
-          end
+          UploadIO.new(
+            if zipfile.is_a? File
+              zipfile
+            elsif zipfile.is_a? String
+              File.new(zipfile, "rb")
+            end,
+            "application/zip")
       }
 
       post(payload, "apps", name, "application")
-    rescue RestClient::ServerBrokeConnection
+    rescue EOFError
       retry
     end
 
     # Services
     def services
-      get("services", nil => :json)
+      get("services", :accept => :json)
     end
 
     def create_service(manifest)
-      post(manifest, "services", :json => :json)
+      post(manifest, "services", :content => :json, :accept => :json)
     end
 
     def service(name)
-      get("services", name, nil => :json)
+      get("services", name, :accept => :json)
     end
 
     def delete_service(name)
-      delete("services", name, nil => :json)
+      delete("services", name, :accept => :json)
       true
     end
 
     private
 
     def handle_response(response, accept)
-      json = accept == :json
-
-      case response.code
-      when 200, 201, 204, 301, 302, 307
-        if accept == :headers
-          return response.headers
-        end
-
-        if json
-          if response.code == 204
+      case response
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        if accept == :json
+          if response.is_a?(Net::HTTPNoContent)
             raise "Expected JSON response, got 204 No Content"
           end
 
-          parse_json(response)
+          parse_json(response.body)
         else
-          response
+          response.body
         end
 
-      when 400, 403
-        info = parse_json(response)
+      when Net::HTTPBadRequest, Net::HTTPForbidden
+        info = parse_json(response.body)
         raise CFoundry::Denied.new(403, info[:description])
 
-      when 404
+      when Net::HTTPNotFound
         raise CFoundry::NotFound
 
-      when 411, 500, 504
+      when Net::HTTPServerError
         begin
-          raise_error(parse_json(response))
+          raise_error(parse_json(response.body))
         rescue MultiJson::DecodeError
-          raise CFoundry::BadResponse.new(response.code, response)
+          raise CFoundry::BadResponse.new(response.code, response.body)
         end
 
       else
-        raise CFoundry::BadResponse.new(response.code, response)
+        raise CFoundry::BadResponse.new(response.code, response.body)
       end
     end
 

data/lib/cfoundry/v2/base.rb

@@ -35,7 +35,7 @@ module CFoundry::V2
 
     # Cloud metadata
     def info
-      get("info", nil => :json)
+      get("info", :accept => :json)
     end
 
 
@@ -51,11 +51,11 @@ module CFoundry::V2
 
         params = { :"inline-relations-depth" => depth }
 
-        get("v2", plural, guid, nil => :json, :params => params)
+        get("v2", plural, guid, :accept => :json, :params => params)
       end
 
       define_method(:"create_#{obj}") do |payload|
-        post(payload, "v2", plural, :json => :json)
+        post(payload, "v2", plural, :content => :json, :accept => :json)
       end
 
       define_method(:"delete_#{obj}") do |guid|
@@ -64,34 +64,38 @@ module CFoundry::V2
       end
 
       define_method(:"update_#{obj}") do |guid, payload|
-        put(payload, "v2", plural, guid, :json => :json)
+        put(payload, "v2", plural, guid, :content => :json, :accept => :json)
       end
 
       define_method(plural) do |*args|
+        params = params_from(args)
+
         all_pages(
-          get("v2", plural, nil => :json, :params => params_from(args)))
+          params,
+          get("v2", plural, :accept => :json, :params => params))
       end
-
     end
 
     def resource_match(fingerprints)
-      put(fingerprints, "v2", "resource_match", :json => :json)
+      put(fingerprints, "v2", "resource_match",
+          :content => :json, :accept => :json)
     end
 
     def upload_app(guid, zipfile, resources = [])
       payload = {
         :resources => MultiJson.dump(resources),
-        :multipart => true,
         :application =>
-          if zipfile.is_a? File
-            zipfile
-          elsif zipfile.is_a? String
-            File.new(zipfile, "rb")
-          end
+          UploadIO.new(
+            if zipfile.is_a? File
+              zipfile
+            elsif zipfile.is_a? String
+              File.new(zipfile, "rb")
+            end,
+            "application/zip")
       }
 
       put(payload, "v2", "apps", guid, "bits")
-    rescue RestClient::ServerBrokeConnection
+    rescue EOFError
       retry
     end
 
@@ -101,15 +105,15 @@ module CFoundry::V2
     alias :file :files
 
     def instances(guid)
-      get("v2", "apps", guid, "instances", nil => :json)
+      get("v2", "apps", guid, "instances", :accept => :json)
     end
 
     def crashes(guid)
-      get("v2", "apps", guid, "crashes", nil => :json)
+      get("v2", "apps", guid, "crashes", :accept => :json)
     end
 
     def stats(guid)
-      get("v2", "apps", guid, "stats", nil => :json)
+      get("v2", "apps", guid, "stats", :accept => :json)
     end
 
 
@@ -126,11 +130,13 @@ module CFoundry::V2
       params
     end
 
-    def all_pages(paginated)
+    def all_pages(params, paginated)
       payload = paginated[:resources]
 
       while next_page = paginated[:next_url]
-        paginated = request_path(:get, next_page, nil => :json)
+        paginated = request_path(
+          Net::HTTP::Get, next_page, :accept => :json, :params => params)
+
         payload += paginated[:resources]
       end
 
@@ -140,45 +146,43 @@ module CFoundry::V2
     private
 
     def handle_response(response, accept)
-      json = accept == :json
-
-      case response.code
-      when 200, 201, 204, 301, 302, 307
+      case response
+      when Net::HTTPSuccess, Net::HTTPRedirection
         if accept == :headers
-          return response.headers
+          return sane_headers(response)
         end
 
-        if json
-          if response.code == 204
+        if accept == :json
+          if response.is_a?(Net::HTTPNoContent)
             raise "Expected JSON response, got 204 No Content"
           end
 
-          parse_json(response)
+          parse_json(response.body)
         else
-          response
+          response.body
         end
 
-      when 400
-        info = parse_json(response)
+      when Net::HTTPBadRequest
+        info = parse_json(response.body)
         raise CFoundry::APIError.new(info[:code], info[:description])
 
-      when 401, 403
-        info = parse_json(response)
+      when Net::HTTPUnauthorized, Net::HTTPForbidden
+        info = parse_json(response.body)
         raise CFoundry::Denied.new(info[:code], info[:description])
 
-      when 404
+      when Net::HTTPNotFound
         raise CFoundry::NotFound
 
-      when 411, 500, 504
+      when Net::HTTPServerError
         begin
-          info = parse_json(response)
+          info = parse_json(response.body)
           raise CFoundry::APIError.new(info[:code], info[:description])
         rescue MultiJson::DecodeError
-          raise CFoundry::BadResponse.new(response.code, response)
+          raise CFoundry::BadResponse.new(response.code, response.body)
         end
 
       else
-        raise CFoundry::BadResponse.new(response.code, response)
+        raise CFoundry::BadResponse.new(response.code, response.body)
       end
     end
 

data/lib/cfoundry/v2/client.rb

@@ -212,19 +212,22 @@ module CFoundry::V2
         send(
           :"make_#{singular}",
           @base.request_path(
-            :get,
+            Net::HTTP::Get,
             path,
-            nil => :json,
+            :accept => :json,
             :params => @base.params_from(args)))
       end
 
       define_method(:"#{plural}_from") do |path, *args|
+        params = @base.params_from(args)
+
         objs = @base.all_pages(
+          params,
           @base.request_path(
-            :get,
+            Net::HTTP::Get,
             path,
-            nil => :json,
-            :params => @base.params_from(args)))
+            :accept => :json,
+            :params => params))
 
         objs.collect do |json|
           send(:"make_#{singular}", json)

data/lib/cfoundry/v2/model.rb

@@ -145,9 +145,9 @@ module CFoundry::V2
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
           @client.base.request_path(
-            :put,
+            Net::HTTP::Put,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
-            nil => :json)
+            :accept => :json)
         }
 
         define_method(:"remove_#{singular}") { |x|
@@ -155,9 +155,9 @@ module CFoundry::V2
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
           @client.base.request_path(
-            :delete,
+            Net::HTTP::Delete,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
-            nil => :json)
+            :accept => :json)
         }
 
         define_method(:"#{plural}=") { |xs|

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.46"
+  VERSION = "0.3.47"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: 
   segments: 
   - 0
   - 3
-  - 46
-  version: 0.3.46
+  - 47
+  version: 0.3.47
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,22 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-18 00:00:00 Z
+date: 2012-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: multipart-post
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 19
         segments: 
         - 1
-        - 6
         - 1
-        version: 1.6.1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency