lib/cfoundry/v2/base.rb in cfoundry-0.4.21 vs lib/cfoundry/v2/base.rb in cfoundry-0.5.0

@@ -7,43 +7,12 @@
 
 module CFoundry::V2
   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 resource_match(fingerprints)
-      put(fingerprints, "v2", "resource_match",
-          :content => :json, :accept => :json)
+      put("v2", "resource_match", :content => :json, :accept => :json, :payload => fingerprints)
     end
 
     def upload_app(guid, zipfile, resources = [])
       payload = {
         :resources => MultiJson.dump(resources),
@@ -55,42 +24,37 @@
               File.new(zipfile, "rb")
             end,
             "application/zip")
       }
 
-      put(payload, "v2", "apps", guid, "bits")
+      put("v2", "apps", guid, "bits", :payload => payload)
     rescue EOFError
       retry
     end
 
     def files(guid, instance, *path)
       get("v2", "apps", guid, "instances", instance, "files", *path)
     end
     alias :file :files
 
     def stream_file(guid, instance, *path)
-      redirect =
-        request_with_options(
-          Net::HTTP::Get,
-          ["v2", "apps", guid, "instances", instance, "files", *path],
-          :return_response => true)
+      path_and_options = path + [{:return_response => true, :follow_redirects => false}]
+      redirect = get("v2", "apps", guid, "instances", instance, "files", *path_and_options)
 
-      if loc = redirect["location"]
-        uri = URI.parse(loc + "&tail")
+      if location = redirect[:headers]["location"]
+        uri = URI.parse(location + "&tail")
 
         Net::HTTP.start(uri.host, uri.port) do |http|
           req = Net::HTTP::Get.new(uri.request_uri)
-          req["Authorization"] = @token
+          req["Authorization"] = token.auth_header if token
 
           http.request(req) do |response|
-            response.read_body do |chunk|
-              yield chunk
-            end
+            response.read_body { |chunk| yield chunk }
           end
         end
       else
-        yield redirect.body
+        yield redirect[:body]
       end
     end
 
     def instances(guid)
       get("v2", "apps", guid, "instances", :accept => :json)
@@ -102,45 +66,17 @@
 
     def stats(guid)
       get("v2", "apps", guid, "stats", :accept => :json)
     end
 
-
     def all_pages(paginated)
       payload = paginated[:resources]
 
       while next_page = paginated[:next_url]
-        paginated = request_path(Net::HTTP::Get, next_page, :accept => :json)
+        paginated = get(next_page, :accept => :json)
         payload += paginated[:resources]
       end
 
       payload
-    end
-
-    private
-
-    def handle_response(response, accept, request)
-      # this is a copy paste of v1
-      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
-
-    def log_line(io, data)
-      io.printf(
-        "[%s]  %0.3fs  %s  %6s -> %d  %s\n",
-        Time.now.strftime("%F %T"),
-        data[:time],
-        data[:response][:headers]["x-vcap-request-id"],
-        data[:request][:method].to_s.upcase,
-        data[:response][:code],
-        data[:request][:url])
     end
   end
 end