cfoundry 4.5.2 → 4.5.3

data/lib/cc_api_stub.rb

@@ -12,6 +12,7 @@ require "cc_api_stub/service_bindings"
 require "cc_api_stub/service_instances"
 require "cc_api_stub/services"
 require "cc_api_stub/spaces"
+require "cc_api_stub/space_users"
 require "cc_api_stub/users"
 
 module CcApiStub

data/lib/cc_api_stub/organization_users.rb

@@ -4,6 +4,12 @@ module CcApiStub
 
     class << self
       def succeed_to_delete(options = {})
+        if options.has_key? :roles
+          options[:roles].each do |role|
+            stub_delete(object_endpoint(options[:id], role.to_s.pluralize), {}, response(200, ""))
+          end
+        end
+
         stub_delete(object_endpoint(options[:id]), {}, response(200, ""))
       end
 
@@ -13,8 +19,8 @@ module CcApiStub
 
       private
 
-      def object_endpoint(id = nil)
-        %r{/v2/organizations/[^/]+/users/#{id}[^/]+$}
+      def object_endpoint(id = nil, role="users")
+        %r{/v2/organizations/[^/]+/#{role}/#{id}[^/]+$}
       end
     end
   end

data/lib/cc_api_stub/organizations.rb

@@ -56,6 +56,18 @@ module CcApiStub
         stub_get(%r{/v2/organizations/[^\/]+/users\?inline-relations-depth=1}, {}, response(200, users_fixture))
       end
 
+      def spaces_fixture
+        Helper.load_fixtures("fake_cc_organization_spaces")
+      end
+
+      def space_fixture_hash
+        MultiJson.load(spaces_fixture["resources"].first.to_json, :symbolize_keys => true)
+      end
+
+      def succeed_to_load_spaces
+        stub_get(%r{/v2/organizations/[^\/]+/spaces\?inline-relations-depth=1}, {}, response(200, spaces_fixture))
+      end
+
       private
 
       def object_endpoint(id = nil)

data/lib/cc_api_stub/space_users.rb

@@ -0,0 +1,27 @@
+module CcApiStub
+  module SpaceUsers
+    extend Helper
+
+    class << self
+      def succeed_to_delete(options = {})
+        if options.has_key? :roles
+          options[:roles].each do |role|
+            stub_delete(object_endpoint(options[:id], role.to_s.pluralize), {}, response(200, ""))
+          end
+        end
+
+        stub_delete(object_endpoint(options[:id]), {}, response(200, ""))
+      end
+
+      def fail_to_delete(options = {})
+        stub_delete(object_endpoint(options[:id]), {}, response(500))
+      end
+
+      private
+
+      def object_endpoint(id = nil, role="users")
+        %r{/v2/spaces/[^/]+/#{role}/#{id}[^/]+$}
+      end
+    end
+  end
+end

data/lib/cfoundry/v2/organization.rb

@@ -17,5 +17,18 @@ module CFoundry::V2
 
     queryable_by :name, :space_guid, :user_guid, :manager_guid,
       :billing_manager_guid, :auditor_guid
+
+    def delete_user_from_all_roles(user)
+      remove_user(user)
+      remove_manager(user)
+      remove_billing_manager(user)
+      remove_auditor(user)
+
+      spaces.each do |space|
+        space.remove_developer(user)
+        space.remove_auditor(user)
+        space.remove_manager(user)
+      end
+    end
   end
 end

data/lib/cfoundry/version.rb

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

data/spec/cc_api_stub/organization_users_spec.rb

@@ -9,6 +9,22 @@ describe CcApiStub::OrganizationUsers do
     subject { CcApiStub::OrganizationUsers.succeed_to_delete }
 
     it_behaves_like "a stubbed delete request"
+
+    context "when the :roles option is provided" do
+      let(:roles) { [:user, :managers, :auditor] }
+      it "deletes the user from each specified role" do
+        CcApiStub::OrganizationUsers.succeed_to_delete(roles: roles)
+        roles.each do |role|
+          url = "http://example.com/v2/organizations/123/#{role.to_s.pluralize}/94087"
+          uri = URI.parse(url)
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            request = Net::HTTP::Delete.new(url)
+            response = http.request(request)
+            check_response(response, code: 200, ignore_response: true)
+          end
+        end
+      end
+    end
   end
 
   describe ".fail_to_delete" do
@@ -16,4 +32,4 @@ describe CcApiStub::OrganizationUsers do
 
     it_behaves_like "a stubbed delete request", :code => 500, :ignore_response => true
   end
-end
+end

data/spec/cc_api_stub/organizations_spec.rb

@@ -94,4 +94,25 @@ describe CcApiStub::Organizations do
 
     it_behaves_like "a stubbed get request"
   end
+
+  describe '.spaces_fixture' do
+    it "returns the fake spaces" do
+      CcApiStub::Organizations.spaces_fixture.should be_a(Hash)
+    end
+  end
+
+  describe '.space_fixture_hash' do
+    it 'returns the fake space' do
+      fixture = CcApiStub::Organizations.space_fixture_hash
+      fixture.should be_a(Hash)
+      fixture.should == fixture.symbolize_keys
+    end
+  end
+
+  describe '.succeed_to_load_spaces' do
+    let(:url) { "http://example.com/v2/organizations/2342/spaces?inline-relations-depth=1" }
+    subject { CcApiStub::Organizations.succeed_to_load_spaces }
+
+    it_behaves_like "a stubbed get request"
+  end
 end

data/spec/cc_api_stub/space_users_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'net/http'
+require 'uri'
+
+describe CcApiStub::SpaceUsers do
+  let(:url) { "http://example.com/v2/spaces/123/users/94087" }
+
+  describe ".succeed_to_delete" do
+    subject { CcApiStub::SpaceUsers.succeed_to_delete }
+
+    it_behaves_like "a stubbed delete request"
+
+    context "when the :roles option is provided" do
+      let(:roles) { [:developer, :managers, :auditor] }
+      it "deletes the user from each specified role" do
+        CcApiStub::SpaceUsers.succeed_to_delete(roles: roles)
+        roles.each do |role|
+          url = "http://example.com/v2/spaces/123/#{role.to_s.pluralize}/94087"
+          uri = URI.parse(url)
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            request = Net::HTTP::Delete.new(url)
+            response = http.request(request)
+            check_response(response, code: 200, ignore_response: true)
+          end
+        end
+      end
+    end
+  end
+
+  describe ".fail_to_delete" do
+    subject { CcApiStub::SpaceUsers.fail_to_delete }
+
+    it_behaves_like "a stubbed delete request", :code => 500, :ignore_response => true
+  end
+end

data/spec/cfoundry/v2/organization_spec.rb

@@ -23,6 +23,113 @@ module CFoundry
           expect(organization.billing_enabled).to eq(v)
         end
       end
+
+      describe "#delete_user_from_all_roles" do
+        let(:user) { build(:user) }
+        let(:organization) do
+          build(:organization, client: client, users: [user],
+            managers: [user], billing_managers: [user], auditors: [user])
+        end
+
+        let(:status) { 201 }
+
+        let(:delete_from_org_response) do
+          <<-json
+{
+  "metadata": {
+    "guid": "24113d03-204b-4d23-b320-4127ee9c0006",
+    "url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006",
+    "created_at": "2013-08-17T00:47:03+00:00",
+    "updated_at": "2013-08-17T00:47:04+00:00"
+  },
+  "entity": {
+    "name": "dsabeti-the-org",
+    "billing_enabled": false,
+    "quota_definition_guid": "b72b1acb-ff4f-468d-99c0-05cd91012b62",
+    "status": "active",
+    "quota_definition_url": "/v2/quota_definitions/b72b1acb-ff4f-468d-99c0-05cd91012b62",
+    "spaces_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/spaces",
+    "domains_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/domains",
+    "users_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/users",
+    "managers_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/managers",
+    "billing_managers_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/billing_managers",
+    "auditors_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/auditors",
+    "app_events_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006/app_events"
+  }
+}
+json
+        end
+
+        let(:delete_from_space_response) do
+          <<-json
+{
+  "metadata": {
+    "guid": "6825e318-7a3f-4d50-a2a9-dd7088c95347",
+    "url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347",
+    "created_at": "2013-10-18T00:54:34+00:00",
+    "updated_at": null
+  },
+  "entity": {
+    "name": "asdf",
+    "organization_guid": "24113d03-204b-4d23-b320-4127ee9c0006",
+    "organization_url": "/v2/organizations/24113d03-204b-4d23-b320-4127ee9c0006",
+    "developers_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/developers",
+    "managers_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/managers",
+    "auditors_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/auditors",
+    "apps_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/apps",
+    "domains_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/domains",
+    "service_instances_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/service_instances",
+    "app_events_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/app_events",
+    "events_url": "/v2/spaces/6825e318-7a3f-4d50-a2a9-dd7088c95347/events"
+  }
+}
+          json
+        end
+
+        let(:space1) do
+          build(:space, organization: organization,
+            developers: [user], auditors: [user], managers: [user])
+        end
+
+        let(:space2) do
+          build(:space, organization: organization,
+            developers: [user], auditors: [user], managers: [user])
+        end
+
+        before do
+          organization.stub(:spaces).and_return([space1, space2])
+
+          stub_request(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/users/#{user.guid}").to_return(status: status, body: delete_from_org_response)
+          stub_request(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/managers/#{user.guid}").to_return(status: status, body: delete_from_org_response)
+          stub_request(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/billing_managers/#{user.guid}").to_return(status: status, body: delete_from_org_response)
+          stub_request(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/auditors/#{user.guid}").to_return(status: status, body: delete_from_org_response)
+
+          stub_request(:delete, "http://api.example.com/v2/spaces/#{space1.guid}/developers/#{user.guid}").to_return(status: status, body: delete_from_space_response)
+          stub_request(:delete, "http://api.example.com/v2/spaces/#{space1.guid}/managers/#{user.guid}").to_return(status: status, body: delete_from_space_response)
+          stub_request(:delete, "http://api.example.com/v2/spaces/#{space1.guid}/auditors/#{user.guid}").to_return(status: status, body: delete_from_space_response)
+
+          stub_request(:delete, "http://api.example.com/v2/spaces/#{space2.guid}/developers/#{user.guid}").to_return(status: status, body: delete_from_space_response)
+          stub_request(:delete, "http://api.example.com/v2/spaces/#{space2.guid}/managers/#{user.guid}").to_return(status: status, body: delete_from_space_response)
+          stub_request(:delete, "http://api.example.com/v2/spaces/#{space2.guid}/auditors/#{user.guid}").to_return(status: status, body: delete_from_space_response)
+        end
+
+        it "removes the given user from all roles in the org and all its spaces" do
+          organization.delete_user_from_all_roles(user)
+
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/users/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/managers/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/billing_managers/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/organizations/#{organization.guid}/auditors/#{user.guid}")
+
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/spaces/#{space1.guid}/auditors/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/spaces/#{space1.guid}/managers/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/spaces/#{space1.guid}/developers/#{user.guid}")
+
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/spaces/#{space2.guid}/auditors/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/spaces/#{space2.guid}/managers/#{user.guid}")
+          expect(WebMock).to have_requested(:delete, "http://api.example.com/v2/spaces/#{space2.guid}/developers/#{user.guid}")
+        end
+      end
     end
   end
 end

data/spec/fixtures/fake_cc_organization_spaces.json

@@ -0,0 +1,99 @@
+
+{
+  "total_results": 2,
+  "total_pages": 1,
+  "prev_url": null,
+  "next_url": null,
+  "resources": [
+    {
+      "metadata": {
+        "guid": "space-id-1",
+        "url": "/v2/spaces/space-id-1",
+        "created_at": "2012-10-25 14:10:45 -0700",
+        "updated_at": null
+      },
+      "entity": {
+        "name": "space-name-1",
+        "organization_guid": "organization-id-1",
+        "domains_url": "/v2/spaces/space-id-1/domains",
+        "domains": [
+          {
+            "metadata": {
+              "guid": "domain-id-1",
+              "url": "/v2/domains/domain-id-1",
+              "created_at": "2012-10-25 14:08:38 -0700",
+              "updated_at": null
+            },
+            "entity": {
+              "name": "vcap.me",
+              "owning_organization_guid": null
+            }
+          }
+        ],
+        "organization_url": "/v2/organizations/organization-id-1",
+        "organization": {
+          "metadata": {
+            "guid": "organization-id-1",
+            "url": "/v2/organizations/organization-id-1",
+            "created_at": "2012-10-25 14:10:41 -0700",
+            "updated_at": null
+          },
+          "entity": {
+            "name": "organization-name-1",
+            "spaces_url": "/v2/organizations/organization-id-1/spaces",
+            "domains_url": "/v2/organizations/organization-id-1/domains",
+            "users_url": "/v2/organizations/organization-id-1/users",
+            "managers_url": "/v2/organizations/organization-id-1/managers",
+            "billing_managers_url": "/v2/organizations/organization-id-1/billing_managers",
+            "auditors_url": "/v2/organizations/organization-id-1/auditors"
+          }
+        }
+      }
+    },
+    {
+      "metadata": {
+        "guid": "space-id-2",
+        "url": "/v2/spaces/space-id-2",
+        "created_at": "2012-10-25 14:10:45 -0700",
+        "updated_at": null
+      },
+      "entity": {
+        "name": "space-name-2",
+        "organization_guid": "organization-id-1",
+        "domains_url": "/v2/spaces/space-id-2/domains",
+        "domains": [
+          {
+            "metadata": {
+              "guid": "domain-id-1",
+              "url": "/v2/domains/domain-id-1",
+              "created_at": "2012-10-25 14:08:38 -0700",
+              "updated_at": null
+            },
+            "entity": {
+              "name": "vcap.me",
+              "owning_organization_guid": null
+            }
+          }
+        ],
+        "organization_url": "/v2/organizations/organization-id-1",
+        "organization": {
+          "metadata": {
+            "guid": "organization-id-1",
+            "url": "/v2/organizations/organization-id-1",
+            "created_at": "2012-10-25 14:10:41 -0700",
+            "updated_at": null
+          },
+          "entity": {
+            "name": "organization-name-1",
+            "spaces_url": "/v2/organizations/organization-id-1/spaces",
+            "domains_url": "/v2/organizations/organization-id-1/domains",
+            "users_url": "/v2/organizations/organization-id-1/users",
+            "managers_url": "/v2/organizations/organization-id-1/managers",
+            "billing_managers_url": "/v2/organizations/organization-id-1/billing_managers",
+            "auditors_url": "/v2/organizations/organization-id-1/auditors"
+          }
+        }
+      }
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -280,6 +280,7 @@ files:
 - lib/cc_api_stub/service_bindings.rb
 - lib/cc_api_stub/service_instances.rb
 - lib/cc_api_stub/services.rb
+- lib/cc_api_stub/space_users.rb
 - lib/cc_api_stub/spaces.rb
 - lib/cc_api_stub/users.rb
 - lib/cc_api_stub.rb
@@ -344,6 +345,7 @@ files:
 - spec/cc_api_stub/service_bindings_spec.rb
 - spec/cc_api_stub/service_instances_spec.rb
 - spec/cc_api_stub/services_spec.rb
+- spec/cc_api_stub/space_users_spec.rb
 - spec/cc_api_stub/spaces_spec.rb
 - spec/cc_api_stub/users_spec.rb
 - spec/cfoundry/auth_token_spec.rb
@@ -422,6 +424,7 @@ files:
 - spec/fixtures/fake_cc_organization.json
 - spec/fixtures/fake_cc_organization_domains.json
 - spec/fixtures/fake_cc_organization_search.json
+- spec/fixtures/fake_cc_organization_spaces.json
 - spec/fixtures/fake_cc_organization_summary.json
 - spec/fixtures/fake_cc_organization_users.json
 - spec/fixtures/fake_cc_route.json
@@ -462,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2988206602408192095
+      hash: -2392374929846355282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -471,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2988206602408192095
+      hash: -2392374929846355282
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25
@@ -491,6 +494,7 @@ test_files:
 - spec/cc_api_stub/service_bindings_spec.rb
 - spec/cc_api_stub/service_instances_spec.rb
 - spec/cc_api_stub/services_spec.rb
+- spec/cc_api_stub/space_users_spec.rb
 - spec/cc_api_stub/spaces_spec.rb
 - spec/cc_api_stub/users_spec.rb
 - spec/cfoundry/auth_token_spec.rb
@@ -569,6 +573,7 @@ test_files:
 - spec/fixtures/fake_cc_organization.json
 - spec/fixtures/fake_cc_organization_domains.json
 - spec/fixtures/fake_cc_organization_search.json
+- spec/fixtures/fake_cc_organization_spaces.json
 - spec/fixtures/fake_cc_organization_summary.json
 - spec/fixtures/fake_cc_organization_users.json
 - spec/fixtures/fake_cc_route.json