cfoundry 0.3.54 → 0.3.55

data/lib/cfoundry/v2/app.rb

@@ -27,7 +27,7 @@ module CFoundry::V2
     attribute :instances,        :integer, :default => 1
     attribute :file_descriptors, :integer, :default => 256
     attribute :disk_quota,       :integer, :default => 256
-    attribute :state,            :integer, :default => "STOPPED"
+    attribute :state,            :string,  :default => "STOPPED"
     attribute :command,          :string,  :default => nil
     attribute :console,          :boolean, :default => false
     to_many   :service_bindings
@@ -35,6 +35,43 @@ module CFoundry::V2
 
     scoped_to_space
 
+    has_summary :urls => proc { |x| self.cache[:uris] = x },
+      :running_instances => proc { |x|
+        self.cache[:running_instances] = x
+      },
+
+      # TODO: remove these when cc consistently returns nested hashes
+      :framework_guid => proc { |x|
+        if f = self.cache[:framework]
+          f.guid = x
+        else
+          self.framework = @client.framework(x, true)
+        end
+      },
+      :framework_name => proc { |x|
+        if f = self.cache[:framework]
+          f.name = x
+        else
+          self.framework = @client.framework(nil, true)
+          self.framework.name = x
+        end
+      },
+      :runtime_guid => proc { |x|
+        if f = self.cache[:runtime]
+          f.guid = x
+        else
+          self.runtime = @client.runtime(x, true)
+        end
+      },
+      :runtime_name => proc { |x|
+        if f = self.cache[:runtime]
+          f.name = x
+        else
+          self.runtime = @client.runtime(nil, true)
+          self.runtime.name = x
+        end
+      }
+
     alias :total_instances :instances
     alias :total_instances= :instances=
 
@@ -81,6 +118,8 @@ module CFoundry::V2
     end
 
     def uris
+      return @cache[:uris] if @cache[:uris]
+
       routes.collect do |r|
         "#{r.host}.#{r.domain.name}"
       end
@@ -121,6 +160,10 @@ module CFoundry::V2
     alias :create_route :create_routes
 
     def uri
+      if uris = @cache[:uris]
+        return uris.first
+      end
+
       if route = routes.first
         "#{route.host}.#{route.domain.name}"
       end
@@ -175,6 +218,8 @@ module CFoundry::V2
     end
 
     def running_instances
+      return @cache[:running_instances] if @cache[:running_instances]
+
       running = 0
 
       instances.each do |i|

data/lib/cfoundry/v2/client.rb

@@ -166,9 +166,9 @@ module CFoundry::V2
       has_name = klass.method_defined? :name
 
       define_method(singular) do |*args|
-        guid, _ = args
+        guid, partial, _ = args
 
-        x = klass.new(guid, self)
+        x = klass.new(guid, self, nil, partial)
 
         # when creating an object, automatically set the org/space
         unless guid

data/lib/cfoundry/v2/model.rb

@@ -41,7 +41,21 @@ module CFoundry::V2
         @defaults ||= {}
       end
 
+      def attributes
+        @attributes ||= {}
+      end
+
+      def to_one_relations
+        @to_one_relations ||= {}
+      end
+
+      def to_many_relations
+        @to_many_relations ||= {}
+      end
+
       def attribute(name, type, opts = {})
+        attributes[name] = opts
+
         default = opts[:default]
 
         if has_default = opts.key?(:default)
@@ -49,7 +63,9 @@ module CFoundry::V2
         end
 
         define_method(name) {
-          manifest[:entity][name] || default
+          return @cache[name] if @cache.key?(name)
+
+          @cache[name] = manifest[:entity][name] || default
         }
 
         define_method(:"#{name}=") { |val|
@@ -57,6 +73,8 @@ module CFoundry::V2
             Model.validate_type(val, type)
           end
 
+          @cache[name] = val
+
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][name] = val
@@ -73,6 +91,8 @@ module CFoundry::V2
       end
 
       def to_one(name, opts = {})
+        to_one_relations[name] = opts
+
         obj = opts[:as] || name
         kls = obj.to_s.capitalize.gsub(/(.)_(.)/) do
           $1 + $2.upcase
@@ -85,13 +105,16 @@ module CFoundry::V2
         end
 
         define_method(name) {
-          if @manifest && @manifest[:entity].key?(name)
-            @client.send(:"make_#{obj}", @manifest[:entity][name])
-          elsif url = send("#{name}_url")
-            @client.send(:"#{obj}_from", url, opts[:depth] || 1)
-          else
-            default
-          end
+          return @cache[name] if @cache.key?(name)
+
+          @cache[name] =
+            if @manifest && @manifest[:entity].key?(name)
+              @client.send(:"make_#{obj}", @manifest[:entity][name])
+            elsif url = send("#{name}_url")
+              @client.send(:"#{obj}_from", url, opts[:depth] || 1)
+            else
+              default
+            end
         }
 
         define_method(:"#{name}_url") {
@@ -103,6 +126,8 @@ module CFoundry::V2
             Model.validate_type(x, CFoundry::V2.const_get(kls))
           end
 
+          @cache[name] = x
+
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{name}_guid"] =
@@ -111,6 +136,8 @@ module CFoundry::V2
       end
 
       def to_many(plural, opts = {})
+        to_many_relations[plural] = opts
+
         singular = plural.to_s.sub(/s$/, "").to_sym
 
         object = opts[:as] || singular
@@ -121,6 +148,10 @@ module CFoundry::V2
         end
 
         define_method(plural) { |*args|
+          if cache = @cache[plural]
+            return cache
+          end
+
           depth, query = args
 
           if @manifest && @manifest[:entity].key?(plural) && !depth
@@ -132,15 +163,17 @@ module CFoundry::V2
               objs = objs.select { |o| o[:entity][find_by] == find_val }
             end
 
-            objs.collect do |json|
-              @client.send(:"make_#{object}", json)
-            end
+            @cache[plural] =
+              objs.collect do |json|
+                @client.send(:"make_#{object}", json)
+              end
           else
-            @client.send(
-              :"#{plural_object}_from",
-              "/v2/#{object_name}s/#@guid/#{plural}",
-              depth || opts[:depth],
-              query)
+            @cache[plural] =
+              @client.send(
+                :"#{plural_object}_from",
+                "/v2/#{object_name}s/#@guid/#{plural}",
+                depth || opts[:depth],
+                query)
           end
         }
 
@@ -149,9 +182,12 @@ module CFoundry::V2
         }
 
         define_method(:"add_#{singular}") { |x|
-          # TODO: reflect this change in the app manifest?
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
+          if cache = @cache[plural]
+            cache << x unless cache.include?(x)
+          end
+
           @client.base.request_path(
             Net::HTTP::Put,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
@@ -159,9 +195,12 @@ module CFoundry::V2
         }
 
         define_method(:"remove_#{singular}") { |x|
-          # TODO: reflect this change in the app manifest?
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
+          if cache = @cache[plural]
+            cache.delete(x)
+          end
+
           @client.base.request_path(
             Net::HTTP::Delete,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
@@ -171,20 +210,67 @@ module CFoundry::V2
         define_method(:"#{plural}=") { |xs|
           Model.validate_type(xs, [CFoundry::V2.const_get(kls)])
 
+          @cache[plural] = xs
+
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{singular}_guids"] =
             @diff[:"#{singular}_guids"] = xs.collect(&:guid)
         }
       end
+
+      def has_summary(actions = {})
+        define_method(:summary) do
+          @client.base.request_path(
+            Net::HTTP::Get,
+            ["v2", "#{object_name}s", @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 { |sub|
+                obj = @client.send(singular, sub[:guid], true)
+                obj.summarize! sub
+                obj
+              }
+
+              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
 
-    attr_reader :guid
+    attr_accessor :guid, :cache
 
-    def initialize(guid, client, manifest = nil)
+    def initialize(guid, client, manifest = nil, partial = false)
       @guid = guid
       @client = client
       @manifest = manifest
+      @partial = partial
+      @cache = {}
       @diff = {}
     end
 
@@ -192,6 +278,10 @@ module CFoundry::V2
       @manifest ||= @client.base.send(object_name, @guid)
     end
 
+    def partial?
+      @partial
+    end
+
     def inspect
       "\#<#{self.class.name} '#@guid'>"
     end
@@ -205,6 +295,8 @@ module CFoundry::V2
 
     def invalidate!
       @manifest = nil
+      @partial = false
+      @cache = {}
       @diff = {}
     end
 

data/lib/cfoundry/v2/space.rb

@@ -12,5 +12,7 @@ module CFoundry::V2
     to_many   :service_instances
 
     scoped_to_organization
+
+    has_summary
   end
 end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.54"
+  VERSION = "0.3.55"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 125
   prerelease: 
   segments: 
   - 0
   - 3
-  - 54
-  version: 0.3.54
+  - 55
+  version: 0.3.55
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-07 00:00:00 Z
+date: 2012-11-10 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -110,42 +111,43 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
-- lib/cfoundry/baseclient.rb
-- lib/cfoundry/chatty_hash.rb
+- lib/cfoundry.rb
 - lib/cfoundry/client.rb
+- lib/cfoundry/version.rb
 - lib/cfoundry/errors.rb
 - lib/cfoundry/uaaclient.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/service_binding.rb
+- lib/cfoundry/v2/service.rb
 - lib/cfoundry/v2/client.rb
-- lib/cfoundry/v2/domain.rb
-- lib/cfoundry/v2/framework.rb
 - lib/cfoundry/v2/model.rb
+- lib/cfoundry/v2/user.rb
+- lib/cfoundry/v2/framework.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/v2/service_plan.rb
-- lib/cfoundry/v2/space.rb
-- lib/cfoundry/v2/user.rb
-- lib/cfoundry/version.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/zip.rb
-- lib/cfoundry.rb
-- spec/client_spec.rb
+- lib/cfoundry/chatty_hash.rb
 - spec/helpers.rb
 - spec/Rakefile
+- spec/client_spec.rb
+has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -175,11 +177,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cfoundry
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 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