cfoundry 0.5.3.rc5 → 0.5.3.rc6

data/lib/cc_api_stub/domains.rb

@@ -11,6 +11,11 @@ module CcApiStub
       def succeed_to_delete
         stub_delete(%r{/v2/domains/[^/\?]+$}, {}, response(200))
       end
+
+      def succeed_to_load_spaces
+        response_body = Helper.load_fixtures("fake_cc_domain_spaces")
+        stub_get(%r{/v2/domains/[^/]+/spaces.*$}, {}, response(200, response_body))
+      end
     end
   end
 end

data/lib/cc_api_stub/helper.rb

@@ -100,7 +100,7 @@ module CcApiStub
     end
 
     def succeed_to_load_many(options={})
-      response_body = CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_#{object_name.pluralize}", options)
+      response_body = CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name.pluralize}", options)
       stub_get(collection_endpoint, {}, response(200, response_body))
     end
 

data/lib/cfoundry/upload_helpers.rb

@@ -208,7 +208,7 @@ module CFoundry
     end
 
     def all_files(path)
-      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject! do |fn|
+      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject do |fn|
         fn =~ /\.$/
       end
     end

data/lib/cfoundry/v2/domain.rb

@@ -5,7 +5,8 @@ module CFoundry::V2
     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
   end
-end
+end

data/lib/cfoundry/version.rb

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

data/spec/cc_api_stub/domains_spec.rb

@@ -16,4 +16,11 @@ describe CcApiStub::Domains do
 
     it_behaves_like "a stubbed delete request"
   end
+
+  describe ".succeed_to_load_spaces" do
+    let(:url) { "http://example.com/v2/domains/domain-id-1/spaces?inline-relationship-depth=1" }
+    subject { CcApiStub::Domains.succeed_to_load_spaces }
+
+    it_behaves_like "a stubbed get request"
+  end
 end

data/spec/cfoundry/v2/domain_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe CFoundry::V2::Domain do
+  let(:client) { fake_client }
+
+  subject { CFoundry::V2::Domain.new("domain-id-1", client) }
+
+  it "should have a spaces association" do
+    expect(subject.spaces).to eq([])
+  end
+end

data/spec/fixtures/fake_cc_domain.json

@@ -0,0 +1,35 @@
+{
+  "metadata": {
+    "guid": "domain-id-1",
+    "url": "/v2/domains/domain-id-1",
+    "created_at": "2012-09-19 21:03:47 +0000",
+    "updated_at": null
+  },
+  "entity": {
+    "name": "domain.com",
+    "owning_organization_guid": "organization-id-1",
+    "wildcard": true,
+    "spaces_url": "/v2/domains/domain-id-1/spaces",
+    "spaces": [
+      {
+        "metadata": {
+          "guid": "space-id-1",
+          "url": "/v2/spaces/space-id-1",
+          "created_at": "2013-03-11 12:17:38 -0700",
+          "updated_at": null
+        },
+        "entity": {
+          "name": "development",
+          "organization_guid": "organization-id-1",
+          "developers_url": "/v2/spaces/space-id-1/developers",
+          "managers_url": "/v2/spaces/space-id-1/managers",
+          "auditors_url": "/v2/spaces/space-id-1/auditors",
+          "apps_url": "/v2/spaces/space-id-1/apps",
+          "domains_url": "/v2/spaces/space-id-1/domains",
+          "service_instances_url": "/v2/spaces/space-id-1/service_instances",
+          "organization_url": "/v2/organizations/organization-id-1"
+        }
+      }
+    ]
+  }
+}

data/spec/fixtures/fake_cc_domain_spaces.json

@@ -0,0 +1,27 @@
+{
+  "total_results": 1,
+  "total_pages": 1,
+  "prev_url": null,
+  "next_url": null,
+  "resources": [
+    {
+      "metadata": {
+        "guid": "space-id-1",
+        "url": "/v2/spaces/space-id-1",
+        "created_at": "2013-03-11 12:17:38 -0700",
+        "updated_at": null
+      },
+      "entity": {
+        "name": "development",
+        "organization_guid": "organization-id-1",
+        "developers_url": "/v2/spaces/space-id-1/developers",
+        "managers_url": "/v2/spaces/space-id-1/managers",
+        "auditors_url": "/v2/spaces/space-id-1/auditors",
+        "apps_url": "/v2/spaces/space-id-1/apps",
+        "domains_url": "/v2/spaces/space-id-1/domains",
+        "service_instances_url": "/v2/spaces/space-id-1/service_instances",
+        "organization_url": "/v2/organizations/organization-id-1"
+      }
+    }
+  ]
+}

data/spec/fixtures/fake_cc_organization_domains.json

@@ -14,7 +14,9 @@
       "entity": {
         "name": "domain.com",
         "owning_organization_guid": null,
-        "wildcard": true
+        "wildcard": true,
+        "spaces_url": "/v2/domains/domain-id-1/spaces",
+        "spaces": []
       }
     },
     {
@@ -27,7 +29,29 @@
       "entity": {
         "name": "domain2.com",
         "owning_organization_guid": "organization-id-1",
-        "wildcard": true
+        "wildcard": true,
+        "spaces_url": "/v2/domains/domain-id-2/spaces",
+        "spaces": [
+          {
+            "metadata": {
+              "guid": "space-id-1",
+              "url": "/v2/spaces/space-id-1",
+              "created_at": "2013-03-11 12:17:38 -0700",
+              "updated_at": null
+            },
+            "entity": {
+              "name": "development",
+              "organization_guid": "organization-id-1",
+              "developers_url": "/v2/spaces/space-id-1/developers",
+              "managers_url": "/v2/spaces/space-id-1/managers",
+              "auditors_url": "/v2/spaces/space-id-1/auditors",
+              "apps_url": "/v2/spaces/space-id-1/apps",
+              "domains_url": "/v2/spaces/space-id-1/domains",
+              "service_instances_url": "/v2/spaces/space-id-1/service_instances",
+              "organization_url": "/v2/organizations/organization-id-1"
+            }
+          }
+        ]
       }
     }
   ]

data/spec/fixtures/fake_cc_spaces.json

@@ -0,0 +1,92 @@
+[
+  {
+    "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,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: -2049338452
+  hash: 1327074651
   prerelease: 6
   segments: 
   - 0
   - 5
   - 3
   - rc
-  - 5
-  version: 0.5.3.rc5
+  - 6
+  version: 0.5.3.rc6
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,10 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-14 00:00:00 Z
+date: 2013-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: multipart-post
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +33,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  prerelease: false
   type: :runtime
-  name: multipart-post
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: multi_json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +48,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  prerelease: false
   type: :runtime
-  name: multi_json
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rubyzip
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,28 +63,28 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
   type: :runtime
-  name: rubyzip
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: cf-uaa-lib
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15
         segments: 
         - 1
         - 3
-        - 8
-        version: 1.3.8
-  prerelease: false
+        - 10
+        version: 1.3.10
   type: :runtime
-  name: cf-uaa-lib
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +94,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
   type: :development
-  name: rake
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,12 +109,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
-  prerelease: false
   type: :development
-  name: rspec
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: webmock
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,12 +124,12 @@ dependencies:
         - 1
         - 9
         version: "1.9"
-  prerelease: false
   type: :development
-  name: webmock
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rr
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,12 +139,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   type: :development
-  name: rr
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: gem-release
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +153,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  name: gem-release
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: timecop
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -165,10 +167,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  name: timecop
-  requirement: *id010
+  version_requirements: *id010
 description: 
 email: 
 - vcap-dev@googlegroups.com
@@ -270,6 +270,7 @@ files:
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
+- spec/cfoundry/v2/domain_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/space_spec.rb
@@ -307,6 +308,8 @@ files:
 - spec/fixtures/fake_cc_created_service_instance.json
 - spec/fixtures/fake_cc_created_space.json
 - spec/fixtures/fake_cc_created_user.json
+- spec/fixtures/fake_cc_domain.json
+- spec/fixtures/fake_cc_domain_spaces.json
 - spec/fixtures/fake_cc_empty_search.json
 - spec/fixtures/fake_cc_frameworks.json
 - spec/fixtures/fake_cc_organization.json
@@ -322,6 +325,7 @@ files:
 - spec/fixtures/fake_cc_service_types.json
 - spec/fixtures/fake_cc_space.json
 - spec/fixtures/fake_cc_space_summary.json
+- spec/fixtures/fake_cc_spaces.json
 - spec/fixtures/fake_cc_stats.json
 - spec/fixtures/fake_cc_user.json
 - spec/fixtures/fake_cc_user_organizations.json
@@ -396,6 +400,7 @@ test_files:
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
+- spec/cfoundry/v2/domain_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/space_spec.rb
@@ -433,6 +438,8 @@ test_files:
 - spec/fixtures/fake_cc_created_service_instance.json
 - spec/fixtures/fake_cc_created_space.json
 - spec/fixtures/fake_cc_created_user.json
+- spec/fixtures/fake_cc_domain.json
+- spec/fixtures/fake_cc_domain_spaces.json
 - spec/fixtures/fake_cc_empty_search.json
 - spec/fixtures/fake_cc_frameworks.json
 - spec/fixtures/fake_cc_organization.json
@@ -448,6 +455,7 @@ test_files:
 - spec/fixtures/fake_cc_service_types.json
 - spec/fixtures/fake_cc_space.json
 - spec/fixtures/fake_cc_space_summary.json
+- spec/fixtures/fake_cc_spaces.json
 - spec/fixtures/fake_cc_stats.json
 - spec/fixtures/fake_cc_user.json
 - spec/fixtures/fake_cc_user_organizations.json