cfoundry 0.3.51 → 0.3.52

data/lib/cfoundry/baseclient.rb

@@ -41,7 +41,7 @@ module CFoundry
 
     def parse_json(x)
       if x.empty?
-        raise MultiJson::DecodeError, "Empty JSON string", [], ""
+        raise MultiJson::DecodeError.new("Empty JSON string", [], "")
       else
         MultiJson.load(x, :symbolize_keys => true)
       end

data/lib/cfoundry/v2/app.rb

@@ -111,7 +111,7 @@ module CFoundry::V2
           route = @client.route
           route.host = host
           route.domain = domain
-          route.organization = @client.current_organization
+          route.space = space
           route.create!
         end
 

data/lib/cfoundry/v2/base.rb

@@ -186,7 +186,7 @@ module CFoundry::V2
         "[%s]  %0.3fs  %s  %6s -> %d  %s\n",
         Time.now.strftime("%F %T"),
         data[:time],
-        data[:response][:headers][:x_vcap_request_id],
+        data[:response][:headers]["x-vcap-request-id"],
         data[:request][:method].to_s.upcase,
         data[:response][:code],
         data[:request][:url])

data/lib/cfoundry/v2/domain.rb

@@ -4,8 +4,9 @@ module CFoundry::V2
   class Domain < Model
     attribute :name, :string
     attribute :wildcard, :boolean, :default => true
-    to_one    :owning_organization, :as => :organization
+    to_one    :owning_organization, :as => :organization, :default => nil
 
-    scoped_to_organization :owning_organization
+    # hide wildcard support for now
+    private :wildcard=
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -78,11 +78,19 @@ module CFoundry::V2
           $1 + $2.upcase
         end
 
+        default = opts[:default]
+
+        if has_default = opts.key?(:default)
+          defaults[:"#{name}_guid"] = default
+        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
         }
 
@@ -91,12 +99,14 @@ module CFoundry::V2
         }
 
         define_method(:"#{name}=") { |x|
-          Model.validate_type(x, CFoundry::V2.const_get(kls))
+          unless has_default && x == default
+            Model.validate_type(x, CFoundry::V2.const_get(kls))
+          end
 
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{name}_guid"] =
-            @diff[:"#{name}_guid"] = x.guid
+            @diff[:"#{name}_guid"] = x && x.guid
         }
       end
 

data/lib/cfoundry/v2/route.rb

@@ -4,7 +4,7 @@ module CFoundry::V2
   class Route < Model
     attribute :host, :string
     to_one    :domain
-    to_one    :organization
+    to_one    :space
 
     def name
       "#{host}.#{domain.name}"

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 123
   prerelease: 
   segments: 
   - 0
   - 3
-  - 51
-  version: 0.3.51
+  - 52
+  version: 0.3.52
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-01 00:00:00 Z
+date: 2012-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post