cfoundry 0.3.41 → 0.3.42

data/lib/cfoundry/v2/app.rb

@@ -33,6 +33,8 @@ module CFoundry::V2
     to_many   :service_bindings
     to_many   :routes
 
+    scoped_to_space
+
     alias :total_instances :instances
     alias :total_instances= :instances=
 

data/lib/cfoundry/v2/client.rb

@@ -150,21 +150,41 @@ module CFoundry::V2
 
       klass = CFoundry::V2.const_get(classname)
 
-      has_space = klass.method_defined? :space
+      scoped_organization = klass.scoped_organization
+      scoped_space = klass.scoped_space
+
       has_name = klass.method_defined? :name
 
       define_method(singular) do |*args|
         guid, _ = args
-        klass.new(guid, self)
+
+        x = klass.new(guid, self)
+
+        # when creating an object, automatically set the org/space
+        unless guid
+          if scoped_organization && current_organization
+            x.send(:"#{scoped_organization}=", current_organization)
+          end
+
+          if scoped_space && current_space
+            x.send(:"#{scoped_space}=", current_space)
+          end
+        end
+
+        x
       end
 
       define_method(plural) do |*args|
         depth, query = args
         depth ||= 1
 
-        if has_space && current_space
+        # use current org/space
+        if scoped_space && current_space
+          query ||= {}
+          query[:"#{scoped_space}_guid"] ||= current_space.guid
+        elsif scoped_organization && current_organization
           query ||= {}
-          query[:space_guid] ||= current_space.guid
+          query[:"#{scoped_organization}_guid"] ||= current_organization.guid
         end
 
         @base.send(plural, depth, query).collect do |json|
@@ -177,8 +197,11 @@ module CFoundry::V2
           depth, _ = args
           depth ||= 1
 
-          if has_space && current_space
+          # use current org/space
+          if scoped_space && current_space
             current_space.send(plural, depth, :name => name).first
+          elsif scoped_organization && current_organization
+            current_organization.send(plural, depth, :name => name).first
           else
             send(plural, depth, :name => name).first
           end

data/lib/cfoundry/v2/domain.rb

@@ -4,5 +4,7 @@ module CFoundry::V2
   class Domain < Model
     attribute :name, :string
     to_one    :owning_organization, :as => :organization
+
+    scoped_to_organization :owning_organization
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -3,6 +3,8 @@ require "multi_json"
 module CFoundry::V2
   class Model
     class << self
+      attr_reader :scoped_organization, :scoped_space
+
       def value_matches?(val, type)
         case type
         when Class
@@ -61,6 +63,14 @@ module CFoundry::V2
         }
       end
 
+      def scoped_to_organization(relation = :organization)
+        @scoped_organization = relation
+      end
+
+      def scoped_to_space(relation = :space)
+        @scoped_space = relation
+      end
+
       def to_one(name, opts = {})
         obj = opts[:as] || name
         kls = obj.to_s.capitalize.gsub(/(.)_(.)/) do

data/lib/cfoundry/v2/route.rb

@@ -5,5 +5,7 @@ module CFoundry::V2
     attribute :host, :string
     to_one    :domain
     to_one    :organization
+
+    scoped_to_organization
   end
 end

data/lib/cfoundry/v2/service_instance.rb

@@ -6,5 +6,7 @@ module CFoundry::V2
     to_one    :space
     to_one    :service_plan
     to_many   :service_bindings
+
+    scoped_to_space
   end
 end

data/lib/cfoundry/v2/space.rb

@@ -10,5 +10,7 @@ module CFoundry::V2
     to_many   :apps
     to_many   :domains
     to_many   :service_instances
+
+    scoped_to_organization
   end
 end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 71
   prerelease: 
   segments: 
   - 0
   - 3
-  - 41
-  version: 0.3.41
+  - 42
+  version: 0.3.42
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 Z
+date: 2012-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client