cfoundry 0.3.26 → 0.3.27

data/lib/cfoundry/v2/app.rb

@@ -29,6 +29,7 @@ module CFoundry::V2
     attribute :disk_quota,       :integer, :default => 256
     attribute :state,            :integer, :default => "STOPPED"
     to_many   :service_bindings
+    to_many   :routes
 
     alias :total_instances :instances
     alias :total_instances= :instances=
@@ -63,13 +64,15 @@ module CFoundry::V2
       nil
     end
 
-    def uris # TODO v2
-      []
+    def uris
+      routes.collect do |r|
+        "#{r.host}.#{r.domain.name}"
+      end
     end
     alias :urls :uris
 
     def uris=(x)
-      nil
+      raise "App#uris= is invalid against V2 APIs. Use add/remove_route."
     end
     alias :urls= :uris=
 

data/lib/cfoundry/v2/base.rb

@@ -47,7 +47,7 @@ module CFoundry::V2
 
 
     [ :app, :organization, :space, :user, :runtime, :framework, :service,
-      :domain, :service_plan, :service_binding, :service_instance,
+      :domain, :route, :service_plan, :service_binding, :service_instance,
       :service_auth_token
     ].each do |obj|
       plural = "#{obj}s"

data/lib/cfoundry/v2/client.rb

@@ -15,6 +15,7 @@ require "cfoundry/v2/service_auth_token"
 require "cfoundry/v2/space"
 require "cfoundry/v2/user"
 require "cfoundry/v2/domain"
+require "cfoundry/v2/route"
 
 module CFoundry::V2
   # The primary API entrypoint. Wraps a BaseClient to provide nicer return
@@ -123,7 +124,7 @@ module CFoundry::V2
 
 
     [ :app, :organization, :space, :user, :runtime, :framework, :service,
-      :domain, :service_plan, :service_binding, :service_instance,
+      :domain, :route, :service_plan, :service_binding, :service_instance,
       :service_auth_token
     ].each do |singular|
       plural = :"#{singular}s"

data/lib/cfoundry/v2/domain.rb

@@ -3,6 +3,6 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class Domain < Model
     attribute :name, :string
-    to_one    :organization
+    to_one    :owning_organization, :as => :organization
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -130,8 +130,8 @@ module CFoundry::V2
           manifest[:entity][:"#{plural}_url"]
         }
 
-        # TODO: these are hacky
         define_method(:"add_#{singular}") { |x|
+          # TODO: reflect this change in the app manifest?
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
           @client.base.request_path(
@@ -140,7 +140,10 @@ module CFoundry::V2
             nil => :json)
         }
 
-        define_method(:"remove_#{singular}") {
+        define_method(:"remove_#{singular}") { |x|
+          # TODO: reflect this change in the app manifest?
+          Model.validate_type(x, CFoundry::V2.const_get(kls))
+
           @client.base.request_path(
             :delete,
             ["v2", "#{object_name}s", @guid, plural, x.guid],

data/lib/cfoundry/v2/route.rb

@@ -0,0 +1,9 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class Route < Model
+    attribute :host, :string
+    to_one    :domain
+    to_one    :organization
+  end
+end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 3
-  - 26
-  version: 0.3.26
+  - 27
+  version: 0.3.27
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
+date: 2012-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -131,6 +131,7 @@ files:
 - lib/cfoundry/v2/framework.rb
 - lib/cfoundry/v2/model.rb
 - lib/cfoundry/v2/organization.rb
+- lib/cfoundry/v2/route.rb
 - lib/cfoundry/v2/runtime.rb
 - lib/cfoundry/v2/service.rb
 - lib/cfoundry/v2/service_auth_token.rb