cfoundry 1.4.0 → 1.5.0

data/lib/cfoundry/v2/model_magic.rb

@@ -1,4 +1,10 @@
 require "cfoundry/validator"
+require "cfoundry/v2/model_magic/client_extensions"
+require "cfoundry/v2/model_magic/has_summary"
+require "cfoundry/v2/model_magic/attribute"
+require "cfoundry/v2/model_magic/to_one"
+require "cfoundry/v2/model_magic/to_many"
+require "cfoundry/v2/model_magic/queryable_by"
 
 module CFoundry::V2
   # object name -> module containing query methods
@@ -15,6 +21,13 @@ module CFoundry::V2
   end
 
   module ModelMagic
+    include ModelMagic::ClientExtensions
+    include ModelMagic::HasSummary
+    include ModelMagic::Attribute
+    include ModelMagic::ToOne
+    include ModelMagic::ToMany
+    include ModelMagic::QueryableBy
+
     attr_reader :scoped_organization, :scoped_space
 
     def object_name
@@ -28,14 +41,6 @@ module CFoundry::V2
       :"#{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
@@ -53,132 +58,10 @@ module CFoundry::V2
     end
 
     def inherited(klass)
-      singular = klass.object_name
-      plural = klass.plural_object_name
-
-      define_base_client_methods do
-        define_method(singular) do |guid, *args|
-          get("v2", plural, guid,
-            :accept => :json,
-            :params => ModelMagic.params_from(args)
-          )
-        end
-
-        define_method(plural) do |*args|
-          all_pages(
-            get("v2", plural,
-              :accept => :json,
-              :params => ModelMagic.params_from(args)
-            )
-          )
-        end
-      end
-
-      define_client_methods do
-        define_method(singular) do |*args|
-          guid, partial, _ = args
-
-          x = klass.new(guid, self, nil, partial)
-
-          # when creating an object, automatically set the org/space
-          unless guid
-            if klass.scoped_organization && current_organization
-              x.send(:"#{klass.scoped_organization}=", current_organization)
-            end
-
-            if klass.scoped_space && current_space
-              x.send(:"#{klass.scoped_space}=", current_space)
-            end
-          end
-
-          x
-        end
-
-        define_method(plural) do |*args|
-          # use current org/space
-          if klass.scoped_space && current_space
-            current_space.send(plural, *args)
-          elsif klass.scoped_organization && current_organization
-            current_organization.send(plural, *args)
-          else
-            @base.send(plural, *args).collect do |json|
-              send(:"make_#{singular}", json)
-            end
-          end
-        end
-
-        define_method(:"#{singular}_from") do |path, *args|
-          send(
-            :"make_#{singular}",
-            @base.get(
-              path,
-              :accept => :json,
-              :params => ModelMagic.params_from(args)))
-        end
-
-        define_method(:"#{plural}_from") do |path, *args|
-          objs = @base.all_pages(
-            @base.get(
-              path,
-              :accept => :json,
-              :params => ModelMagic.params_from(args)))
-
-          objs.collect do |json|
-            send(:"make_#{singular}", json)
-          end
-        end
-
-        define_method(:"make_#{singular}") do |json|
-          klass.new(
-            json[:metadata][:guid],
-            self,
-            json)
-        end
-      end
-
+      add_client_methods(klass)
       has_summary
     end
 
-    def attribute(name, type, opts = {})
-      attributes[name] = opts
-      json_name = opts[:at] || name
-
-      default = opts[:default]
-
-      if has_default = opts.key?(:default)
-        defaults[name] = default
-      end
-
-      define_method(name) do
-        return @cache[name] if @cache.key?(name)
-        return nil unless persisted?
-
-        @cache[name] =
-          if manifest[:entity].key?(json_name)
-            manifest[:entity][json_name]
-          else
-            default
-          end
-      end
-
-      define_method(:"#{name}=") do |val|
-        unless has_default && val == default
-          CFoundry::Validator.validate_type(val, type)
-        end
-
-        @cache[name] = val
-
-        @manifest ||= {}
-        @manifest[:entity] ||= {}
-
-        old = @manifest[:entity][json_name]
-        @changes[name] = [old, val] if old != val
-        @manifest[:entity][json_name] = val
-
-        @diff[json_name] = val
-      end
-    end
-
     def scoped_to_organization(relation = :organization)
       @scoped_organization = relation
     end
@@ -187,248 +70,6 @@ module CFoundry::V2
       @scoped_space = relation
     end
 
-    def to_one(name, opts = {})
-      to_one_relations[name] = opts
-
-      association_name = opts[:as] || name
-      default = opts[:default]
-
-      if has_default = opts.key?(:default)
-        defaults[:"#{name}_guid"] = default
-      end
-
-      define_method(name) do
-        return @cache[name] if @cache.key?(name)
-        return @client.send(name) unless persisted?
-
-        @cache[name] =
-          if @manifest && @manifest[:entity].key?(name)
-            @client.send(:"make_#{association_name}", @manifest[:entity][name])
-          elsif url = send("#{name}_url")
-            @client.send(:"#{association_name}_from", url)
-          else
-            default
-          end
-      end
-
-      define_method("create_#{name}") do |*args|
-        associated_instance = @client.send(:"#{association_name}")
-        args.first.each do |name, value|
-          associated_instance.send("#{name}=", value)
-        end if args.first.is_a? Hash
-
-        associated_instance.create!
-        self.send("#{name}=", associated_instance)
-      end
-
-      define_method(:"#{name}_url") do
-        manifest[:entity][:"#{name}_url"]
-      end
-
-      define_method(:"#{name}=") do |assigned_value|
-        klass = self.class.objects[association_name]
-
-        unless has_default && assigned_value == default
-          CFoundry::Validator.validate_type(assigned_value, klass)
-        end
-
-        @manifest ||= {}
-        @manifest[:entity] ||= {}
-
-        old_guid = @manifest[:entity][:"#{name}_guid"]
-        association_guid = assigned_value ? assigned_value.guid : nil
-
-        if old_guid != (association_guid)
-          old_obj =
-            @cache[name] || klass.new(@client, old_guid, @manifest[:entity][name])
-
-          @changes[name] = [old_obj, assigned_value]
-        end
-
-        @cache[name] = assigned_value
-
-        @manifest[:entity][:"#{name}_guid"] = association_guid
-        @diff[:"#{name}_guid"] = association_guid
-        assigned_value
-      end
-    end
-
-    def to_many(plural, opts = {})
-      to_many_relations[plural] = opts
-
-      singular = plural.to_s.sub(/s$/, "").to_sym
-
-      include QUERIES[singular]
-
-      object = opts[:as] || singular
-
-      kls = object.to_s.camelcase
-
-      define_method(plural) do |*args|
-        klass = CFoundry::V2.const_get(kls)
-
-        opts, _ = args
-        opts ||= {}
-
-        if opts.empty? && cache = @cache[plural]
-          return cache
-        end
-
-        if @manifest && @manifest[:entity].key?(plural) && opts.empty?
-          objs = @manifest[:entity][plural]
-
-          if query = opts[:query]
-            find_by, find_val = query
-            objs = objs.select { |o| o[:entity][find_by] == find_val }
-          end
-
-          res =
-            objs.collect do |json|
-              @client.send(:"make_#{object}", json)
-            end
-        else
-          res =
-            @client.send(
-              :"#{klass.plural_object_name}_from",
-              "/v2/#{plural_object_name}/#@guid/#{plural}",
-              opts)
-        end
-
-        if opts.empty?
-          @cache[plural] = res
-        end
-
-        res
-      end
-
-      define_method(:"#{plural}_url") do
-        manifest[:entity][:"#{plural}_url"]
-      end
-
-      define_method(:"add_#{singular}") do |x|
-        klass = self.class.objects[object]
-
-        CFoundry::Validator.validate_type(x, klass)
-
-        if cache = @cache[plural]
-          cache << x unless cache.include?(x)
-        end
-
-        @client.base.put("v2", plural_object_name, @guid, plural, x.guid, :accept => :json)
-      end
-
-      define_method(:"remove_#{singular}") do |x|
-        klass = self.class.objects[object]
-
-        CFoundry::Validator.validate_type(x, klass)
-
-        if cache = @cache[plural]
-          cache.delete(x)
-        end
-
-        @client.base.delete("v2", plural_object_name, @guid, plural, x.guid, :accept => :json)
-      end
-
-      define_method(:"#{plural}=") do |xs|
-        klass = self.class.objects[object]
-
-        CFoundry::Validator.validate_type(xs, [klass])
-
-        @manifest ||= {}
-        @manifest[:entity] ||= {}
-
-        old = @manifest[:entity][:"#{singular}_guids"]
-        if old != xs.collect(&:guid)
-          old_objs =
-            @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
-
-          @changes[plural] = [old_objs, xs]
-        end
-
-        @cache[plural] = xs
-
-        @manifest[:entity][:"#{singular}_guids"] =
-          @diff[:"#{singular}_guids"] = xs.collect(&:guid)
-      end
-    end
-
-    def has_summary(actions = {})
-      define_method(:summary) do
-        @client.base.get("v2", plural_object_name, @guid, "summary", :accept => :json)
-      end
-
-      define_method(:summarize!) do |*args|
-        body, _ = args
-
-        body ||= summary
-
-        body.each do |key, val|
-          if act = actions[key]
-            instance_exec(val, &act)
-
-          elsif self.class.attributes[key]
-            self.send(:"#{key}=", val)
-
-          elsif self.class.to_many_relations[key]
-            singular = key.to_s.sub(/s$/, "").to_sym
-
-            vals = val.collect do |sub|
-              obj = @client.send(singular, sub[:guid], true)
-              obj.summarize! sub
-              obj
-            end
-
-            self.send(:"#{key}=", vals)
-
-          elsif self.class.to_one_relations[key]
-            obj = @client.send(key, val[:guid], true)
-            obj.summarize! val
-
-            self.send(:"#{key}=", obj)
-          end
-        end
-
-        nil
-      end
-    end
-
-    def queryable_by(*names)
-      klass = self
-      singular = object_name
-      plural = plural_object_name
-
-      query = QUERIES[singular]
-
-      query.module_eval do
-        names.each do |name|
-          define_method(:"#{singular}_by_#{name}") do |*args|
-            send(:"#{plural}_by_#{name}", *args).first
-          end
-
-          define_method(:"#{plural}_by_#{name}") do |val, *args|
-            options, _ = args
-            options ||= {}
-            options[:query] = [name, val]
-
-            query_target(klass).send(plural, options)
-          end
-        end
-      end
-
-      const_set(:Queries, query)
-
-      ClientMethods.module_eval do
-        include query
-      end
-    end
-
     def self.params_from(args)
       options, _ = args
       options ||= {}

data/lib/cfoundry/v2/model_magic/attribute.rb

@@ -0,0 +1,49 @@
+module CFoundry::V2::ModelMagic
+  module Attribute
+    def attribute(name, type, opts = {})
+      attributes[name] = opts
+      json_name = opts[:at] || name
+
+      default = opts[:default]
+
+      if has_default = opts.key?(:default)
+        defaults[name] = default
+      end
+
+      #
+      # def ATTRIBUTE
+      #
+      define_method(name) do
+        return @cache[name] if @cache.key?(name)
+        return nil unless persisted?
+
+        @cache[name] =
+          if manifest[:entity].key?(json_name)
+            manifest[:entity][json_name]
+          else
+            default
+          end
+      end
+
+      #
+      # def ATTRIBUTE=
+      #
+      define_method(:"#{name}=") do |val|
+        unless has_default && val == default
+          CFoundry::Validator.validate_type(val, type)
+        end
+
+        @cache[name] = val
+
+        @manifest ||= {}
+        @manifest[:entity] ||= {}
+
+        old = @manifest[:entity][json_name]
+        @changes[name] = [old, val] if old != val
+        @manifest[:entity][json_name] = val
+
+        @diff[json_name] = val
+      end
+    end
+  end
+end

data/lib/cfoundry/v2/model_magic/client_extensions.rb

@@ -0,0 +1,124 @@
+module CFoundry
+  module V2
+    module ModelMagic
+      module ClientExtensions
+        def add_client_methods(klass)
+          singular = klass.object_name
+          plural = klass.plural_object_name
+
+          define_base_client_methods do
+            #
+            # def client.MODEL
+            #
+            define_method(singular) do |guid, *args|
+              get("v2", plural, guid,
+                :accept => :json,
+                :params => ModelMagic.params_from(args)
+              )
+            end
+
+            #
+            # def client.MODELs
+            #
+            define_method(plural) do |*args|
+              all_pages(
+                get("v2", plural,
+                  :accept => :json,
+                  :params => ModelMagic.params_from(args)
+                )
+              )
+            end
+          end
+
+
+          define_client_methods do
+            #
+            # def client.MODEL
+            #
+            define_method(singular) do |*args|
+              guid, partial, _ = args
+
+              x = klass.new(guid, self, nil, partial)
+
+              # when creating an object, automatically set the org/space
+              unless guid
+                if klass.scoped_organization && current_organization
+                  x.send(:"#{klass.scoped_organization}=", current_organization)
+                end
+
+                if klass.scoped_space && current_space
+                  x.send(:"#{klass.scoped_space}=", current_space)
+                end
+              end
+
+              x
+            end
+
+            #
+            # def client.MODELs
+            #
+            define_method(plural) do |*args|
+              # use current org/space
+              if klass.scoped_space && current_space
+                current_space.send(plural, *args)
+              elsif klass.scoped_organization && current_organization
+                current_organization.send(plural, *args)
+              else
+                @base.send(plural, *args).collect do |json|
+                  send(:"make_#{singular}", json)
+                end
+              end
+            end
+
+            #
+            # def client.MODEL_from
+            #
+            define_method(:"#{singular}_from") do |path, *args|
+              send(
+                :"make_#{singular}",
+                @base.get(
+                  path,
+                  :accept => :json,
+                  :params => ModelMagic.params_from(args)))
+            end
+
+            #
+            # def client.MODELs_from
+            #
+            define_method(:"#{plural}_from") do |path, *args|
+              objs = @base.all_pages(
+                @base.get(
+                  path,
+                  :accept => :json,
+                  :params => ModelMagic.params_from(args)))
+
+              objs.collect do |json|
+                send(:"make_#{singular}", json)
+              end
+            end
+
+            #
+            # def client.make_MODEL
+            #
+            define_method(:"make_#{singular}") do |json|
+              klass.new(
+                json[:metadata][:guid],
+                self,
+                json)
+            end
+          end
+        end
+
+        private
+
+        def define_client_methods(&blk)
+          ClientMethods.module_eval(&blk)
+        end
+
+        def define_base_client_methods(&blk)
+          BaseClientMethods.module_eval(&blk)
+        end
+      end
+    end
+  end
+end

data/lib/cfoundry/v2/model_magic/has_summary.rb

@@ -0,0 +1,49 @@
+module CFoundry::V2::ModelMagic
+  module HasSummary
+    def has_summary(actions = {})
+      #
+      # def summary
+      #
+      define_method(:summary) do
+        @client.base.get("v2", plural_object_name, @guid, "summary", :accept => :json)
+      end
+
+      #
+      # def summarize!
+      #
+      define_method(:summarize!) do |*args|
+        body, _ = args
+
+        body ||= summary
+
+        body.each do |key, val|
+          if act = actions[key]
+            instance_exec(val, &act)
+
+          elsif self.class.attributes[key]
+            self.send(:"#{key}=", val)
+
+          elsif self.class.to_many_relations[key]
+            singular = key.to_s.sub(/s$/, "").to_sym
+
+            vals = val.collect do |sub|
+              obj = @client.send(singular, sub[:guid], true)
+              obj.summarize! sub
+              obj
+            end
+
+            self.send(:"#{key}=", vals)
+
+          elsif self.class.to_one_relations[key]
+            obj = @client.send(key, val[:guid], true)
+            obj.summarize! val
+
+            self.send(:"#{key}=", obj)
+          end
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/cfoundry/v2/model_magic/queryable_by.rb

@@ -0,0 +1,39 @@
+module CFoundry::V2
+  module ModelMagic::QueryableBy
+    def queryable_by(*names)
+      klass = self
+      singular = object_name
+      plural = plural_object_name
+
+      query = ::CFoundry::V2::QUERIES[singular]
+
+      query.module_eval do
+        names.each do |name|
+          #
+          # def MODEL_by_ATTRIBUTE
+          #
+          define_method(:"#{singular}_by_#{name}") do |*args|
+            send(:"#{plural}_by_#{name}", *args).first
+          end
+
+          #
+          # def MODELs_by_ATTRIBUTE
+          #
+          define_method(:"#{plural}_by_#{name}") do |val, *args|
+            options, _ = args
+            options ||= {}
+            options[:query] = [name, val]
+
+            query_target(klass).send(plural, options)
+          end
+        end
+      end
+
+      const_set(:Queries, query)
+
+      ClientMethods.module_eval do
+        include query
+      end
+    end
+  end
+end

data/lib/cfoundry/v2/model_magic/to_many.rb

@@ -0,0 +1,138 @@
+module CFoundry::V2::ModelMagic
+  module ToMany
+    def to_many(plural, opts = {})
+      to_many_relations[plural] = opts
+
+      singular = plural.to_s.sub(/s$/, "").to_sym
+
+      include ::CFoundry::V2::QUERIES[singular]
+
+      object = opts[:as] || singular
+
+      kls = object.to_s.camelcase
+
+      #
+      # def MODELs
+      #
+      define_method(plural) do |*args|
+        klass = CFoundry::V2.const_get(kls)
+
+        opts, _ = args
+        opts ||= {}
+
+        if opts.empty? && cache = @cache[plural]
+          return cache
+        end
+
+        if @manifest && @manifest[:entity].key?(plural) && opts.empty?
+          objs = @manifest[:entity][plural]
+
+          if query = opts[:query]
+            find_by, find_val = query
+            objs = objs.select { |o| o[:entity][find_by] == find_val }
+          end
+
+          res =
+            objs.collect do |json|
+              @client.send(:"make_#{object}", json)
+            end
+        else
+          res =
+            @client.send(
+              :"#{klass.plural_object_name}_from",
+              "/v2/#{plural_object_name}/#@guid/#{plural}",
+              opts)
+        end
+
+        if opts.empty?
+          @cache[plural] = res
+        end
+
+        res
+      end
+
+      #
+      # def MODELs_url
+      #
+      define_method(:"#{plural}_url") do
+        manifest[:entity][:"#{plural}_url"]
+      end
+
+      #
+      # def add_MODEL
+      #
+      define_method(:"add_#{singular}") do |x|
+        klass = self.class.objects[object]
+
+        CFoundry::Validator.validate_type(x, klass)
+
+        if cache = @cache[plural]
+          cache << x unless cache.include?(x)
+        end
+
+        @client.base.put("v2", plural_object_name, @guid, plural, x.guid, :accept => :json)
+      end
+
+      #
+      # def create_MODEL
+      #
+      define_method("create_#{singular}") do |*args|
+        associated_instance = @client.send(:"#{singular}")
+        args.first.each do |name, value|
+          associated_instance.send("#{name}=", value)
+        end if args.first.is_a? Hash
+
+        associated_instance.create!
+        self.send(:"add_#{singular}", associated_instance)
+        associated_instance
+      end
+
+      #
+      # def remove_MODEL
+      #
+      define_method(:"remove_#{singular}") do |x|
+        klass = self.class.objects[object]
+
+        CFoundry::Validator.validate_type(x, klass)
+
+        if cache = @cache[plural]
+          cache.delete(x)
+        end
+
+        @client.base.delete("v2", plural_object_name, @guid, plural, x.guid, :accept => :json)
+      end
+
+      #
+      # def MODELs=
+      #
+      define_method(:"#{plural}=") do |xs|
+        klass = self.class.objects[object]
+
+        CFoundry::Validator.validate_type(xs, [klass])
+
+        @manifest ||= {}
+        @manifest[:entity] ||= {}
+
+        old = @manifest[:entity][:"#{singular}_guids"]
+        if old != xs.collect(&:guid)
+          old_objs =
+            @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
+
+          @changes[plural] = [old_objs, xs]
+        end
+
+        @cache[plural] = xs
+
+        @manifest[:entity][:"#{singular}_guids"] =
+          @diff[:"#{singular}_guids"] = xs.collect(&:guid)
+      end
+    end
+  end
+end

data/lib/cfoundry/v2/model_magic/to_one.rb

@@ -0,0 +1,81 @@
+module CFoundry::V2::ModelMagic
+  module ToOne
+    def to_one(name, opts = {})
+      to_one_relations[name] = opts
+
+      association_name = opts[:as] || name
+      default = opts[:default]
+
+      if has_default = opts.key?(:default)
+        defaults[:"#{name}_guid"] = default
+      end
+
+      #
+      # def MODEL
+      #
+      define_method(name) do
+        return @cache[name] if @cache.key?(name)
+        return @client.send(name) unless persisted?
+
+        @cache[name] =
+          if @manifest && @manifest[:entity].key?(name)
+            @client.send(:"make_#{association_name}", @manifest[:entity][name])
+          elsif url = send("#{name}_url")
+            @client.send(:"#{association_name}_from", url)
+          else
+            default
+          end
+      end
+
+      #
+      # def create_MODEL
+      #
+      define_method("create_#{name}") do |*args|
+        associated_instance = @client.send(:"#{association_name}")
+        args.first.each do |name, value|
+          associated_instance.send("#{name}=", value)
+        end if args.first.is_a? Hash
+
+        associated_instance.create!
+        self.send("#{name}=", associated_instance)
+      end
+
+      #
+      # def MODEL_url
+      #
+      define_method(:"#{name}_url") do
+        manifest[:entity][:"#{name}_url"]
+      end
+
+      #
+      # def MODEL=
+      #
+      define_method(:"#{name}=") do |assigned_value|
+        klass = self.class.objects[association_name]
+
+        unless has_default && assigned_value == default
+          CFoundry::Validator.validate_type(assigned_value, klass)
+        end
+
+        @manifest ||= {}
+        @manifest[:entity] ||= {}
+
+        old_guid = @manifest[:entity][:"#{name}_guid"]
+        association_guid = assigned_value ? assigned_value.guid : nil
+
+        if old_guid != (association_guid)
+          old_obj =
+            @cache[name] || klass.new(@client, old_guid, @manifest[:entity][name])
+
+          @changes[name] = [old_obj, assigned_value]
+        end
+
+        @cache[name] = assigned_value
+
+        @manifest[:entity][:"#{name}_guid"] = association_guid
+        @diff[:"#{name}_guid"] = association_guid
+        assigned_value
+      end
+    end
+  end
+end

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/{model_magic_spec.rb → model_magic/model_magic/attribute_spec.rb}

@@ -1,10 +1,6 @@
 require "spec_helper"
 
 module CFoundry::V2
-  class Associated < FakeModel
-    attribute :attribute, String
-  end
-
   describe ModelMagic do
     let(:client) { fake_client }
     let(:mymodel) { fake_model }
@@ -122,96 +118,5 @@ module CFoundry::V2
         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
-
-        it "returns the assigned value" do
-          myobject.send(:foo=, otherobject).should == 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
-
-      describe 'associated create' do
-        let!(:model) { fake_model { to_one :associated } }
-        let(:instance) { model.new(nil, client).fake }
-        let!(:request) { WebMock.stub_request(:post, /v2\/associated/).to_return(:body => {:metadata => {:guid => "thing"}}.to_json) }
-
-        it 'returns a new associated object' do
-          instance.create_associated.should be_a(Associated)
-        end
-
-        it 'sets the relation' do
-          created = instance.create_associated
-          instance.associated.should == created
-        end
-
-        context 'with attributes for the association' do
-          it 'sets these attributes on the association' do
-            created = instance.create_associated(:attribute => 'value')
-            created.attribute.should == 'value'
-          end
-        end
-
-        it 'calls out to cloud_controller' do
-          instance.create_associated
-          request.should have_been_requested
-        end
-
-        context 'when creation fails' do
-          let!(:request) { WebMock.stub_request(:post, /v2\/associated/).to_raise(:not_authorized) }
-
-          it 'raises an exception' do
-            expect { instance.create_associated }.to raise_error(StandardError)
-          end
-        end
-      end
-    end
-
-    describe 'summarization for an arbitrary model' do
-      let(:mymodel) { fake_model { attribute :foo, :string } }
-      let(:summary_attributes) { {:foo => "abcd"} }
-
-      subject { myobject }
-
-      it_behaves_like 'a summarizeable model'
-    end
   end
 end

data/spec/cfoundry/v2/model_magic/model_magic/has_summary_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+module CFoundry::V2
+  describe ModelMagic do
+    let(:client) { fake_client }
+    let(:guid) { random_string("my-object-guid") }
+    let(:myobject) { mymodel.new(guid, client) }
+
+    describe 'summarization for an arbitrary model' do
+      let(:mymodel) { fake_model { attribute :foo, :string } }
+      let(:summary_attributes) { {:foo => "abcd"} }
+
+      subject { myobject }
+
+      it_behaves_like 'a summarizeable model'
+    end
+  end
+end

data/spec/cfoundry/v2/model_magic/model_magic/to_many_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+module CFoundry::V2
+  include ModelMagic::ToMany
+  
+  class AssociatedModel < FakeModel
+    attribute :attribute, String
+  end
+
+  describe ModelMagic::ToMany do
+    let(:client) { fake_client }
+    let(:mymodel) { fake_model }
+    let(:guid) { random_string("my-object-guid") }
+    let(:myobject) { mymodel.new(guid, client) }
+
+    describe "to_many relationships" do
+      describe "associated create" do
+        let!(:model) { fake_model { to_many :associated_models } }
+        let(:instance) { model.new(nil, client).fake }
+        let!(:create_request) { WebMock.stub_request(:post, /v2\/associated_model/).to_return(:body => {:metadata => {:guid => "thing"}}.to_json) }
+        let!(:add_request) { WebMock.stub_request(:put, /v2\/my_fake_models\/.*\/associated_models/).to_return(:body => {}.to_json) }
+
+        before do
+          stub_request(:get, /v2\/my_fake_models\/.*\/associated_models/)
+          instance.associated_models = []
+        end
+
+        it "returns a new associated object" do
+          instance.create_associated_model.should be_a(AssociatedModel)
+        end
+
+        it "sets the relation" do
+          created = instance.create_associated_model
+          instance.associated_models.should include(created)
+        end
+
+        context "with attributes for the association" do
+          it "sets these attributes on the association" do
+            created = instance.create_associated_model(:attribute => "value")
+            created.attribute.should == "value"
+          end
+        end
+
+        it "calls out to cloud_controller" do
+          instance.create_associated_model
+          create_request.should have_been_requested
+        end
+
+        context "when creation fails" do
+          let!(:create_request) { WebMock.stub_request(:post, /v2\/associated_model/).to_raise(:not_authorized) }
+
+          it "raises an exception" do
+            expect { instance.create_associated_model }.to raise_error(StandardError)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/cfoundry/v2/model_magic/model_magic/to_one_spec.rb

@@ -0,0 +1,97 @@
+require "spec_helper"
+
+module CFoundry::V2
+  include ModelMagic::ToOne
+  class Associated < FakeModel
+    attribute :attribute, String
+  end
+
+  describe ModelMagic::ToOne do
+    let(:client) { fake_client }
+    let(:mymodel) { fake_model }
+    let(:guid) { random_string("my-object-guid") }
+    let(:myobject) { mymodel.new(guid, client) }
+
+    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
+
+        it "returns the assigned value" do
+          myobject.send(:foo=, otherobject).should == 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
+
+      describe 'associated create' do
+        let!(:model) { fake_model { to_one :associated } }
+        let(:instance) { model.new(nil, client).fake }
+        let!(:request) { WebMock.stub_request(:post, /v2\/associated/).to_return(:body => {:metadata => {:guid => "thing"}}.to_json) }
+
+        it 'returns a new associated object' do
+          instance.create_associated.should be_a(Associated)
+        end
+
+        it 'sets the relation' do
+          created = instance.create_associated
+          instance.associated.should == created
+        end
+
+        context 'with attributes for the association' do
+          it 'sets these attributes on the association' do
+            created = instance.create_associated(:attribute => 'value')
+            created.attribute.should == 'value'
+          end
+        end
+
+        it 'calls out to cloud_controller' do
+          instance.create_associated
+          request.should have_been_requested
+        end
+
+        context 'when creation fails' do
+          let!(:request) { WebMock.stub_request(:post, /v2\/associated/).to_raise(:not_authorized) }
+
+          it 'raises an exception' do
+            expect { instance.create_associated }.to raise_error(StandardError)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -261,6 +261,12 @@ files:
 - lib/cfoundry/v2/client.rb
 - lib/cfoundry/v2/domain.rb
 - lib/cfoundry/v2/model.rb
+- lib/cfoundry/v2/model_magic/attribute.rb
+- lib/cfoundry/v2/model_magic/client_extensions.rb
+- lib/cfoundry/v2/model_magic/has_summary.rb
+- lib/cfoundry/v2/model_magic/queryable_by.rb
+- lib/cfoundry/v2/model_magic/to_many.rb
+- lib/cfoundry/v2/model_magic/to_one.rb
 - lib/cfoundry/v2/model_magic.rb
 - lib/cfoundry/v2/organization.rb
 - lib/cfoundry/v2/quota_definition.rb
@@ -306,7 +312,10 @@ files:
 - 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/model_magic/model_magic/attribute_spec.rb
+- spec/cfoundry/v2/model_magic/model_magic/has_summary_spec.rb
+- spec/cfoundry/v2/model_magic/model_magic/to_many_spec.rb
+- spec/cfoundry/v2/model_magic/model_magic/to_one_spec.rb
 - spec/cfoundry/v2/model_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
@@ -390,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 731683098158861932
+      hash: 3516132401454604907
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -430,7 +439,10 @@ test_files:
 - 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/model_magic/model_magic/attribute_spec.rb
+- spec/cfoundry/v2/model_magic/model_magic/has_summary_spec.rb
+- spec/cfoundry/v2/model_magic/model_magic/to_many_spec.rb
+- spec/cfoundry/v2/model_magic/model_magic/to_one_spec.rb
 - spec/cfoundry/v2/model_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb