cfoundry 0.3.47 → 0.3.48

data/lib/cfoundry/baseclient.rb

@@ -62,6 +62,7 @@ module CFoundry
       payload = options.delete(:payload)
       params = options.delete(:params)
       return_headers = options.delete(:return_headers)
+      return_response = options.delete(:return_response)
 
       headers = {}
       headers["Authorization"] = @token if @token
@@ -137,6 +138,8 @@ module CFoundry
 
         if return_headers
           sane_headers(response)
+        elsif return_response
+          response
         elsif [Net::HTTP::Get, Net::HTTP::Head].include?(method) && \
             response.is_a?(Net::HTTPRedirection)
           request_uri(URI.parse(response["location"]), method, original_options)

data/lib/cfoundry/uaaclient.rb

@@ -23,14 +23,24 @@ module CFoundry
         :redirect_uri => @redirect_uri
       }
 
-      extract_token(
+      auth =
         post(
           { :credentials => credentials },
           "oauth", "authorize",
-          :return_headers => true,
+          :return_response => true,
           :content => :form,
           :accept => :json,
-          :params => query)["location"])
+          :params => query)
+
+      case auth
+      when Net::HTTPRedirection
+        extract_token(auth["location"])
+      else
+        json = parse_json(auth.body)
+        raise CFoundry::Denied.new(
+          auth.code.to_i,
+          json[:error_description])
+      end
     end
 
     def users

data/lib/cfoundry/v1/base.rb

@@ -38,7 +38,7 @@ module CFoundry::V1
     end
 
     def system_services
-      get("info", "services", :accept => :json)
+      get("services", "v1", "offerings", :content => :json, :accept => :json)
     end
 
     def system_runtimes

data/lib/cfoundry/v1/client.rb

@@ -87,10 +87,13 @@ module CFoundry::V1
       services = []
 
       @base.system_services.each do |type, vendors|
-        vendors.each do |vendor, versions|
-          versions.each do |num, meta|
-            services <<
-              Service.new(vendor.to_s, num.to_s, meta[:description], type)
+        vendors.each do |vendor, providers|
+          providers.each do |provider, versions|
+            versions.each do |num, meta|
+              services <<
+                Service.new(vendor.to_s, num.to_s, meta[:description],
+                            type, provider.to_s)
+            end
           end
         end
       end

data/lib/cfoundry/v1/service.rb

@@ -1,12 +1,14 @@
 module CFoundry::V1
   class Service
-    attr_accessor :label, :version, :description, :type
+    attr_accessor :label, :version, :description, :type, :provider
 
-    def initialize(label, version = nil, description = nil, type = nil)
+    def initialize(label, version = nil, description = nil,
+                   type = nil, provider = "core")
       @label = label
       @description = description
       @version = version
-      @type = nil
+      @type = type
+      @provider = provider
     end
 
     def eql?(other)
@@ -14,10 +16,6 @@ module CFoundry::V1
     end
     alias :== :eql?
 
-    def provider
-      "core"
-    end
-
     def active
       true
     end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 115
   prerelease: 
   segments: 
   - 0
   - 3
-  - 47
-  version: 0.3.47
+  - 48
+  version: 0.3.48
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-19 00:00:00 Z
+date: 2012-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post