cfoundry 2.4.0 → 2.4.1.rc1

data/lib/cfoundry/baseclient.rb

@@ -15,7 +15,7 @@ module CFoundry
       :trace, :backtrace, :backtrace=, :log, :log=,
       :http_proxy, :http_proxy=, :https_proxy, :https_proxy=
 
-    def initialize(target = "https://api.cloudfoundry.com", token = nil)
+    def initialize(target, token = nil)
       @rest_client = CFoundry::RestClient.new(target, token)
       self.trace = false
       self.backtrace = false

data/lib/cfoundry/uaaclient.rb

@@ -5,7 +5,7 @@ module CFoundry
   class UAAClient
     attr_accessor :target, :client_id, :token, :trace
 
-    def initialize(target = "https://uaa.cloudfoundry.com", client_id = "cf")
+    def initialize(target, client_id = "cf")
       @target = target
       @client_id = client_id
       CF::UAA::Misc.symbolize_keys = true
@@ -24,6 +24,12 @@ module CFoundry
       end
     end
 
+    def user(guid)
+      wrap_uaa_errors do
+        scim.get(:user, guid)
+      end
+    end
+
     def users
       wrap_uaa_errors do
         scim.query(:user)

data/lib/cfoundry/v2/client.rb

@@ -24,7 +24,7 @@ module CFoundry::V2
     # Create a new Client for interfacing with the given target.
     #
     # A token may also be provided to skip the login step.
-    def initialize(target = "http://api.cloudfoundry.com", token = nil)
+    def initialize(target, token = nil)
       @base = Base.new(target, token)
     end
 

data/lib/cfoundry/v2/service_instance.rb

@@ -11,6 +11,6 @@ module CFoundry::V2
 
     scoped_to_space
 
-    queryable_by :name, :space_guid, :service_plan_guid, :service_binding_guid
+    queryable_by :name, :space_guid, :service_plan_guid, :service_binding_guid, :gateway_name
   end
 end

data/lib/cfoundry/v2/user.rb

@@ -40,16 +40,23 @@ module CFoundry
       attr_accessor :emails, :name
 
       def email
+        # if the email collection is nil or empty? collect from UAA
+        get_meta_from_uaa if @emails.nil?
+
         return unless @emails && @emails.first
-        @emails.first[:value]
+        @emails.first["value"]
       end
 
       def given_name
+        get_meta_from_uaa if @name.nil?
+
         return unless @name && @name[:givenName] != email
         @name[:givenName]
       end
 
       def family_name
+        get_meta_from_uaa if @name.nil?
+
         return unless @name && @name[:familyName] != email
         @name[:familyName]
       end
@@ -67,6 +74,20 @@ module CFoundry
         @client.base.uaa.delete_user(guid)
         true
       end
+
+      private 
+
+      def get_meta_from_uaa
+        user = @client.base.uaa.user(guid)
+        return if user.nil?
+        return if not user['error'].nil?
+        
+        @emails = user["emails"]
+        @name ||= {}
+        @name[:familyName] = user["name"]["familyname"]
+        @name[:givenName] = user["name"]["givenname"]
+      end
+
     end
   end
 end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "2.4.0".freeze
+  VERSION = "2.4.1.rc1".freeze
 end

data/spec/cc_api_stub/organizations_spec.rb

@@ -3,7 +3,7 @@ require 'net/http'
 require 'uri'
 
 describe CcApiStub::Organizations do
-  let(:client) { CFoundry::V2::Client.new }
+  let(:client) { build(:client) }
 
   describe ".succeed_to_create" do
     let(:url) { "http://example.com/v2/organizations/" }

data/spec/cfoundry/baseclient_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe CFoundry::BaseClient do
+  subject(:client) { CFoundry::BaseClient.new("http://api.example.com") }
   describe "#request" do
     before do
       subject.stub(:handle_response).with(anything, anything, anything)
@@ -256,15 +257,15 @@ describe CFoundry::BaseClient do
   end
 
   describe "#target=" do
-    let(:base_client) { CFoundry::BaseClient.new }
+    let(:base_client) { CFoundry::BaseClient.new("https://api.example.com") }
     let(:new_target) { "some-target-url.com"}
 
     it "sets a new target" do
-      expect{base_client.target = new_target}.to change {base_client.target}.from("https://api.cloudfoundry.com").to(new_target)
+      expect{base_client.target = new_target}.to change {base_client.target}.from("https://api.example.com").to(new_target)
     end
 
     it "sets a new target on the rest client" do
-      expect{base_client.target = new_target}.to change{base_client.rest_client.target}.from("https://api.cloudfoundry.com").to(new_target)
+      expect{base_client.target = new_target}.to change{base_client.rest_client.target}.from("https://api.example.com").to(new_target)
     end
   end
 end

data/spec/cfoundry/errors_spec.rb

@@ -21,7 +21,7 @@ describe 'Errors' do
   end
 
   describe CFoundry::APIError do
-    let(:request) { { :method => "GET", :url => "http://api.cloudfoundry.com/foo", :headers => {} } }
+    let(:request) { { :method => "GET", :url => "http://api.example.com/foo", :headers => {} } }
     let(:response_body) { "NOT FOUND" }
     let(:response) { { :status => 404, :headers => {}, :body => response_body } }
 

data/spec/cfoundry/rest_client_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe CFoundry::RestClient do
   let(:token) { nil }
-  let(:target) { "https://api.cloudfoundry.com" }
+  let(:target) { "https://api.example.com" }
   let(:rest_client) { CFoundry::RestClient.new(target, token) }
 
   describe '#request' do
@@ -81,7 +81,7 @@ describe CFoundry::RestClient do
           let(:options) { {:params => {}} }
 
           it "does not add a query string delimiter (the question mark)" do
-            request_stub = stub_request(:get, "https://api.cloudfoundry.com/some-path")
+            request_stub = stub_request(:get, "https://api.example.com/some-path")
             subject
             expect(request_stub).to have_been_requested
           end
@@ -91,7 +91,7 @@ describe CFoundry::RestClient do
           let(:options) { {:params => {"key" => "value"}} }
 
           it "appends a query string and delimiter" do
-            request_stub = stub_request(:get, "https://api.cloudfoundry.com/some-path?key=value")
+            request_stub = stub_request(:get, "https://api.example.com/some-path?key=value")
             subject
             expect(request_stub).to have_been_requested
           end
@@ -217,7 +217,7 @@ describe CFoundry::RestClient do
       let(:path) { "/some-path/some-segment" }
 
       it "doesn't add a double slash" do
-        stub = stub_request(:get, "https://api.cloudfoundry.com/some-path/some-segment")
+        stub = stub_request(:get, "https://api.example.com/some-path/some-segment")
         subject
         expect(stub).to have_been_requested
       end
@@ -227,7 +227,7 @@ describe CFoundry::RestClient do
       let(:path) { "some-path/some-segment" }
 
       it "doesn't add a double slash" do
-        stub = stub_request(:get, "https://api.cloudfoundry.com/some-path/some-segment")
+        stub = stub_request(:get, "https://api.example.com/some-path/some-segment")
         subject
         expect(stub).to have_been_requested
       end
@@ -258,7 +258,7 @@ describe CFoundry::RestClient do
       end
 
       it "prints the request and the response" do
-        rest_client.should_receive(:print_request).with({:headers => {"Content-Length" => 0}, :url => "https://api.cloudfoundry.com/some-path", :method => "GET", :body => nil})
+        rest_client.should_receive(:print_request).with({:headers => {"Content-Length" => 0}, :url => "https://api.example.com/some-path", :method => "GET", :body => nil})
         rest_client.should_receive(:print_response).with({:status => "200", :headers => {"content-type" => "application/json"}, :body => '{"some": "json"}'})
         subject
       end
@@ -266,11 +266,11 @@ describe CFoundry::RestClient do
 
     describe "following redirects" do
       before do
-        stub_request(:post, "https://api.cloudfoundry.com/apps").to_return(
+        stub_request(:post, "https://api.example.com/apps").to_return(
           :status => 301,
-          :headers => {"location" => "https://api.cloudfoundry.com/apps/some-guid"}
+          :headers => {"location" => "https://api.example.com/apps/some-guid"}
         )
-        stub_request(:get, "https://api.cloudfoundry.com/apps/some-guid").to_return(
+        stub_request(:get, "https://api.example.com/apps/some-guid").to_return(
           :status => 200,
           :body => '{"some": "json"}'
         )
@@ -291,7 +291,7 @@ describe CFoundry::RestClient do
     describe ".create" do
       let(:http_proxy) { '' }
       let(:https_proxy) { '' }
-      let(:target_uri) { "http://cloudfoundry.com" }
+      let(:target_uri) { "http://api.example.com" }
 
       subject { CFoundry::RestClient::HTTPFactory.create(URI.parse(target_uri), http_proxy, https_proxy) }
 
@@ -304,7 +304,7 @@ describe CFoundry::RestClient do
       end
 
       context "when the target is an https URI" do
-        let(:target_uri) { "https://cloudfoundry.com" }
+        let(:target_uri) { "https://example.com" }
         it "should return an instance of the plain Net:HTTP class with use_ssl" do
           expect(subject).to be_instance_of(Net::HTTP)
           expect(subject.use_ssl?).to be_true
@@ -333,7 +333,7 @@ describe CFoundry::RestClient do
       end
 
       context "when a https proxy URI is set and the target is an https URI" do
-        let(:target_uri) { "https://cloudfoundry.com" }
+        let(:target_uri) { "https://example.com" }
         let(:https_proxy) { "http://exapmle.com:8080" }
 
         it "should return an instance of the proxy class" do
@@ -342,7 +342,7 @@ describe CFoundry::RestClient do
       end
 
       context "when a https proxy URI is set and the target is an http URI" do
-        let(:target_uri) { "http://cloudfoundry.com" }
+        let(:target_uri) { "http://example.com" }
         let(:https_proxy) { "http://exapmle.com:8080" }
 
         it "should return an instance of the plain Net:HTTP class" do
@@ -351,7 +351,7 @@ describe CFoundry::RestClient do
       end
 
       context "when a http proxy URI is set and the target is an https URI" do
-        let(:target_uri) { "https://cloudfoundry.com" }
+        let(:target_uri) { "https://example.com" }
         let(:http_proxy) { "http://exapmle.com:8080" }
 
         it "should return an instance of the plain Net:HTTP class" do

data/spec/cfoundry/trace_helpers_spec.rb

@@ -5,7 +5,7 @@ describe CFoundry::TraceHelpers do
   let(:request) do
     {
       :method => "GET",
-      :url => "http://api.cloudfoundry.com/foo",
+      :url => "http://api.example.com/foo",
       :headers => { "bb-foo" => "bar", "accept" => "*/*" }
     }
   end
@@ -26,7 +26,7 @@ describe CFoundry::TraceHelpers do
   end
 
   describe "#request_trace" do
-    let(:request_trace) { "REQUEST: GET http://api.cloudfoundry.com/foo" }
+    let(:request_trace) { "REQUEST: GET http://api.example.com/foo" }
     let(:header_trace) { "REQUEST_HEADERS:\n  accept : */*\n  bb-foo : bar" }
     let(:body_trace) { "" }
 
@@ -53,7 +53,7 @@ describe CFoundry::TraceHelpers do
       let(:request) do
         {
             :method => "GET",
-            :url => "http://api.cloudfoundry.com/foo",
+            :url => "http://api.example.com/foo",
             :headers => { 'Authorization' => "SECRET STUFF" }
         }
       end
@@ -71,7 +71,7 @@ describe CFoundry::TraceHelpers do
     end
 
     context "with a JSON response body" do
-      let(:response_body) { "{\"name\": \"vcap\",\"build\": 2222,\"support\": \"http://support.cloudfoundry.com\"}" }
+      let(:response_body) { "{\"name\": \"vcap\",\"build\": 2222,\"support\": \"http://support.example.com\"}" }
       let(:response_trace) { "RESPONSE: [404]\nRESPONSE_HEADERS:\n\nRESPONSE_BODY:\n#{MultiJson.dump(MultiJson.load(response_body), :pretty => true)}" }
 
       include_examples "response_trace tests"

data/spec/cfoundry/uaaclient_spec.rb

@@ -68,7 +68,7 @@ EOF
     let(:password) { "test" }
     let(:creds) { {:username => username, :password => password} }
     let(:state) { 'somestate' }
-    let(:redirect_uri) { 'https://uaa.cloudfoundry.com/redirect/cf' }
+    let(:redirect_uri) { 'https://uaa.example.com/redirect/cf' }
     let(:auth) { Object.new }
     let(:issuer) { Object.new }
 

data/spec/cfoundry/v2/base_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe CFoundry::V2::Base do
-  let(:target) { "https://api.cloudfoundry.com" }
+  let(:target) { "https://api.example.com" }
   let(:base) { CFoundry::V2::Base.new(target) }
 
   describe "helper methods for HTTP verbs" do
@@ -17,7 +17,7 @@ describe CFoundry::V2::Base do
           let(:options) { {:accept => :json} }
 
           it 'returns the parsed JSON' do
-            stub_request(:any, 'https://api.cloudfoundry.com/some-path').to_return(:status => 200, :body => "{\"hello\": \"there\"}")
+            stub_request(:any, 'https://api.example.com/some-path').to_return(:status => 200, :body => "{\"hello\": \"there\"}")
             expect(subject).to eq(:hello => "there")
           end
         end
@@ -26,7 +26,7 @@ describe CFoundry::V2::Base do
           let(:options) { {:accept => :form} }
 
           it 'returns the body' do
-            stub_request(:any, 'https://api.cloudfoundry.com/some-path').to_return :status => 200, :body =>  "body"
+            stub_request(:any, 'https://api.example.com/some-path').to_return :status => 200, :body =>  "body"
             expect(subject).to eq "body"
           end
         end
@@ -36,7 +36,7 @@ describe CFoundry::V2::Base do
         let(:response_code) { 404 }
 
         it 'raises the correct error if JSON is parsed successfully' do
-          stub_request(:any, 'https://api.cloudfoundry.com/some-path').to_return(
+          stub_request(:any, 'https://api.example.com/some-path').to_return(
             :status => response_code,
             :body =>  "{\"code\": 111, \"description\": \"Something bad happened\"}"
           )
@@ -44,7 +44,7 @@ describe CFoundry::V2::Base do
         end
 
         it 'raises the correct error if code is missing from response' do
-          stub_request(:any, 'https://api.cloudfoundry.com/some-path').to_return(
+          stub_request(:any, 'https://api.example.com/some-path').to_return(
             :status => response_code,
             :body =>  "{\"description\": \"Something bad happened\"}"
           )
@@ -52,7 +52,7 @@ describe CFoundry::V2::Base do
         end
 
         it 'raises the correct error if response body is not JSON' do
-          stub_request(:any, 'https://api.cloudfoundry.com/some-path').to_return(
+          stub_request(:any, 'https://api.example.com/some-path').to_return(
             :status => response_code,
             :body =>  "Error happened"
           )
@@ -60,7 +60,7 @@ describe CFoundry::V2::Base do
         end
 
         it 'raises a generic APIError if code is not recognized' do
-          stub_request(:any, 'https://api.cloudfoundry.com/some-path').to_return :status => response_code,
+          stub_request(:any, 'https://api.example.com/some-path').to_return :status => response_code,
             :body =>  "{\"code\": 6932, \"description\": \"Something bad happened\"}"
           expect {subject}.to raise_error CFoundry::APIError, "6932: Something bad happened"
         end
@@ -120,7 +120,7 @@ describe CFoundry::V2::Base do
               :headers => { "Content-Length" => 0 },
               :method => verb,
               :body => nil,
-              :url => "https://api.cloudfoundry.com/some-path"
+              :url => "https://api.example.com/some-path"
             })
           end
         end
@@ -175,7 +175,7 @@ describe CFoundry::V2::Base do
     let(:request) do
       {
         :method => "GET",
-        :url => "http://api.cloudfoundry.com/some-path",
+        :url => "http://api.example.com/some-path",
         :headers => { "some-header-key" => "some-header-value" },
         :body => "some-body"
       }
@@ -234,7 +234,7 @@ describe CFoundry::V2::Base do
     let(:fingerprints) { "some-fingerprints" }
 
     it "makes a PUT request to the resource_match endpoint with the correct payload" do
-      stub = stub_request(:put, "https://api.cloudfoundry.com/v2/resource_match").
+      stub = stub_request(:put, "https://api.example.com/v2/resource_match").
         with(:body => fingerprints).
         to_return(:body => "{}")
       base.resource_match(fingerprints)
@@ -248,7 +248,7 @@ describe CFoundry::V2::Base do
     let(:fake_zipfile) { File.new("#{SPEC_ROOT}/fixtures/empty_file") }
 
     it "makes a PUT request to the app bits endpoint with the correct payload" do
-      stub = stub_request(:put, "https://api.cloudfoundry.com/v2/apps/#{guid}/bits").to_return(:body => "{}")
+      stub = stub_request(:put, "https://api.example.com/v2/apps/#{guid}/bits").to_return(:body => "{}")
       base.upload_app(guid, fake_zipfile)
       expect(stub).to have_been_requested
     end
@@ -258,7 +258,7 @@ describe CFoundry::V2::Base do
         stub =
           stub_request(
             :put,
-            "https://api.cloudfoundry.com/v2/apps/#{guid}/bits"
+            "https://api.example.com/v2/apps/#{guid}/bits"
           ).with { |request|
             request.body =~ /name="resources"/ &&
               request.body !~ /name="application"/
@@ -274,8 +274,8 @@ describe CFoundry::V2::Base do
   describe "#stream_file" do
     let(:app_guid) { "1234" }
     let(:instance_guid) { "3456" }
-    let(:api_url) { "https://api.cloudfoundry.com/v2/apps/#{app_guid}/instances/#{instance_guid}/files/some/path/segments" }
-    let(:file_url) { "http://api.cloudfoundry.com/static/path/to/some/file" }
+    let(:api_url) { "https://api.example.com/v2/apps/#{app_guid}/instances/#{instance_guid}/files/some/path/segments" }
+    let(:file_url) { "http://api.example.com/static/path/to/some/file" }
 
     before do
       base.stub(:token) { CFoundry::AuthToken.new("bearer foo") }

data/spec/cfoundry/v2/client_spec.rb

@@ -3,10 +3,10 @@ require "spec_helper"
 module CFoundry
   module V2
     describe Client do
-      let(:client) { build(:client) }
+      subject(:client) { build(:client) }
 
       describe "#register" do
-        let(:uaa) { UAAClient.new }
+        let(:uaa) { UAAClient.new('http://uaa.example.com') }
         let(:email) { "test@test.com" }
         let(:password) { "secret" }
 
@@ -77,11 +77,11 @@ module CFoundry
         let(:new_target) { "some-target-url.com"}
 
         it "sets a new target" do
-          expect{client.target = new_target}.to change {client.target}.from("http://api.cloudfoundry.com").to(new_target)
+          expect{client.target = new_target}.to change {client.target}.from("http://api.example.com").to(new_target)
         end
 
         it "sets a new target on the base client" do
-          expect{client.target = new_target}.to change{client.base.target}.from("http://api.cloudfoundry.com").to(new_target)
+          expect{client.target = new_target}.to change{client.base.target}.from("http://api.example.com").to(new_target)
         end
       end
     end

data/spec/cfoundry/v2/service_instance_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+module CFoundry
+  module V2
+    describe ServiceInstance do
+      let(:client) { build(:client) }
+      subject { build(:service_instance, :client => client) }
+
+      describe "space" do
+        let(:space) { build(:space) }
+
+        it "has a space" do
+          subject.space = space
+          expect(subject.space).to eq(space)
+        end
+
+        context "when an invalid value is assigned" do
+          it "raises a Mismatch exception" do
+            expect {
+              subject.space = [build(:organization)]
+            }.to raise_error(CFoundry::Mismatch)
+          end
+        end
+      end
+
+      describe "service_plan" do
+        let(:service_plan) { build(:service_plan) }
+
+        it "has a service plan" do
+          subject.service_plan = service_plan
+          expect(subject.service_plan).to eq(service_plan)
+        end
+
+        context "when an invalid value is assigned" do
+          it "raises a Mismatch exception" do
+            expect {
+              subject.space = [build(:organization)]
+            }.to raise_error(CFoundry::Mismatch)
+          end
+        end
+      end
+
+      describe 'query params' do
+        it 'allows query by name' do
+          client.should respond_to(:service_instance_by_name)
+        end
+
+        it 'allows query by space_guid' do
+          client.should respond_to(:service_instance_by_space_guid)
+        end
+
+        it 'allows query by gateway_name' do
+          client.should respond_to(:service_instance_by_gateway_name)
+        end
+
+        it 'allows query by service_plan_guid' do
+          client.should respond_to(:service_instance_by_service_plan_guid)
+        end
+
+        it 'allows query by service_binding_guid' do
+          client.should respond_to(:service_instance_by_service_binding_guid)
+        end
+      end
+    end
+  end
+end

data/spec/cfoundry/v2/user_spec.rb

@@ -30,6 +30,177 @@ module CFoundry
           end
         end
       end
+
+      describe '#get_meta_from_uaa' do
+        
+        let(:api_target) { 'http://api.example.com' } 
+        let(:login_target) { 'https://login.example.com' }
+        let(:uaa_target) { 'https://uaa.example.com' }
+        let(:user_email) { 'test-user@example.com' }
+        let(:given_name) { 'John' }
+        let(:family_name) { 'Doe' }
+ 
+        before do
+
+          stub_request(:get, "#{api_target}/info").to_return :status => 200,
+          :headers => {'Content-Type' => 'application/json'},
+          :body => <<EOF
+            {
+              "name": "vcap",
+              "build": "2222",
+              "support": "http://support.example.com",
+              "version": 2,
+              "description": "Cloud Foundry sponsored by Pivotal",
+              "authorization_endpoint": "https://login.example.com",
+              "token_endpoint": "https://uaa.example.com",
+              "allow_debug": true,
+              "user": "00000000-0000-0000-0000-000000000000",
+              "limits": {
+                "memory": 2048,
+                "app_uris": 4,
+                "services": 16,
+                "apps": 20
+              },
+              "usage": {
+                "memory": 896,
+                "apps": 4,
+                "services": 6
+              }
+            }
+EOF
+
+          stub_request(:get, "#{login_target}/login").to_return :status => 200,
+          :headers => {'Content-Type' => 'application/json'},
+          :body => <<EOF
+            {
+              "timestamp": "2013-06-12T22:32:57-0700",
+              "app": {
+                "artifact": "cloudfoundry-login-server",
+                "description": "Cloud Foundry Login App",
+                "name": "Cloud Foundry Login",
+                "version": "1.2.3"
+              },
+              "links": {
+                "register": "https://console.example.com/register",
+                "passwd": "https://console.example.com/password_resets/new",
+                "home": "https://console.example.com",
+                "login": "https://login.example.com",
+                "uaa": "https://uaa.example.com"
+              },
+              "analytics": {
+                "code": "UA-00000000-00",
+                "domain": "example.com"
+              },
+              "commit_id": "0000000",
+              "prompts": {
+                "username": [
+                  "text",
+                  "Email"
+                ],
+                "password": [
+                  "password",
+                  "Password"
+                ]
+              }
+            }
+EOF
+
+          stub_request(:get, /#{uaa_target}\/Users\/user-guid-\d{1,2}/).to_return :status => 200,
+          :headers => {'Content-Type' => 'application/json'},
+          :body => <<EOF
+          {
+            "id": "00000000-0000-0000-0000-000000000000",
+            "meta": {
+              "version": 0,
+              "created": "2013-06-24T13:44:38.000Z",
+              "lastModified": "2013-06-24T13:44:38.000Z"
+            },
+            "userName": "#{user_email}",
+            "name": {
+              "familyName": "#{family_name}",
+              "givenName": "#{given_name}"
+            },
+            "emails": [
+              {
+                "value": "#{user_email}"
+              }
+            ],
+            "groups": [
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "password.write",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "openid",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "uaa.user",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "scim.userids",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "approvals.me",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "cloud_controller.write",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "scim.me",
+                "type": "DIRECT"
+              },
+              {
+                "value": "00000000-0000-0000-0000-000000000000",
+                "display": "cloud_controller.read",
+                "type": "DIRECT"
+              }
+            ],
+            "approvals": [
+
+            ],
+            "active": true,
+            "schemas": [
+              "urn:scim:schemas:core:1.0"
+            ]
+          }
+EOF
+        end
+
+        it "retrieves metadata from the UAA" do
+          subject.email.should == user_email
+          subject.given_name.should == given_name
+          subject.family_name.should == family_name
+          subject.full_name.should == "#{given_name} #{family_name}"
+        end
+
+        it "should be nil if user doesn't have permission to query uaa" do
+
+          stub_request(:get, /#{uaa_target}\/Users\/user-guid-\d{1,2}/).to_return :status => 200,
+          :headers => {'Content-Type' => 'application/json'},
+          :body => <<EOF
+          {
+            "error": "access_denied",
+            "error_description": "Access is denied"
+          }
+EOF
+          subject.email.should == nil
+          subject.given_name.should == nil
+          subject.family_name.should == nil
+        end
+
+      end
     end
   end
 end

data/spec/factories/clients_factory.rb

@@ -1,5 +1,7 @@
 FactoryGirl.define do
   factory :client, :class => CFoundry::V2::Client do
-
+    initialize_with do
+      new("http://api.example.com")
+    end
   end
 end

data/spec/factories/service_instances_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :service_instance, :class => CFoundry::V2::ServiceInstance do
+    sequence(:guid) { |n| "service-instance-guid-#{n}" }
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/service_plans_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :service_plan, :class => CFoundry::V2::ServicePlan do
+    sequence(:guid) { |n| "service-plan-guid-#{n}" }
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/fixtures/fake_cc_space_summary.json

@@ -6,10 +6,10 @@
       "guid":"application-id-1",
       "name":"application-name-1",
       "routes":[
-        { "guid": "aa14f148-3d82-4db3-982e-fe0fd00582f4", "host": "app", "domain": { "name": "cloudfoundry.com"}}
+        { "guid": "aa14f148-3d82-4db3-982e-fe0fd00582f4", "host": "app", "domain": { "name": "example.com"}}
       ],
       "urls":[
-        "app.cloudfoundry.com"
+        "app.example.com"
       ],
       "state":"STARTED",
       "memory":128,
@@ -25,12 +25,12 @@
       "guid":"application-id-2",
       "name":"application-name-2",
       "routes":[
-        { "guid": "a14c5666-5354-49a7-8da8-2c29eaaaac18", "host": "app2-1", "domain": { "name": "cloudfoundry.com"}},
-        { "guid": "7c183670-2e4b-4dd1-b2b5-d7ada5d470fb", "host": "app2-2", "domain": { "name": "cloudfoundry.com"}}
+        { "guid": "a14c5666-5354-49a7-8da8-2c29eaaaac18", "host": "app2-1", "domain": { "name": "example.com"}},
+        { "guid": "7c183670-2e4b-4dd1-b2b5-d7ada5d470fb", "host": "app2-2", "domain": { "name": "example.com"}}
       ],
       "urls":[
-        "app2-1.cloudfoundry.com",
-        "app2-2.cloudfoundry.com"
+        "app2-1.example.com",
+        "app2-2.example.com"
       ],
       "state":"STOPPED",
       "memory":256,

data/spec/integration/client_spec.rb

@@ -22,14 +22,14 @@ describe CFoundry::V2::Client do
     if ENV["CF_V2_RUN_INTEGRATION"]
       it "requires a re-login" do
         client = CFoundry::V2::Client.new("http://api." + a1_domain)
-        client.login(ENV["CF_V2_TEST_USER"], ENV["CF_V2_TEST_PASSWORD"])
+        client.login({username: ENV["CF_V2_TEST_USER"], password: ENV["CF_V2_TEST_PASSWORD"]})
         client.quota_definitions # Getting quota definitions will always be the shortest request that requires auth
 
         client.target = nil
         client.target = "http://api." + a1_domain
         expect { client.quota_definitions }.to raise_error(CFoundry::InvalidAuthToken)
 
-        client.login(ENV["CF_V2_TEST_USER"], ENV["CF_V2_TEST_PASSWORD"])
+        client.login({username: ENV["CF_V2_TEST_USER"], password: ENV["CF_V2_TEST_PASSWORD"]})
         client.quota_definitions
       end
     end

data/spec/support/shared_examples/client_login_examples.rb

@@ -1,5 +1,5 @@
 shared_examples_for 'client login prompts' do
-  let(:uaa) { CFoundry::UAAClient.new }
+  let(:uaa) { CFoundry::UAAClient.new('http://uaa.example.com') }
   let(:prompts) do
     {
       :user_id => ["text", "User ID"],
@@ -22,7 +22,7 @@ end
 shared_examples_for 'client login' do
   let(:email) { 'test@test.com' }
   let(:password) { 'secret' }
-  let(:uaa) { CFoundry::UAAClient.new }
+  let(:uaa) { CFoundry::UAAClient.new('http://uaa.example.com') }
   let(:access_token) { "some-access-token" }
   let(:token_info) { CF::UAA::TokenInfo.new({ :access_token => access_token, :token_type => "bearer" }) }
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.4.0
-  prerelease: 
+  version: 2.4.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -337,6 +337,7 @@ files:
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/route_spec.rb
+- spec/cfoundry/v2/service_instance_spec.rb
 - spec/cfoundry/v2/space_spec.rb
 - spec/cfoundry/v2/user_spec.rb
 - spec/cfoundry/validator_spec.rb
@@ -347,6 +348,8 @@ files:
 - spec/factories/organizations_factory.rb
 - spec/factories/quota_definitions_factory.rb
 - spec/factories/routes_factory.rb
+- spec/factories/service_instances_factory.rb
+- spec/factories/service_plans_factory.rb
 - spec/factories/spaces_factory.rb
 - spec/factories/users_factory.rb
 - spec/fixtures/apps/with_cfignore/ambiguous_ignored
@@ -416,16 +419,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3185654219291849147
+      hash: -3405419350059499948
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3185654219291849147
+      version: 1.3.1
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25
@@ -467,6 +467,7 @@ test_files:
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/route_spec.rb
+- spec/cfoundry/v2/service_instance_spec.rb
 - spec/cfoundry/v2/space_spec.rb
 - spec/cfoundry/v2/user_spec.rb
 - spec/cfoundry/validator_spec.rb
@@ -477,6 +478,8 @@ test_files:
 - spec/factories/organizations_factory.rb
 - spec/factories/quota_definitions_factory.rb
 - spec/factories/routes_factory.rb
+- spec/factories/service_instances_factory.rb
+- spec/factories/service_plans_factory.rb
 - spec/factories/spaces_factory.rb
 - spec/factories/users_factory.rb
 - spec/fixtures/apps/with_cfignore/ambiguous_ignored