cfoundry 0.5.1.rc4 → 0.5.1.rc5

data/lib/cfoundry/errors.rb

@@ -1,5 +1,6 @@
 require "net/https"
 require "multi_json"
+require "yaml"
 
 module CFoundry
   # Base class for CFoundry errors (not from the server).

data/lib/cfoundry/version.rb

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

data/spec/cc_api_stub/organizations_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
+require 'net/http'
+require 'uri'
 
 describe CcApiStub::Organizations do
   let(:client) { CFoundry::V2::Client.new }
 
-  describe '.succeed_to_create' do
-    it 'stubs creation of an organization' do
-      CcApiStub::Organizations.succeed_to_create
+  describe ".succeed_to_create" do
+    let(:url) { "http://example.com/v2/organizations/" }
+    subject { CcApiStub::Organizations.succeed_to_create }
 
-      org = client.organization
-      org.create!.should be_true
-      org.guid.should == 'created-organization-id-1'
-    end
+    it_behaves_like "a stubbed post request"
   end
 
+
   describe '.summary_fixture' do
     it 'returns the fake org' do
       CcApiStub::Organizations.summary_fixture.should be_a(Hash)
@@ -20,41 +20,37 @@ describe CcApiStub::Organizations do
   end
 
   describe '.fail_to_find' do
-    it 'fails to find the org' do
-      guid = 'organization-id-1'
-      CcApiStub::Organizations.fail_to_find(guid)
-      client.organization(guid).exists?.should be_false
-    end
+    let(:url) { "http://example.com/v2/organizations/9234" }
+    subject { CcApiStub::Organizations.fail_to_find(9234) }
+
+    it_behaves_like "a stubbed get request", :code => 404
   end
 
   describe '.succeed_to_load_summary' do
-    it 'stubs loading the organization summary' do
-      CcApiStub::Organizations.succeed_to_load_summary
+    let(:url) { "http://example.com/v2/organizations/9234/summary" }
+    subject { CcApiStub::Organizations.succeed_to_load_summary }
+
+    it_behaves_like "a stubbed get request"
+
+    context "when passed a no_spaces option" do
+      subject { CcApiStub::Organizations.succeed_to_load_summary(:no_spaces => true) }
 
-      org = client.organization('organization-id-1')
-      org.summarize!
-      org.spaces[0].should be_a(CFoundry::V2::Space)
+      it_behaves_like "a stubbed get request", :including_json => { "spaces" => [] }
     end
   end
 
   describe '.succeed_to_search' do
-    it 'stubs searching' do
-      org_name = 'yoda'
-      CcApiStub::Organizations.succeed_to_search(org_name)
+    let(:url) { "http://example.com/v2/organizations?inline-relations-depth=1&q=name:orgname" }
+    subject { CcApiStub::Organizations.succeed_to_search("orgname") }
 
-      org = client.organization_by_name(org_name)
-      org.guid.should == 'organization-id-1'
-    end
+    it_behaves_like "a stubbed get request"
   end
 
   describe '.succeed_to_search_none' do
-    it 'stubs searching' do
-      org_name = 'yoda'
-      CcApiStub::Organizations.succeed_to_search_none
+    let(:url) { "http://example.com/v2/organizations?inline-relations-depth=1&q=name:orgname" }
+    subject { CcApiStub::Organizations.succeed_to_search_none }
 
-      org = client.organization_by_name(org_name)
-      org.should be_nil
-    end
+    it_behaves_like "a stubbed get request"
   end
 
   describe '.domains_fixture' do
@@ -72,11 +68,10 @@ describe CcApiStub::Organizations do
   end
 
   describe '.succeed_to_load_domains' do
-    it 'stubs domain loading' do
-      CcApiStub::Organizations.succeed_to_load_domains
-      org = client.organization('organization-id-1')
-      org.domains[0].should be_a(CFoundry::V2::Domain)
-    end
+    let(:url) { "http://example.com/v2/organizations/3434/domains?inline-relations-depth=1" }
+    subject { CcApiStub::Organizations.succeed_to_load_domains }
+
+    it_behaves_like "a stubbed get request"
   end
 
   describe '.users_fixture' do
@@ -94,10 +89,9 @@ describe CcApiStub::Organizations do
   end
 
   describe '.succeed_to_load_users' do
-    it 'stubs users loading' do
-      CcApiStub::Organizations.succeed_to_load_users
-      org = client.organization('organization-id-1')
-      org.users[0].should be_a(CFoundry::V2::User)
-    end
+    let(:url) { "http://example.com/v2/organizations/2342/users?inline-relations-depth=1" }
+    subject { CcApiStub::Organizations.succeed_to_load_users }
+
+    it_behaves_like "a stubbed get request"
   end
 end

data/spec/support/fake_helper.rb

@@ -39,6 +39,7 @@ module Fake
   def fake(attributes = {})
     fake_attributes(attributes).each do |k, v|
       send(:"#{k}=", v)
+      setup_reverse_relationship(v)
     end
 
     self
@@ -114,6 +115,28 @@ module CFoundry::V2
         :guid => random_string("fake-#{object_name}-guid"))
     end
 
+    def setup_reverse_relationship(v)
+      if v.is_a?(Array)
+        v.each do |x|
+          setup_reverse_relationship(x)
+        end
+
+        return
+      end
+
+      return unless v.is_a?(Model)
+
+      relation, type = find_reverse_relationship(v)
+
+      v.client = @client
+
+      if type == :one
+        v.send(:"#{relation}=", self)
+      elsif type == :many
+        v.send(:"#{relation}=", v.send(relation) + [self])
+      end
+    end
+
     def find_reverse_relationship(v)
       singular = object_name
       plural = plural_object_name
@@ -198,4 +221,16 @@ module CFoundry::V2
     end
   end
 
+  Model.objects.each_value do |klass|
+    klass.to_many_relations.each do |plural, _|
+      Fake.define_many_association(klass, plural)
+    end
+
+    FakeClient.class_eval do
+      plural = klass.plural_object_name
+
+      attr_writer plural
+      Fake.define_many_association(self, plural)
+    end
+  end
 end

data/vendor/errors/v2.yml

@@ -1,13 +1,8 @@
-100:
+1000:
   name: InvalidAuthToken
   http_code: 401
   message: "Invalid Auth Token"
 
-1000:
-  name: QuotaDeclined
-  http_code: 400
-  message: "Quota declined: %s"
-
 1001:
   name: MessageParseError
   http_code: 400

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: -2707842676
+  hash: -2275817692
   prerelease: 6
   segments: 
   - 0
   - 5
   - 1
   - rc
-  - 4
-  version: 0.5.1.rc4
+  - 5
+  version: 0.5.1.rc5
 platform: ruby
 authors: 
 - Cloud Foundry Team