cfoundry 0.4.2 → 0.4.3

data/lib/cfoundry/v2/model.rb

@@ -7,7 +7,7 @@ module CFoundry::V2
   class Model
     extend ModelMagic
 
-    attr_accessor :guid, :cache
+    attr_accessor :guid, :cache, :changes
 
     def initialize(guid, client, manifest = nil, partial = false)
       @guid = guid
@@ -16,6 +16,7 @@ module CFoundry::V2
       @partial = partial
       @cache = {}
       @diff = {}
+      @changes = {}
     end
 
     def manifest
@@ -26,6 +27,10 @@ module CFoundry::V2
       @partial
     end
 
+    def changed?
+      !@changes.empty?
+    end
+
     def inspect
       "\#<#{self.class.name} '#@guid'>"
     end
@@ -39,6 +44,7 @@ module CFoundry::V2
       @partial = false
       @cache = {}
       @diff = {}
+      @changes = {}
     end
 
     # this does a bit of extra processing to allow for

data/lib/cfoundry/v2/model_magic.rb

@@ -157,7 +157,11 @@ module CFoundry::V2
 
         @manifest ||= {}
         @manifest[:entity] ||= {}
+
+        old = @manifest[:entity][name]
+        @changes[name] = [old, val] if old != val
         @manifest[:entity][name] = val
+
         @diff[name] = val
       end
     end
@@ -201,17 +205,28 @@ module CFoundry::V2
         manifest[:entity][:"#{name}_url"]
       end
 
-      define_method(:"#{name}=") do |x|
-        unless has_default && x == default
-          ModelMagic.validate_type(x, CFoundry::V2.const_get(kls))
-        end
+      define_method(:"#{name}=") do |val|
+        klass = CFoundry::V2.const_get(kls)
 
-        @cache[name] = x
+        unless has_default && val == default
+          ModelMagic.validate_type(val, klass)
+        end
 
         @manifest ||= {}
         @manifest[:entity] ||= {}
+
+        old = @manifest[:entity][:"#{name}_guid"]
+        if old != val.guid
+          old_obj = 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"] = x && x.guid
+          @diff[:"#{name}_guid"] = val && val.guid
       end
     end
 
@@ -295,12 +310,29 @@ module CFoundry::V2
       end
 
       define_method(:"#{plural}=") do |xs|
-        ModelMagic.validate_type(xs, [CFoundry::V2.const_get(kls)])
+        klass = CFoundry::V2.const_get(kls)
 
-        @cache[plural] = xs
+        ModelMagic.validate_type(xs, [klass])
 
         @manifest ||= {}
         @manifest[:entity] ||= {}
+
+        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)
+              end
+            else
+              old.collect { |id| klass.new(@client, id) }
+            end
+
+          @changes[name] = [old_objs, val]
+        end
+
+        @cache[plural] = xs
+
         @manifest[:entity][:"#{singular}_guids"] =
           @diff[:"#{singular}_guids"] = xs.collect(&:guid)
       end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-30 00:00:00 -08:00
-default_executable: 
+date: 2012-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -111,44 +110,43 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
-- lib/cfoundry.rb
+- lib/cfoundry/baseclient.rb
+- lib/cfoundry/chatty_hash.rb
 - lib/cfoundry/client.rb
-- lib/cfoundry/version.rb
 - lib/cfoundry/errors.rb
 - lib/cfoundry/uaaclient.rb
-- lib/cfoundry/v2/service_binding.rb
-- lib/cfoundry/v2/service.rb
+- lib/cfoundry/upload_helpers.rb
+- lib/cfoundry/v1/app.rb
+- lib/cfoundry/v1/base.rb
+- lib/cfoundry/v1/client.rb
+- lib/cfoundry/v1/framework.rb
+- lib/cfoundry/v1/runtime.rb
+- lib/cfoundry/v1/service.rb
+- lib/cfoundry/v1/service_instance.rb
+- lib/cfoundry/v1/user.rb
+- lib/cfoundry/v2/app.rb
+- lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/client.rb
-- lib/cfoundry/v2/model.rb
-- lib/cfoundry/v2/user.rb
+- lib/cfoundry/v2/domain.rb
 - lib/cfoundry/v2/framework.rb
+- lib/cfoundry/v2/model.rb
 - lib/cfoundry/v2/model_magic.rb
-- lib/cfoundry/v2/service_auth_token.rb
-- lib/cfoundry/v2/space.rb
-- lib/cfoundry/v2/app.rb
-- lib/cfoundry/v2/service_plan.rb
-- lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/organization.rb
 - lib/cfoundry/v2/route.rb
-- lib/cfoundry/v2/domain.rb
 - lib/cfoundry/v2/runtime.rb
+- lib/cfoundry/v2/service.rb
+- lib/cfoundry/v2/service_auth_token.rb
+- lib/cfoundry/v2/service_binding.rb
 - lib/cfoundry/v2/service_instance.rb
-- lib/cfoundry/baseclient.rb
-- lib/cfoundry/upload_helpers.rb
-- lib/cfoundry/v1/service.rb
-- lib/cfoundry/v1/client.rb
-- lib/cfoundry/v1/user.rb
-- lib/cfoundry/v1/framework.rb
-- lib/cfoundry/v1/app.rb
-- lib/cfoundry/v1/base.rb
-- lib/cfoundry/v1/runtime.rb
-- lib/cfoundry/v1/service_instance.rb
+- lib/cfoundry/v2/service_plan.rb
+- lib/cfoundry/v2/space.rb
+- lib/cfoundry/v2/user.rb
+- lib/cfoundry/version.rb
 - lib/cfoundry/zip.rb
-- lib/cfoundry/chatty_hash.rb
+- lib/cfoundry.rb
+- spec/client_spec.rb
 - spec/helpers.rb
 - spec/Rakefile
-- spec/client_spec.rb
-has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -178,11 +176,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cfoundry
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
 test_files: 
+- spec/client_spec.rb
 - spec/helpers.rb
 - spec/Rakefile
-- spec/client_spec.rb