base.rb in cfoundry-0.5.0

- old
+ new

@@ -7,40 +7,10 @@
 
 module CFoundry::V1
   class Base < CFoundry::BaseClient
     include BaseClientMethods
 
-    attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
-
-    def initialize(
-        target = "https://api.cloudfoundry.com",
-        token = nil)
-      super
-    end
-
-
-    # The UAA used for this client.
-    #
-    # `false` if no UAA (legacy)
-    def uaa
-      return @uaa unless @uaa.nil?
-
-      endpoint = info[:authorization_endpoint]
-      return @uaa = false unless endpoint
-
-      @uaa = CFoundry::UAAClient.new(endpoint)
-      @uaa.trace = @trace
-      @uaa.token = @token
-      @uaa
-    end
-
-
-    # Cloud metadata
-    def info
-      get("info", :accept => :json)
-    end
-
     def system_services
       get("services", "v1", "offerings", :content => :json, :accept => :json)
     end
 
     def system_runtimes
@@ -48,16 +18,15 @@
     end
 
     # Users
     def create_user(payload)
       # no JSON response
-      post(payload, "users", :content => :json)
+      post("users", :content => :json, :payload => payload)
     end
 
     def create_token(payload, email)
-      post(payload, "users", email, "tokens",
-           :content => :json, :accept => :json)
+      post("users", email, "tokens", :content => :json, :accept => :json, :payload => payload)
     end
 
     # Applications
     def instances(name)
       get("apps", name, "instances", :accept => :json)[:instances]
@@ -75,11 +44,11 @@
     def stats(name)
       get("apps", name, "stats", :accept => :json)
     end
 
     def resource_match(fingerprints)
-      post(fingerprints, "resources", :content => :json, :accept => :json)
+      post("resources", :content => :json, :accept => :json, :payload => fingerprints)
     end
 
     def upload_app(name, zipfile, resources = [])
       payload = {
         :_method => "put",
@@ -92,27 +61,11 @@
               File.new(zipfile, "rb")
             end,
             "application/zip")
       }
 
-      post(payload, "apps", name, "application")
+      post("apps", name, "application", :payload => payload)
     rescue EOFError
       retry
-    end
-
-    private
-
-    def handle_response(response, accept, request)
-      # this is a copy paste of v2
-      return super if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
-
-      info = parse_json(response.body)
-      return super unless info[:code]
-
-      cls = CFoundry::APIError.error_classes[info[:code]]
-
-      raise (cls || CFoundry::APIError).new(request, response, info[:description],  info[:code])
-    rescue MultiJson::DecodeError
-      super
     end
   end
 end