cfoundry 0.6.0 → 0.6.1.rc1

data/lib/cc_api_stub/domains.rb

@@ -21,6 +21,12 @@ module CcApiStub
         response_body = Helper.load_fixtures("fake_cc_created_domain")
         stub_put(%r{/v2/domains/[^/]+/spaces/[^/]+$}, {}, response(201, response_body))
       end
+
+      private
+
+      def object_endpoint
+        %r{/v2/domains/[^/]+$}
+      end
     end
   end
 end

data/lib/cc_api_stub/services.rb

@@ -3,10 +3,6 @@ module CcApiStub
     extend Helper
 
     class << self
-      def succeed_to_load
-        stub_get(collection_endpoint, {}, response(200, services_fixture))
-      end
-
       def service_fixture_hash
         MultiJson.load(services_fixture["resources"].first.to_json, :symbolize_keys => true)
       end
@@ -18,7 +14,7 @@ module CcApiStub
       end
 
       def services_fixture
-        Helper.load_fixtures("fake_cc_service_types")
+        Helper.load_fixtures("fake_cc_services")
       end
     end
   end

data/lib/cfoundry/version.rb

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

data/spec/cc_api_stub/domains_spec.rb

@@ -30,4 +30,11 @@ describe CcApiStub::Domains do
 
     it_behaves_like "a stubbed put request", :code => 201
   end
-end
+
+  describe ".succeed_to_update" do
+    let(:url) { "http://example.com/v2/domains/domain-id-1" }
+    subject { CcApiStub::Domains.succeed_to_update }
+
+    it_behaves_like "a stubbed put request"
+  end
+end

data/spec/cc_api_stub/services_spec.rb

@@ -3,10 +3,9 @@ require 'net/http'
 require 'uri'
 
 describe CcApiStub::Services do
-  describe ".succeed_to_load" do
-    let(:url) { "http://example.com/v2/services?inline-relations-depth=1" }
-    subject { CcApiStub::Services.succeed_to_load }
-
-    it_behaves_like "a stubbed get request"
+  describe '.service_fixture_hash' do
+    it 'returns the fake services' do
+      CcApiStub::Services.service_fixture_hash.should be_a(Hash)
+    end
   end
-end
+end

data/spec/fixtures/fake_cc_domain.json

@@ -19,7 +19,7 @@
           "updated_at": null
         },
         "entity": {
-          "name": "development",
+          "name": "space-name-1",
           "organization_guid": "organization-id-1",
           "developers_url": "/v2/spaces/space-id-1/developers",
           "managers_url": "/v2/spaces/space-id-1/managers",
@@ -29,6 +29,25 @@
           "service_instances_url": "/v2/spaces/space-id-1/service_instances",
           "organization_url": "/v2/organizations/organization-id-1"
         }
+      },
+      {
+        "metadata": {
+          "guid": "space-id-2",
+          "url": "/v2/spaces/space-id-2",
+          "created_at": "2013-03-11 15:17:38 -0700",
+          "updated_at": null
+        },
+        "entity": {
+          "name": "space-name-2",
+          "organization_guid": "organization-id-1",
+          "developers_url": "/v2/spaces/space-id-2/developers",
+          "managers_url": "/v2/spaces/space-id-2/managers",
+          "auditors_url": "/v2/spaces/space-id-2/auditors",
+          "apps_url": "/v2/spaces/space-id-2/apps",
+          "domains_url": "/v2/spaces/space-id-2/domains",
+          "service_instances_url": "/v2/spaces/space-id-2/service_instances",
+          "organization_url": "/v2/organizations/organization-id-2"
+        }
       }
     ]
   }

data/spec/fixtures/fake_cc_domain_spaces.json

@@ -12,7 +12,7 @@
         "updated_at": null
       },
       "entity": {
-        "name": "development",
+        "name": "space-name-1",
         "organization_guid": "organization-id-1",
         "developers_url": "/v2/spaces/space-id-1/developers",
         "managers_url": "/v2/spaces/space-id-1/managers",

data/spec/fixtures/fake_cc_organization_domains.json

@@ -40,7 +40,7 @@
               "updated_at": null
             },
             "entity": {
-              "name": "development",
+              "name": "space-name-1",
               "organization_guid": "organization-id-1",
               "developers_url": "/v2/spaces/space-id-1/developers",
               "managers_url": "/v2/spaces/space-id-1/managers",

data/spec/fixtures/{fake_cc_service_types.json → fake_cc_services.json}

@@ -17,7 +17,7 @@
         "info_url": "service-info-url",
         "description": "service1-description",
         "service_plans_url": "/v2/services/service-id-1/service_plans",
-        "extra": "{}",
+        "extra": "{\"businessLogicSampleData\":\"goes here\",\"provider\": {\"name\": \"core\"},\"listing\": {\"imageUrl\": \"https://image-url.png\",\"blurb\": \"Manage and monitor your apps\"}}",
         "service_plans": [
           {
             "metadata": {
@@ -27,7 +27,7 @@
             "entity": {
               "name": "300",
               "description": "2TB, 1.7GB Memory, 100 Connections, CPU? (Dedicated)",
-              "extra": "{}",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 3.50, \"bullets\": [\"has memory and things\", \"customer data not included\"]}",
               "service_guid": "service-id-1",
               "service_url": "/v2/services/service-id-1",
               "service_instances_url": "/v2/service_plans/paid-postgresql-id-1/service_instances"
@@ -40,8 +40,8 @@
             },
             "entity": {
               "name": "100",
-              "description": "Free Postgres...",
-              "extra": "{}",
+              "description": "Free Postgres, one per customer",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 23.50, \"bullets\": [\"costs nothing\", \"is a database\"]}",
               "service_guid": "service-id-1",
               "service_url": "/v2/services/service-id-1",
               "service_instances_url": "/v2/service_plans/development-postgresql-id-1/service_instances"
@@ -63,7 +63,7 @@
         "info_url": "service2-info-url",
         "description": "service2-description",
         "service_plans_url": "/v2/services/service-id-2/service_plans",
-        "extra": "{}",
+        "extra": "{\"businessLogicSampleData\":\"goes here\",\"provider\": {\"name\": \"core\"},\"listing\": {\"imageUrl\": \"https://image-url.png\",\"blurb\": \"Manage and monitor your apps\"}}",
         "service_plans": [
           {
             "metadata": {
@@ -73,7 +73,7 @@
             "entity": {
               "name": "100",
               "description": "service-plan-description",
-              "extra": "{}",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 43.50, \"bullets\": [\"it's web scale, like php\", \"this is a bullet\"]}",
               "service_guid": "service-id-1",
               "service_url": "/v2/services/service-id-1",
               "service_instances_url": "/v2/service_plans/development-mongodb-id-1/service_instances"
@@ -87,7 +87,7 @@
             "entity": {
               "name": "200",
               "description": "20GB, 1GB Memory, 10 Connections, CPU? (Shared)",
-              "extra": "{}",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 103.50, \"bullets\": [\"is mongo, and a db\", \"24x7 shards\"]}",
               "service_guid": "service-id-2",
               "service_url": "/v2/services/service-id-2",
               "service_instances_url": "/v2/service_plans/paid-mongodb-id-1/service_instances"
@@ -109,7 +109,7 @@
         "info_url": "service3-info-url",
         "description": "service3-description",
         "service_plans_url": "/v2/services/service-id-3/service_plans",
-        "extra": "{}",
+        "extra": "{\"businessLogicSampleData\":\"goes here\",\"provider\": {\"name\": \"core\"},\"listing\": {\"imageUrl\": \"https://image-url.png\",\"blurb\": \"Manage and monitor your apps\"}}",
         "service_plans": [
           {
             "metadata": {
@@ -117,13 +117,41 @@
               "url": "/v2/service_plans/paid-mongolab-mongodb-id-1"
             },
             "entity": {
-              "name": "200",
-              "description": "20GB, 1GB Memory, 10 Connections, CPU? (Shared)",
-              "extra": "{}",
+              "name": "100",
+              "description": "1GB, 0.25GB Memory, 5 Connections, a CPU",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 0, \"bullets\": [\"it's free as in beer\", \"cheap beer\"]}",
               "service_guid": "service-id-3",
               "service_url": "/v2/services/service-id-3",
               "service_instances_url": "/v2/service_plans/paid-mongolab-mongodb-id-1/service_instances"
             }
+          },
+          {
+            "metadata": {
+              "guid": "paid-mongolab-mongodb-id-2",
+              "url": "/v2/service_plans/paid-mongolab-mongodb-id-2"
+            },
+            "entity": {
+              "name": "200",
+              "description": "2GB, 2GB Memory, 10 Connections, CPU!",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 83.50, \"bullets\": [\"cost is nil for this service\", \"we know nothing about this one\"]}",
+              "service_guid": "service-id-3",
+              "service_url": "/v2/services/service-id-3",
+              "service_instances_url": "/v2/service_plans/paid-mongolab-mongodb-id-2/service_instances"
+            }
+          },
+          {
+            "metadata": {
+              "guid": "paid-mongolab-mongodb-id-3",
+              "url": "/v2/service_plans/paid-mongolab-mongodb-id-3"
+            },
+            "entity": {
+              "name": "300",
+              "description": "2GB, 2GB Memory, 10 Connections, CPU!",
+              "extra": "{\"businessLogicSampleData\":\"goes here\",\"cost\": 102.50, \"bullets\": [\"was grown in a lab\", \"we know nothing about this one\"]}",
+              "service_guid": "service-id-3",
+              "service_url": "/v2/services/service-id-3",
+              "service_instances_url": "/v2/service_plans/paid-mongolab-mongodb-id-3/service_instances"
+            }
           }
         ]
       }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.6.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -320,7 +320,7 @@ files:
 - spec/fixtures/fake_cc_service_bindings.json
 - spec/fixtures/fake_cc_service_instance.json
 - spec/fixtures/fake_cc_service_instances.json
-- spec/fixtures/fake_cc_service_types.json
+- spec/fixtures/fake_cc_services.json
 - spec/fixtures/fake_cc_space.json
 - spec/fixtures/fake_cc_space_summary.json
 - spec/fixtures/fake_cc_spaces.json
@@ -347,18 +347,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3067980602958367259
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: cfoundry
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
@@ -442,7 +439,7 @@ test_files:
 - spec/fixtures/fake_cc_service_bindings.json
 - spec/fixtures/fake_cc_service_instance.json
 - spec/fixtures/fake_cc_service_instances.json
-- spec/fixtures/fake_cc_service_types.json
+- spec/fixtures/fake_cc_services.json
 - spec/fixtures/fake_cc_space.json
 - spec/fixtures/fake_cc_space_summary.json
 - spec/fixtures/fake_cc_spaces.json