cfoundry 0.4.16 → 0.4.17

data/lib/cfoundry/uaaclient.rb

@@ -49,11 +49,9 @@ module CFoundry
 
     def change_password(guid, new, old)
       put(
-        { :schemas => ["urn:scim:schemas:core:1.0"],
-          :password => new,
-          :oldPassword => old
-        },
-        "User", guid, "password",
+        { :password => new, :oldPassword => old },
+        "Users", guid, "password",
+        :accept => :json,
         :content => :json)
     end
 

data/lib/cfoundry/v1/model.rb

@@ -20,6 +20,14 @@ module CFoundry::V1
       def base_object_name
         @base_object_name ||= object_name
       end
+
+      def plural_object_name
+        "#{object_name}s"
+      end
+
+      def plural_base_object_name
+        "#{base_object_name}s"
+      end
     end
 
     attr_accessor :guid, :changes

data/lib/cfoundry/v1/model_magic.rb

@@ -20,10 +20,10 @@ module CFoundry::V1
 
     def define_client_methods(klass = self)
       singular = klass.object_name
-      plural = :"#{singular}s"
+      plural = klass.plural_object_name
 
       base_singular = klass.base_object_name
-      base_plural = :"#{base_singular}s"
+      base_plural = klass.plural_base_object_name
 
       BaseClientMethods.module_eval do
         define_method(base_singular) do |guid|

data/lib/cfoundry/v2/model.rb

@@ -5,8 +5,21 @@ require "cfoundry/v2/model_magic"
 
 module CFoundry::V2
   class Model
+    @@objects = {}
+
     extend ModelMagic
 
+    class << self
+      def objects
+        @@objects
+      end
+
+      def inherited(klass)
+        @@objects[klass.object_name] = klass
+        super
+      end
+    end
+
     attr_accessor :guid, :cache, :changes
 
     def initialize(guid, client, manifest = nil, partial = false)
@@ -39,6 +52,10 @@ module CFoundry::V2
       @object_name ||= self.class.object_name
     end
 
+    def plural_object_name
+      @plural_object_name ||= self.class.plural_object_name
+    end
+
     def invalidate!
       @manifest = nil
       @partial = false

data/lib/cfoundry/v2/model_magic.rb

@@ -24,6 +24,18 @@ module CFoundry::V2
           '\1_\2').downcase.to_sym
     end
 
+    def plural_object_name
+      :"#{object_name}s"
+    end
+
+    def define_client_methods(&blk)
+      ClientMethods.module_eval(&blk)
+    end
+
+    def define_base_client_methods(&blk)
+      BaseClientMethods.module_eval(&blk)
+    end
+
     def defaults
       @defaults ||= {}
     end
@@ -42,9 +54,9 @@ module CFoundry::V2
 
     def inherited(klass)
       singular = klass.object_name
-      plural = :"#{singular}s"
+      plural = klass.plural_object_name
 
-      BaseClientMethods.module_eval do
+      define_base_client_methods do
         define_method(singular) do |guid, *args|
           get("v2", plural, guid, :accept => :json,
               :params => ModelMagic.params_from(args))
@@ -70,7 +82,7 @@ module CFoundry::V2
         end
       end
 
-      ClientMethods.module_eval do
+      define_client_methods do
         define_method(singular) do |*args|
           guid, partial, _ = args
 
@@ -147,7 +159,12 @@ module CFoundry::V2
       define_method(name) do
         return @cache[name] if @cache.key?(name)
 
-        @cache[name] = manifest[:entity][name] || default
+        @cache[name] =
+          if manifest[:entity].key?(name)
+            manifest[:entity][name]
+          else
+            default
+          end
       end
 
       define_method(:"#{name}=") do |val|
@@ -208,7 +225,7 @@ module CFoundry::V2
       end
 
       define_method(:"#{name}=") do |val|
-        klass = CFoundry::V2.const_get(kls)
+        klass = self.class.objects[obj]
 
         unless has_default && val == default
           CFoundry::Validator.validate_type(val, klass)
@@ -218,15 +235,15 @@ module CFoundry::V2
         @manifest[:entity] ||= {}
 
         old = @manifest[:entity][:"#{name}_guid"]
-        if old != val.guid
-          old_obj = klass.new(@client, old, @manifest[:entity][name])
+        if old != (val && val.guid)
+          old_obj =
+            @cache[name] || klass.new(@client, old, @manifest[:entity][name])
 
           @changes[name] = [old_obj, val]
         end
 
         @cache[name] = val
 
-        @manifest[:entity][name] = val.manifest
         @manifest[:entity][:"#{name}_guid"] =
           @diff[:"#{name}_guid"] = val && val.guid
       end
@@ -240,13 +257,14 @@ module CFoundry::V2
       include QUERIES[singular]
 
       object = opts[:as] || singular
-      plural_object = :"#{object}s"
 
       kls = object.to_s.capitalize.gsub(/(.)_(.)/) do
         $1 + $2.upcase
       end
 
       define_method(plural) do |*args|
+        klass = CFoundry::V2.const_get(kls)
+
         opts, _ = args
         opts ||= {}
 
@@ -269,8 +287,8 @@ module CFoundry::V2
         else
           res =
             @client.send(
-              :"#{plural_object}_from",
-              "/v2/#{object_name}s/#@guid/#{plural}",
+              :"#{klass.plural_object_name}_from",
+              "/v2/#{plural_object_name}/#@guid/#{plural}",
               opts)
         end
 
@@ -286,7 +304,9 @@ module CFoundry::V2
       end
 
       define_method(:"add_#{singular}") do |x|
-        CFoundry::Validator.validate_type(x, CFoundry::V2.const_get(kls))
+        klass = self.class.objects[object]
+
+        CFoundry::Validator.validate_type(x, klass)
 
         if cache = @cache[plural]
           cache << x unless cache.include?(x)
@@ -294,12 +314,14 @@ module CFoundry::V2
 
         @client.base.request_path(
           Net::HTTP::Put,
-          ["v2", "#{object_name}s", @guid, plural, x.guid],
+          ["v2", plural_object_name, @guid, plural, x.guid],
           :accept => :json)
       end
 
       define_method(:"remove_#{singular}") do |x|
-        CFoundry::Validator.validate_type(x, CFoundry::V2.const_get(kls))
+        klass = self.class.objects[object]
+
+        CFoundry::Validator.validate_type(x, klass)
 
         if cache = @cache[plural]
           cache.delete(x)
@@ -307,12 +329,12 @@ module CFoundry::V2
 
         @client.base.request_path(
           Net::HTTP::Delete,
-          ["v2", "#{object_name}s", @guid, plural, x.guid],
+          ["v2", plural_object_name, @guid, plural, x.guid],
           :accept => :json)
       end
 
       define_method(:"#{plural}=") do |xs|
-        klass = CFoundry::V2.const_get(kls)
+        klass = self.class.objects[object]
 
         CFoundry::Validator.validate_type(xs, [klass])
 
@@ -322,15 +344,16 @@ module CFoundry::V2
         old = @manifest[:entity][:"#{singular}_guids"]
         if old != xs.collect(&:guid)
           old_objs =
-            if all = @manifest[:entity][plural]
-              all.collect do |m|
-                klass.new(@client, m[:metadata][:guid], m)
+            @cache[plural] ||
+              if all = @manifest[:entity][plural]
+                all.collect do |m|
+                  klass.new(@client, m[:metadata][:guid], m)
+                end
+              elsif old
+                old.collect { |id| klass.new(@client, id) }
               end
-            elsif old
-              old.collect { |id| klass.new(@client, id) }
-            end
 
-          @changes[name] = [old_objs, xs]
+          @changes[plural] = [old_objs, xs]
         end
 
         @cache[plural] = xs
@@ -344,7 +367,7 @@ module CFoundry::V2
       define_method(:summary) do
         @client.base.request_path(
           Net::HTTP::Get,
-          ["v2", "#{object_name}s", @guid, "summary"],
+          ["v2", plural_object_name, @guid, "summary"],
           :accept => :json)
       end
 
@@ -386,7 +409,7 @@ module CFoundry::V2
     def queryable_by(*names)
       klass = self
       singular = object_name
-      plural = :"#{singular}s"
+      plural = plural_object_name
 
       query = QUERIES[singular]
 

data/lib/cfoundry/validator.rb

@@ -22,6 +22,8 @@ module CFoundry
             type.all? { |name, subtype|
               val.key?(name) && value_matches?(val[name], subtype)
             }
+        when nil
+          true
         else
           val.is_a?(Object.const_get(type.to_s.capitalize))
         end

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/uaaclient_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe CFoundry::UAAClient do
   let(:target) { "https://uaa.example.com" }
@@ -114,16 +114,27 @@ EOF
     it 'sends a password change request' do
       req = stub_request(
         :put,
-        "#{target}/User/#{guid}/password"
+        "#{target}/Users/#{guid}/password"
       ).with(
         :body => {
-          :schemas => ["urn:scim:schemas:core:1.0"],
           :password => new,
           :oldPassword => old
         },
-        :headers => { "Content-Type" => "application/json" }
+        :headers => {
+          "Content-Type" => "application/json",
+          "Accept" => "application/json"
+        }
+      ).to_return(
+        :status => 200,
+        :body => <<EOF
+          {
+            "status": "ok",
+            "message": "password_updated"
+          }
+EOF
       )
 
+
       subject
 
       expect(req).to have_been_requested

data/spec/cfoundry/v2/model_magic_spec.rb

@@ -0,0 +1,115 @@
+require "spec_helper"
+
+describe CFoundry::V2::ModelMagic do
+  let(:client) { fake_client }
+  let(:mymodel) { fake_model }
+  let(:guid) { random_string("my-object-guid") }
+  let(:myobject) { mymodel.new(guid, client) }
+
+  describe 'attributes' do
+    describe 'reading' do
+      let(:mymodel) { fake_model { attribute :foo, :object } }
+
+      context 'when it exists in the manifest' do
+        subject { myobject.fake(:foo => "bar") }
+
+        it 'returns the value from the manifest' do
+          expect(subject.foo).to eq "bar"
+        end
+
+        context 'and the default is nil but the value is false' do
+          let(:mymodel) {
+            fake_model { attribute :foo, :object, :default => nil }
+          }
+
+          subject { myobject.fake(:foo => false) }
+
+          it 'returns false' do
+            expect(subject.foo).to eq false
+          end
+        end
+
+        context 'and the default is false but the value is nil' do
+          let(:mymodel) {
+            fake_model { attribute :foo, :object, :default => false }
+          }
+
+          subject { myobject.fake(:foo => nil) }
+
+          it 'returns nil' do
+            expect(subject.foo).to eq nil
+          end
+        end
+      end
+
+      context 'when the manifest has not been acquired' do
+        it 'retrieves the manifest the first time' do
+          mock(client.base).my_fake_model(guid) {
+            { :entity => { :foo => "fizz" } }
+          }.ordered
+
+          expect(myobject.foo).to eq "fizz"
+
+          dont_allow(client.base).my_fake_model.ordered
+
+          expect(myobject.foo).to eq "fizz"
+        end
+      end
+
+      context 'when it does not exist in the manifest' do
+        let(:mymodel) {
+          fake_model { attribute :foo, :object, :default => "foo" }
+        }
+
+        subject { myobject.fake }
+
+        it 'returns the default value' do
+          expect(subject.foo).to eq "foo"
+        end
+      end
+    end
+  end
+
+  describe 'to_one relationships' do
+    describe 'writing' do
+      let!(:mymodel) { fake_model { to_one :foo } }
+      let!(:othermodel) { fake_model :foo }
+
+      let(:myobject) { mymodel.new(nil, client).fake }
+      let(:otherobject) { othermodel.new(nil, client).fake }
+
+      subject { myobject.foo = otherobject }
+
+      it "sets the GUID in the manifest to the object's GUID" do
+        expect { subject }.to change {
+          myobject.manifest[:entity][:foo_guid]
+        }.to(otherobject.guid)
+      end
+
+      it "tracks internal changes in the diff" do
+        expect { subject }.to change { myobject.diff }.to(
+          :foo_guid => otherobject.guid)
+      end
+
+      it "tracks high-level changes in .changes" do
+        before = myobject.foo
+        expect { subject }.to change { myobject.changes }.to(
+          :foo => [before, otherobject])
+      end
+
+      context "when there is a default" do
+        let(:mymodel) { fake_model { to_one :foo, :default => nil } }
+
+        subject { myobject.foo = nil }
+
+        it "allows setting to the default" do
+          myobject.foo = otherobject
+
+          expect { subject }.to change {
+            myobject.manifest[:entity][:foo_guid]
+          }.from(otherobject.guid).to(nil)
+        end
+      end
+    end
+  end
+end

data/spec/fakes/app_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::App
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/domain_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Domain
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/framework_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Framework
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/organization_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Organization
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/route_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Route
+  def default_fakes
+		super.merge :host => random_string(object_name)
+  end
+end

data/spec/fakes/runtime_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Runtime
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/service_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Service
+  def default_fakes
+    super.merge :label => random_string(object_name)
+  end
+end

data/spec/fakes/service_instance_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::ServiceInstance
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/service_plan_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::ServicePlan
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/space_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::Space
+  def default_fakes
+    super.merge :name => random_string(object_name)
+  end
+end

data/spec/fakes/user_fake.rb

@@ -0,0 +1,5 @@
+class CFoundry::V2::User
+  def default_fakes
+    super.merge :admin => false
+  end
+end

data/spec/spec_helper.rb

@@ -1,17 +1,16 @@
 require "rspec"
 require "cfoundry"
-require "factory_girl"
 require "webmock/rspec"
 
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
+Dir[File.expand_path('../{support,fakes}/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
-FactoryGirl.definition_file_paths =
-  [File.expand_path("../factories", __FILE__)]
-
-FactoryGirl.find_definitions
+def random_string(tag = "random")
+  sprintf("%s-%x", tag, rand(10 ** 6))
+end
 
 RSpec.configure do |c|
+  c.include Fake::FakeMethods
   c.mock_with :rr
-end
+end

data/spec/support/fake_helper.rb

@@ -0,0 +1,226 @@
+module Fake
+  module FakeMethods
+    def fake_client(attributes = {})
+      CFoundry::V2::FakeClient.new.fake(attributes)
+    end
+
+    def fake(what, attributes = {})
+      fake_client.send(what).fake(attributes)
+    end
+
+    def fake_list(what, count, attributes = {})
+      objs = []
+
+      count.times do
+        objs << fake(what, attributes)
+      end
+
+      objs
+    end
+
+    def fake_model(name = :my_fake_model, &init)
+      # There is a difference between ruby 1.8.7 and 1.8.8 in the order that
+      # the inherited callback gets called. In 1.8.7 the inherited callback
+      # is called after the block; in 1.8.8 and later it's called before.
+      # The upshot for us is we need a failproof way of getting the name
+      # to klass. So we're using a global variable to hand off the value.
+      # Please don't shoot us. - ESH & MMB
+      $object_name = name
+      klass = Class.new(CFoundry::V2::FakeModel) do
+        self.object_name = name
+      end
+
+      klass.class_eval(&init) if init
+
+      klass
+    end
+  end
+
+  def fake(attributes = {})
+    fake_attributes(attributes).each do |k, v|
+      send(:"#{k}=", v)
+      setup_reverse_relationship(v)
+    end
+
+    self
+  end
+
+  def self.define_many_association(target, plural)
+    target.class_eval do
+      define_method(plural) do |*args|
+        options, _ = args
+        options ||= {}
+
+        vals = get_many(plural) || []
+
+        if options[:query]
+          by, val = options[:query]
+          vals.select do |v|
+            v.send(by) == val
+          end
+        else
+          vals
+        end
+      end
+    end
+  end
+end
+
+module CFoundry::V2
+  class Model
+    include Fake
+
+    attr_writer :client
+
+    private
+
+    def get_many(plural)
+      @cache[plural]
+    end
+
+    def fake_attributes(attributes)
+      fakes = default_fakes.merge(attributes)
+
+      # default relationships to other fake objects
+      self.class.to_one_relations.each do |name, opts|
+        # remove _guid (not an actual attribute)
+        fakes.delete :"#{name}_guid"
+        next if fakes.key?(name)
+
+        fakes[name] =
+          if opts.key?(:default)
+            opts[:default]
+          else
+            @client.send(opts[:as] || name).fake
+          end
+      end
+
+      fakes
+    end
+
+    # override this to provide basic attributes (like name) dynamically
+    def default_fakes
+      self.class.defaults.merge(
+        :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
+
+      v.class.to_one_relations.each do |attr, opts|
+        return [attr, :one] if attr == singular
+        return [attr, :one] if opts[:as] == singular
+      end
+
+      v.class.to_many_relations.each do |attr, opts|
+        return [attr, :many] if attr == plural
+        return [attr, :many] if opts[:as] == singular
+      end
+    end
+  end
+
+
+  class FakeBase < Base
+  end
+
+
+  class FakeClient < Client
+    include Fake
+
+    def initialize(target = "http://example.com", token = nil)
+      @base = FakeBase.new(target, token)
+    end
+
+    private
+
+    def get_many(plural)
+      instance_variable_get(:"@#{plural}")
+    end
+
+    def fake_attributes(attributes)
+      attributes
+    end
+
+    def setup_reverse_relationship(v)
+      if v.is_a?(Model)
+        v.client = self
+      elsif v.is_a?(Array)
+        v.each do |x|
+          setup_reverse_relationship(x)
+        end
+      end
+    end
+  end
+
+
+  class FakeModel < CFoundry::V2::Model
+    attr_reader :diff
+
+    def self.inherited(klass)
+      class << klass
+        attr_writer :object_name
+      end
+
+      # There is a difference between ruby 1.8.7 and 1.8.8 in the order that
+      # the inherited callback gets called. In 1.8.7 the inherited callback
+      # is called after the block; in 1.8.8 and later it's called before.
+      # The upshot for us is we need a failproof way of getting the name
+      # to klass. So we're using a global variable to hand off the value.
+      # Please don't shoot us. - ESH & MMB
+      klass.object_name = $object_name
+      super
+    end
+
+    class << self
+      attr_writer :object_name
+    end
+  end
+
+
+  module ModelMagic
+    def self.define_client_methods(&blk)
+      FakeClient.module_eval(&blk)
+    end
+
+    def self.define_base_client_methods(&blk)
+      FakeBase.module_eval(&blk)
+    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 4
-  - 16
-  version: 0.4.16
+  - 17
+  version: 0.4.17
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-19 00:00:00 Z
+date: 2013-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -122,21 +122,6 @@ dependencies:
         version: "1.0"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  type: :development
-  version_requirements: *id008
 description: 
 email: 
 - asuraci@vmware.com
@@ -190,21 +175,20 @@ files:
 - spec/cfoundry/baseclient_spec.rb
 - spec/cfoundry/errors_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
-- spec/factories/app_factory.rb
-- spec/factories/client_factory.rb
-- spec/factories/domain_factory.rb
-- spec/factories/factory.rb
-- spec/factories/framework_factory.rb
-- spec/factories/organization_factory.rb
-- spec/factories/route_factory.rb
-- spec/factories/runtime_factory.rb
-- spec/factories/service_binding_factory.rb
-- spec/factories/service_factory.rb
-- spec/factories/service_instance_factory.rb
-- spec/factories/service_plan_factory.rb
-- spec/factories/space_factory.rb
-- spec/factories/user_factory.rb
+- spec/cfoundry/v2/model_magic_spec.rb
+- spec/fakes/app_fake.rb
+- spec/fakes/domain_fake.rb
+- spec/fakes/framework_fake.rb
+- spec/fakes/organization_fake.rb
+- spec/fakes/route_fake.rb
+- spec/fakes/runtime_fake.rb
+- spec/fakes/service_fake.rb
+- spec/fakes/service_instance_fake.rb
+- spec/fakes/service_plan_fake.rb
+- spec/fakes/space_fake.rb
+- spec/fakes/user_fake.rb
 - spec/spec_helper.rb
+- spec/support/fake_helper.rb
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -242,18 +226,17 @@ test_files:
 - spec/cfoundry/baseclient_spec.rb
 - spec/cfoundry/errors_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
-- spec/factories/app_factory.rb
-- spec/factories/client_factory.rb
-- spec/factories/domain_factory.rb
-- spec/factories/factory.rb
-- spec/factories/framework_factory.rb
-- spec/factories/organization_factory.rb
-- spec/factories/route_factory.rb
-- spec/factories/runtime_factory.rb
-- spec/factories/service_binding_factory.rb
-- spec/factories/service_factory.rb
-- spec/factories/service_instance_factory.rb
-- spec/factories/service_plan_factory.rb
-- spec/factories/space_factory.rb
-- spec/factories/user_factory.rb
+- spec/cfoundry/v2/model_magic_spec.rb
+- spec/fakes/app_fake.rb
+- spec/fakes/domain_fake.rb
+- spec/fakes/framework_fake.rb
+- spec/fakes/organization_fake.rb
+- spec/fakes/route_fake.rb
+- spec/fakes/runtime_fake.rb
+- spec/fakes/service_fake.rb
+- spec/fakes/service_instance_fake.rb
+- spec/fakes/service_plan_fake.rb
+- spec/fakes/space_fake.rb
+- spec/fakes/user_fake.rb
 - spec/spec_helper.rb
+- spec/support/fake_helper.rb

data/spec/factories/app_factory.rb

@@ -1,25 +0,0 @@
-FactoryGirl.define do
-  factory :app, :class => CFoundry::V2::App do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-    memory 128
-    total_instances 0
-    production false
-    state "STOPPED"
-
-    ignore do
-      routes []
-      service_bindings []
-    end
-
-    initialize_with do
-      CFoundry::V2::App.new(nil, nil)
-    end
-
-    after_build do |app, evaluator|
-      %w{name routes service_bindings}.each do |attr|
-        RR.stub(app).__send__(attr) { evaluator.send(attr) }
-      end
-    end
-  end
-end

data/spec/factories/client_factory.rb

@@ -1,25 +0,0 @@
-FactoryGirl.define do
-  factory :client, :class => CFoundry::V2::Client do
-    ignore do
-      routes []
-      apps []
-      frameworks []
-      runtimes []
-      service_instances []
-      spaces []
-      organizations []
-      logged_in true
-    end
-
-    after_build do |client, evaluator|
-      RR.stub(client).logged_in? { evaluator.logged_in }
-      RR.stub(client).routes { evaluator.routes }
-      RR.stub(client).apps { evaluator.apps }
-      RR.stub(client).frameworks { evaluator.frameworks }
-      RR.stub(client).runtimes { evaluator.runtimes }
-      RR.stub(client).service_instances { evaluator.service_instances }
-      RR.stub(client).spaces { evaluator.spaces }
-      RR.stub(client).organizations { evaluator.organizations }
-    end
-  end
-end

data/spec/factories/domain_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :domain, :class => CFoundry::V2::Domain do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::Domain.new(nil, nil)
-    end
-  end
-end

data/spec/factories/factory.rb

@@ -1,4 +0,0 @@
-FactoryGirl.define do
-  sequence(:random_string) {|n| "random_#{n}_string" }
-  sequence(:guid) {|n| "random_#{n}_guid" }
-end

data/spec/factories/framework_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :framework, :class => CFoundry::V2::Framework do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::Framework.new(nil, nil)
-    end
-  end
-end

data/spec/factories/organization_factory.rb

@@ -1,23 +0,0 @@
-FactoryGirl.define do
-  factory :organization, :class => CFoundry::V2::Organization do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    ignore do
-      spaces []
-      domains []
-    end
-
-    initialize_with do
-      CFoundry::V2::Organization.new(nil, nil)
-    end
-
-    after_build do |org, evaluator|
-      evaluator.spaces.each { |s| s.organization = org }
-      evaluator.domains.each { |s| s.owning_organization = org }
-
-      RR.stub(org).spaces { evaluator.spaces }
-      RR.stub(org).domains { evaluator.domains }
-    end
-  end
-end

data/spec/factories/route_factory.rb

@@ -1,11 +0,0 @@
-FactoryGirl.define do
-  factory :route, :class => CFoundry::V2::Route do
-    guid { FactoryGirl.generate(:guid) }
-    host { FactoryGirl.generate(:random_string) }
-    association :domain, :factory => :domain, :strategy => :build
-
-    initialize_with do
-      CFoundry::V2::Route.new(nil, nil)
-    end
-  end
-end

data/spec/factories/runtime_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :runtime, :class => CFoundry::V2::Runtime do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::Runtime.new(nil, nil)
-    end
-  end
-end

data/spec/factories/service_binding_factory.rb

@@ -1,20 +0,0 @@
-FactoryGirl.define do
-  factory :service_binding, :class => CFoundry::V2::ServiceBinding do
-    guid { FactoryGirl.generate(:guid) }
-
-    ignore do
-      app nil
-      service_instance nil
-    end
-
-    initialize_with do
-      CFoundry::V2::ServiceBinding.new(nil, nil)
-    end
-
-    after_build do |app, evaluator|
-      %w{app service_instance}.each do |attr|
-        RR.stub(app).__send__(attr) { evaluator.send(attr) }
-      end
-    end
-  end
-end

data/spec/factories/service_factory.rb

@@ -1,16 +0,0 @@
-FactoryGirl.define do
-  factory :service, :class => CFoundry::V2::Service do
-    guid { FactoryGirl.generate(:guid) }
-    label "redis"
-    provider "core"
-    url "http://example.com"
-    description "small key-value store"
-    version "2.8"
-    info_url "http://cloudfoundry.com/redis"
-    active true
-
-    initialize_with do
-      CFoundry::V2::Service.new(nil, nil)
-    end
-  end
-end

data/spec/factories/service_instance_factory.rb

@@ -1,20 +0,0 @@
-FactoryGirl.define do
-  factory :service_instance, :class => CFoundry::V2::ServiceInstance do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    ignore do
-      service_bindings []
-    end
-
-    initialize_with do
-      CFoundry::V2::ServiceInstance.new(nil, nil)
-    end
-
-    after_build do |svc, evaluator|
-      %w{name service_bindings}.each do |attr|
-        RR.stub(svc).__send__(attr) { evaluator.send(attr) }
-      end
-    end
-  end
-end

data/spec/factories/service_plan_factory.rb

@@ -1,11 +0,0 @@
-FactoryGirl.define do
-  factory :service_plan, :class => CFoundry::V2::ServicePlan do
-    guid { FactoryGirl.generate(:guid) }
-    name "D100"
-    description "Filibuster plan"
-
-    initialize_with do
-      CFoundry::V2::ServicePlan.new(nil, nil)
-    end
-  end
-end

data/spec/factories/space_factory.rb

@@ -1,25 +0,0 @@
-FactoryGirl.define do
-  factory :space, :class => CFoundry::V2::Space do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    ignore do
-      apps []
-      service_instances []
-      domains []
-    end
-
-    initialize_with do
-      CFoundry::V2::Space.new(nil, nil)
-    end
-
-    after_build do |org, evaluator|
-      evaluator.apps.each { |s| s.space = org }
-      evaluator.service_instances.each { |s| s.space = org }
-
-      RR.stub(org).apps { evaluator.apps }
-      RR.stub(org).service_instances { evaluator.service_instances }
-      RR.stub(org).domains { evaluator.domains }
-    end
-  end
-end

data/spec/factories/user_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :user, :class => CFoundry::V2::User do
-    guid { FactoryGirl.generate(:guid) }
-    admin false
-
-    initialize_with do
-      CFoundry::V2::User.new(nil, nil)
-    end
-  end
-end