cfoundry 0.5.3.rc1 → 0.5.3.rc2

data/lib/cc_api_stub/login.rb

@@ -5,7 +5,7 @@ module CcApiStub
         WebMock::API.stub_request(:get, "#{domain}/info").
           to_return(
             :status => 200,
-            :body => "{\"authorization_endpoint\":\"https://uaa.localhost\"}"
+            :body => "{\"token_endpoint\":\"https://uaa.localhost\"}"
           )
       end
 

data/lib/cfoundry/baseclient.rb

@@ -24,7 +24,11 @@ module CFoundry
 
     def uaa
       @uaa ||= begin
-        if(endpoint = info[:authorization_endpoint])
+        endpoint =
+          info[:token_endpoint] || \
+            info[:authorization_endpoint]
+
+        if endpoint
           uaa = CFoundry::UAAClient.new(endpoint)
           uaa.trace = trace
           uaa.token = token

data/lib/cfoundry/uaaclient.rb

@@ -71,6 +71,12 @@ module CFoundry
       end
     end
 
+    def delete_user(guid)
+      wrap_uaa_errors do
+        scim.delete(:user, guid)
+      end
+    end
+
     def try_to_refresh_token!
       wrap_uaa_errors do
         begin

data/lib/cfoundry/version.rb

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

data/spec/cc_api_stub/login_spec.rb

@@ -8,7 +8,7 @@ describe CcApiStub::Login do
     let(:url) { host + "/info" }
     subject { CcApiStub::Login.succeeds_to_find_uaa(host) }
 
-    it_behaves_like "a stubbed get request", :including_json => {'authorization_endpoint' => 'https://uaa.localhost'}
+    it_behaves_like "a stubbed get request", :including_json => {'token_endpoint' => 'https://uaa.localhost'}
   end
 
   describe '.succeeds_to_login_as_admin' do
@@ -17,4 +17,4 @@ describe CcApiStub::Login do
 
     it_behaves_like "a stubbed post request", :code => 302, :ignore_response => true
   end
-end
+end

data/spec/cfoundry/baseclient_spec.rb

@@ -103,8 +103,10 @@ describe CFoundry::BaseClient do
 
   describe "UAAClient" do
     context "with a valid uaa endpoint" do
+      let(:info) { { :token_endpoint => "http://uaa.example.com" } }
+
       before do
-        stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
+        stub(subject).info { info }
       end
 
       describe "#uaa" do
@@ -122,6 +124,15 @@ describe CFoundry::BaseClient do
           stub(subject).token { token }
           expect(subject.uaa.token).to eq token
         end
+
+        context "with the endpoint as 'authorization_endpoint'" do
+          let(:info) { { :authorization_endpoint => "foo" } }
+
+          it "uses it to create the UAAClient" do
+            expect(subject.uaa).to be_a CFoundry::UAAClient
+            expect(subject.uaa.target).to eq "foo"
+          end
+        end
       end
 
       describe "#token=" do
@@ -161,7 +172,7 @@ describe CFoundry::BaseClient do
   describe "#password_score" do
     context "with a uaa" do
       before do
-        stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
+        stub(subject).info { { :token_endpoint => "http://uaa.example.com" } }
       end
 
       it "delegates to the uaa's password strength method" do

data/spec/cfoundry/uaaclient_spec.rb

@@ -243,6 +243,30 @@ EOF
     end
   end
 
+  describe "#delete_user" do
+    let(:guid) { "123" }
+    let!(:req) {
+      stub_request(
+        :delete,
+        "https://uaa.example.com/Users/123"
+      ).to_return(:status => 200, :body => '{ "foo": "bar" }')
+    }
+
+    subject { uaa }
+
+    it "wraps uaa errors" do
+      mock(uaa).wrap_uaa_errors
+      subject.delete_user(guid)
+    end
+
+    context 'with valid data' do
+      it "should add a user" do
+        subject.delete_user(guid)
+        expect(req).to have_been_requested
+      end
+    end
+  end
+
   describe "#wrap_uaa_errors" do
     subject { uaa.send(:wrap_uaa_errors) { raise error } }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: -1252421856
+  hash: -1906723574
   prerelease: 6
   segments: 
   - 0
   - 5
   - 3
   - rc
-  - 1
-  version: 0.5.3.rc1
+  - 2
+  version: 0.5.3.rc2
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-06 00:00:00 Z
+date: 2013-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement