cfoundry 2.2.0rc3 → 2.3.0

data/lib/cfoundry/baseclient.rb

@@ -134,6 +134,8 @@ module CFoundry
 
     def handle_response(response, options, request)
       if status_is_successful?(response[:status].to_i)
+        uaa.delete_user(options[:params][:user_delete]) if options[:params] && options[:params][:user_delete]
+
         handle_successful_response(response, options)
       else
         handle_error_response(response, request)

data/lib/cfoundry/v2/domain.rb

@@ -2,11 +2,19 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class Domain < Model
+    validates_presence_of :name
+    validates_format_of :name, :with => /\A([^\.]+\.)+[^\.]+\Z/
+    validates_presence_of :owning_organization
+
     attribute :name, :string
     attribute :wildcard, :boolean
     to_one    :owning_organization, :as => :organization, :default => nil
     to_many   :spaces
 
     queryable_by :name, :owning_organization_guid, :space_guid
+
+    def system?
+      guid.present? && !owning_organization.present?
+    end
   end
 end

data/lib/cfoundry/v2/user.rb

@@ -1,64 +1,71 @@
 require "cfoundry/v2/model"
 
-module CFoundry::V2
-  class User < Model
-    to_many   :spaces
-    to_many   :organizations
-    to_many   :managed_organizations, :as => :organization
-    to_many   :billing_managed_organizations, :as => :organization
-    to_many   :audited_organizations, :as => :organization
-    to_many   :managed_spaces, :as => :space
-    to_many   :audited_spaces, :as => :space
-    attribute :admin, :boolean
-    to_one    :default_space, :as => :space
+module CFoundry
+  module V2
+    class User < Model
+      to_many :spaces
+      to_many :organizations
+      to_many :managed_organizations, :as => :organization
+      to_many :billing_managed_organizations, :as => :organization
+      to_many :audited_organizations, :as => :organization
+      to_many :managed_spaces, :as => :space
+      to_many :audited_spaces, :as => :space
+      attribute :admin, :boolean
+      to_one :default_space, :as => :space
 
-    attribute :guid, :string # guid is explicitly set for users
+      attribute :guid, :string # guid is explicitly set for users
 
-    queryable_by :space_guid, :organization_guid, :managed_organization_guid,
-      :billing_managed_organization_guid, :audited_organization_guid,
-      :managed_space_guid, :audited_space_guid
+      queryable_by :space_guid, :organization_guid, :managed_organization_guid,
+                   :billing_managed_organization_guid, :audited_organization_guid,
+                   :managed_space_guid, :audited_space_guid
 
-    def guid
-      @guid
-    end
+      def guid
+        @guid
+      end
 
-    alias set_guid_attribute guid=
+      alias set_guid_attribute guid=
 
-    def guid=(x)
-      @guid = x
-      set_guid_attribute(x)
-    end
+      def guid=(x)
+        @guid = x
+        set_guid_attribute(x)
+      end
 
-    alias :admin? :admin
+      alias :admin? :admin
 
-    def change_password!(new, old)
-      @client.base.uaa.change_password(@guid, new, old)
-    end
+      def change_password!(new, old)
+        @client.base.uaa.change_password(@guid, new, old)
+      end
 
-    # optional metadata from UAA
-    attr_accessor :emails, :name
+      # optional metadata from UAA
+      attr_accessor :emails, :name
 
-    def email
-      return unless @emails && @emails.first
-      @emails.first[:value]
-    end
+      def email
+        return unless @emails && @emails.first
+        @emails.first[:value]
+      end
 
-    def given_name
-      return unless @name && @name[:givenName] != email
-      @name[:givenName]
-    end
+      def given_name
+        return unless @name && @name[:givenName] != email
+        @name[:givenName]
+      end
 
-    def family_name
-      return unless @name && @name[:familyName] != email
-      @name[:familyName]
-    end
+      def family_name
+        return unless @name && @name[:familyName] != email
+        @name[:familyName]
+      end
+
+      def full_name
+        if @name && @name[:fullName]
+          @name[:fullName]
+        elsif given_name && family_name
+          "#{given_name} #{family_name}"
+        end
+      end
 
-    def full_name
-      if @name && @name[:fullName]
-        @name[:fullName]
-      elsif given_name && family_name
-        "#{given_name} #{family_name}"
+      def delete! (options = {})
+        options[:user_delete] = guid
+        super (options)
       end
     end
   end
-end
+end

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/domain_spec.rb

@@ -9,6 +9,43 @@ module CFoundry
       it "should have a spaces association" do
         expect(domain.spaces).to eq([space])
       end
+
+      describe "validations" do
+        subject { build(:domain) }
+        it { should validate_presence_of(:name) }
+        it { should allow_value("run.pivotal.io").for(:name) }
+        it { should_not allow_value("not-a-url").for(:name) }
+        it { should validate_presence_of(:owning_organization) }
+      end
+
+      describe "#system?" do
+        let(:params) { {} }
+        let(:domain) { build(:domain, {:owning_organization => nil, client: client}.merge(params)) }
+        let(:client) { build(:client) }
+
+        context "when the domain is persisted and has no owning organization" do
+          it "returns true" do
+            expect(domain.system?).to be_true
+          end
+        end
+
+        context "when the domain is not persisted" do
+          let(:params) { {:guid => nil} }
+
+          it "returns false" do
+            expect(domain.system?).to be_false
+          end
+        end
+
+        context "when the domain has an owning org" do
+          let(:params) { {:owning_organization => org} }
+          let(:org) { build(:organization) }
+
+          it "returns false" do
+            expect(domain.system?).to be_false
+          end
+        end
+      end
     end
   end
 end

data/spec/cfoundry/v2/user_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+module CFoundry
+  module V2
+    describe User do
+      let(:client) { build(:client) }
+      subject { build(:user, client: client) }
+
+      describe '#delete!' do
+        describe 'when cloud controller was able to delete the user' do
+          before do
+            stub_request(:delete, /v2\/users\/.*/).to_return(:status => 200, :body => "", :headers => {})
+            client.base.stub(:info).and_return({:authorization_endpoint => 'some_endpoint'})
+          end
+
+          it "also removes the user from uaa" do
+            CFoundry::UAAClient.any_instance.should_receive(:delete_user)
+
+            subject.delete!({})
+          end
+        end
+      end
+    end
+  end
+end

data/spec/factories/domains_factory.rb

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

data/spec/fixtures/fake_cc_application_summary.json

@@ -7,11 +7,21 @@
   "routes":[
     { "guid": "route-id",
       "host": "host",
-      "domain": { "guid": "domain-id", "name": "app-domain.com", "owning_organization_guid": "organization-id"}
+      "domain": {
+          "guid": "domain-id",
+          "name": "app-domain.com",
+          "owning_organization_guid": "organization-id",
+          "owning_organization_url": "/v2/organizations/organization-id"
+      }
     },
     { "guid": "route-id-2",
       "host": null,
-      "domain": { "guid": "domain-id", "name": "app-domain.com", "owning_organization_guid": "organization-id"}
+      "domain": {
+          "guid": "domain-id",
+          "name": "app-domain.com",
+          "owning_organization_guid": "organization-id",
+          "owning_organization_url": "/v2/organizations/organization-id"
+      }
     },
     { "guid": "route-id-3",
       "host": "host-3",
@@ -39,8 +49,8 @@
   "file_descriptors":256,
   "disk_quota":256,
   "available_domains":[
-    {"guid":"domain-id", "name":"app-domain.com", "owning_organization_guid":"organization-id"},
-    {"guid":"domain-id-2", "name":"app-domain-2.com", "owning_organization_guid":"organization-id"},
+    {"guid":"domain-id", "name":"app-domain.com", "owning_organization_guid":"organization-id", "owning_organization_url": "/v2/organizations/organization-id"},
+    {"guid":"domain-id-2", "name":"app-domain-2.com", "owning_organization_guid":"organization-id", "owning_organization_url": "/v2/organizations/organization-id"},
     {"guid":"domain-id-3", "name":"vcap.me", "owning_organization_guid":null}
   ]
 }

data/spec/fixtures/fake_cc_domain.json

@@ -8,6 +8,7 @@
   "entity": {
     "name": "domain.com",
     "owning_organization_guid": "organization-id-1",
+    "owning_organization_url": "/v2/organizations/organization-id-1",
     "wildcard": true,
     "spaces_url": "/v2/domains/domain-id-1/spaces",
     "spaces": [

data/spec/fixtures/fake_cc_organization_domains.json

@@ -29,6 +29,7 @@
       "entity": {
         "name": "domain2.com",
         "owning_organization_guid": "organization-id-1",
+        "owning_organization_url": "/v2/organizations/organization-id-1",
         "wildcard": true,
         "spaces_url": "/v2/domains/domain-id-2/spaces",
         "spaces": [

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.2.0rc3
-  prerelease: 5
+  version: 2.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -337,6 +337,7 @@ files:
 - spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/route_spec.rb
 - spec/cfoundry/v2/space_spec.rb
+- spec/cfoundry/v2/user_spec.rb
 - spec/cfoundry/validator_spec.rb
 - spec/factories/app_events_factory.rb
 - spec/factories/apps_factory.rb
@@ -414,9 +415,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25
@@ -459,6 +460,7 @@ test_files:
 - spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/route_spec.rb
 - spec/cfoundry/v2/space_spec.rb
+- spec/cfoundry/v2/user_spec.rb
 - spec/cfoundry/validator_spec.rb
 - spec/factories/app_events_factory.rb
 - spec/factories/apps_factory.rb