cfoundry 1.1.0.rc1 → 1.1.0.rc2

data/lib/cfoundry/v2/model.rb

@@ -159,6 +159,10 @@ module CFoundry::V2
       true
     end
 
+    def to_param
+      persisted? ? @guid.to_s : nil
+    end
+
     def to_key
       persisted? ? [@guid] : nil
     end

data/lib/cfoundry/v2/model_magic.rb

@@ -151,6 +151,7 @@ module CFoundry::V2
 
       define_method(name) do
         return @cache[name] if @cache.key?(name)
+        return nil unless persisted?
 
         @cache[name] =
           if manifest[:entity].key?(json_name)

data/lib/cfoundry/v2/service_instance.rb

@@ -3,6 +3,7 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class ServiceInstance < Model
     attribute :name, :string
+    attribute :dashboard_url, :string
     to_one    :space
     to_one    :service_plan
     to_many   :service_bindings

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/model_spec.rb

@@ -216,6 +216,23 @@ describe CFoundry::V2::Model do
     end
   end
 
+  describe "#to_param" do
+    context "when persisted" do
+      it "returns the guid as a string" do
+        subject.to_param.should be_a(String)
+        subject.to_param.should == guid
+      end
+    end
+
+    context "when not persisted" do
+      let(:guid) { nil }
+
+      it "returns nil" do
+        subject.to_param.should be_nil
+      end
+    end
+  end
+
   describe "#persisted?" do
     context "on a new object" do
       let(:guid) { nil }
@@ -241,4 +258,27 @@ describe CFoundry::V2::Model do
       end
     end
   end
+
+  describe "creating a new object" do
+    describe "getting attributes" do
+      let(:new_object) {
+        client.fake_model_with_attribute
+      }
+
+      it "does not go to cloud controller" do
+        expect {
+          new_object.time
+        }.to_not raise_error
+      end
+
+      it "remembers set values" do
+        new_object.time = "now"
+        new_object.time.should == "now"
+      end
+    end
+  end
+end
+
+class FakeModelWithAttribute < CFoundry::V2::FakeModel
+  attribute :time, :string
 end

data/spec/cfoundry/v2/route_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 module CFoundry::V2

data/spec/fixtures/fake_cc_service_instance.json

@@ -6,13 +6,14 @@
     "updated_at": null
   },
   "entity": {
-    "name": "wut",
+    "name": "service-instance-name-1",
     "service_plan_guid": "service-plan-id-1",
     "space_guid": "space-id-1",
     "gateway_data": {
       "plan": "100",
       "version": "9.0"
     },
+    "dashboard_url": "https://dev3cloudfoundry.appdirect.com/api/custom/cloudfoundry/v1/services/service-instance-id-1/sso",
     "service_bindings_url": "/v2/service_instances/service-instance-id-1/service_bindings",
     "service_bindings": [
       {

data/spec/fixtures/fake_cc_service_instances.json

@@ -0,0 +1,70 @@
+{
+  "total_results": 3,
+  "total_pages": 1,
+  "prev_url": null,
+  "next_url": null,
+  "resources": [
+    {
+      "metadata": {
+        "guid": "service-instance-id-1",
+        "url": "/v2/service_instances/service-instance-id-1",
+        "created_at": "2013-05-02 22:20:15 +0000",
+        "updated_at": null
+      },
+      "entity": {
+        "name": "billing-db",
+        "credentials": {
+          "name": "dfba7bcc1e4984d6e865dacf9f46624a1",
+          "hostname": "mysql-service-cf-internal.csvbuoabzxev.us-east-1.rds.amazonaws.com",
+          "host": "mysql-service-cf-internal.csvbuoabzxev.us-east-1.rds.amazonaws.com",
+          "port": 3306,
+          "user": "u5Ly7kM6yR54H",
+          "username": "u5Ly7kM6yR54H",
+          "password": "p6GsdwKKQRmes",
+          "node_id": "rds_mysql_node_cfinternal_0"
+        },
+        "service_plan_guid": "3757e197-8f8b-4e19-9bc0-111eac4ede21",
+        "space_guid": "space-id-1",
+        "gateway_data": {
+          "plan": "cfinternal",
+          "version": "n/a"
+        },
+        "dashboard_url": "https://dev3cloudfoundry.appdirect.com/api/custom/cloudfoundry/v1/services/service-instance-id-1/sso",
+        "service_bindings_url": "/v2/service_instances/service-instance-id-1/service_bindings",
+        "space_url": "/v2/spaces/space-id-1",
+        "service_plan_url": "/v2/service_plans/3757e197-8f8b-4e19-9bc0-111eac4ede21"
+      }
+    },
+    {
+      "metadata": {
+        "guid": "service-instance-id-2",
+        "url": "/v2/service_instances/service-instance-id-2",
+        "created_at": "2013-05-02 23:59:58 +0000",
+        "updated_at": null
+      },
+      "entity": {
+        "name": "console-db",
+        "credentials": {
+          "name": "d253638cc55d64088ab5fe4639c68464c",
+          "hostname": "mysql-service-cf-internal.csvbuoabzxev.us-east-1.rds.amazonaws.com",
+          "host": "mysql-service-cf-internal.csvbuoabzxev.us-east-1.rds.amazonaws.com",
+          "port": 3306,
+          "user": "ujkG3BChhB7g4",
+          "username": "ujkG3BChhB7g4",
+          "password": "piNlqVQM7iJ62",
+          "node_id": "rds_mysql_node_cfinternal_0"
+        },
+        "service_plan_guid": "3757e197-8f8b-4e19-9bc0-111eac4ede21",
+        "space_guid": "space-id-1",
+        "gateway_data": {
+          "plan": "cfinternal",
+          "version": "n/a"
+        },
+        "dashboard_url": null,
+        "service_bindings_url": "/v2/service_instances/service-instance-id-2/service_bindings",
+        "space_url": "/v2/spaces/space-id-1",
+        "service_plan_url": "/v2/service_plans/3757e197-8f8b-4e19-9bc0-111eac4ede21"
+      }
+    }
+  ]
+}

data/spec/fixtures/fake_cc_space_summary.json

@@ -45,7 +45,7 @@
   ],
   "services":[
     {
-      "guid":"service-id-1",
+      "guid":"service-instance-id-1",
       "name":"service-name-1",
       "bound_app_count":1,
       "service_plan": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -189,13 +189,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,15 +203,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '1.8'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -390,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1889885215026340519
+      hash: 2694169785835555618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       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.