cfoundry 0.3.2 → 0.3.3

data/lib/cfoundry/v1/client.rb

@@ -187,6 +187,9 @@ module CFoundry::V1
       App.new(name, self)
     end
 
+    # TODO: remove once v2 allows filtering by name
+    # see V2::Client#app_by_name
+    alias :app_by_name :app
 
     # Retrieve all of the current user's services.
     def service_instances

data/lib/cfoundry/v2/base.rb

@@ -46,8 +46,9 @@ module CFoundry::V2
     end
 
 
-    [:app, :organization, :app_space, :service, :service_instance,
-      :user, :runtime, :framework].each do |obj|
+    [ :app, :organization, :app_space, :user, :runtime, :framework,
+      :service, :service_plan, :service_binding, :service_instance
+    ].each do |obj|
       plural = "#{obj}s"
 
       define_method(obj) do |guid, *args|

data/lib/cfoundry/v2/client.rb

@@ -5,7 +5,9 @@ require "cfoundry/v2/framework"
 require "cfoundry/v2/organization"
 require "cfoundry/v2/runtime"
 require "cfoundry/v2/service"
+require "cfoundry/v2/service_binding"
 require "cfoundry/v2/service_instance"
+require "cfoundry/v2/service_plan"
 require "cfoundry/v2/space"
 require "cfoundry/v2/user"
 
@@ -113,14 +115,26 @@ module CFoundry::V2
     end
 
 
-    [:app, :organization, :app_space, :service, :service_binding,
-      :service_instance, :user, :runtime, :framework].each do |singular|
+    # TODO: allow direct filtering
+    def app_by_name(name)
+      current_space.apps.find do |a|
+        a.name == name
+      end
+    end
+
+
+    [ :app, :organization, :app_space, :user, :runtime, :framework,
+      :service, :service_plan, :service_binding, :service_instance
+    ].each do |singular|
       klass = singular.to_s.capitalize.gsub(/(.)_(.)/) do
         $1 + $2.upcase
       end
 
       plural = :"#{singular}s"
 
+      has_app_space =
+        CFoundry::V2.const_get(klass).method_defined? :app_space
+
       define_method(singular) do |*args|
         id, _ = args
         CFoundry::V2.const_get(klass).new(id, self)
@@ -130,6 +144,11 @@ module CFoundry::V2
         depth, query = args
         depth ||= 1
 
+        if has_app_space
+          query ||= {}
+          query[:app_space_guid] ||= current_space.id
+        end
+
         @base.send(plural, depth, query)[:resources].collect do |json|
           send(:"make_#{singular}", json)
         end

data/lib/cfoundry/v2/model.rb

@@ -17,6 +17,7 @@ module CFoundry::V2
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][name] = val
+          @diff[name] = val
         }
       end
 
@@ -38,7 +39,8 @@ module CFoundry::V2
         define_method(:"#{name}=") { |x|
           @manifest ||= {}
           @manifest[:entity] ||= {}
-          @manifest[:entity][:"#{name}_guid"] = x.id
+          @manifest[:entity][:"#{name}_guid"] =
+            @diff[:"#{name}_guid"] = x.id
         }
       end
 
@@ -78,7 +80,8 @@ module CFoundry::V2
         define_method(:"#{plural}=") { |xs|
           @manifest ||= {}
           @manifest[:entity] ||= {}
-          @manifest[:entity][:"#{singular}_guids"] = xs.collect(&:id)
+          @manifest[:entity][:"#{singular}_guids"] =
+            @diff[:"#{singular}_guids"] = xs.collect(&:id)
         }
       end
     end
@@ -89,6 +92,7 @@ module CFoundry::V2
       @id = id
       @client = client
       @manifest = manifest
+      @diff = {}
     end
 
     def manifest
@@ -118,11 +122,8 @@ module CFoundry::V2
       true
     end
 
-    def update!(diff = nil)
-      @client.base.send(
-        :"update_#{object_name}",
-        @id,
-        diff || manifest[:entity])
+    def update!(diff = @diff)
+      @client.base.send(:"update_#{object_name}", @id, diff)
 
       @manifest = nil
     end

data/lib/cfoundry/v2/service_binding.rb

@@ -0,0 +1,11 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class ServiceBinding < Model
+    attribute :credentials
+    attribute :binding_options, :default => {}
+    attribute :vendor_data, :default => {}
+    to_one    :app
+    to_one    :service_instance
+  end
+end

data/lib/cfoundry/v2/service_instance.rb

@@ -8,5 +8,8 @@ module CFoundry::V2
     to_many   :service_bindings
     attribute :credentials
     attribute :vendor_data, :default => ""
+
+    alias :space :app_space
+    alias :space= :app_space=
   end
 end

data/lib/cfoundry/v2/space.rb

@@ -9,5 +9,6 @@ module CFoundry::V2
     to_many   :auditors, :as => :user
     to_many   :apps
     to_many   :domains
+    to_many   :service_instances
   end
 end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 Z
+date: 2012-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -126,6 +126,7 @@ files:
 - lib/cfoundry/v2/organization.rb
 - lib/cfoundry/v2/runtime.rb
 - lib/cfoundry/v2/service.rb
+- lib/cfoundry/v2/service_binding.rb
 - lib/cfoundry/v2/service_instance.rb
 - lib/cfoundry/v2/service_plan.rb
 - lib/cfoundry/v2/space.rb