cfoundry 0.3.4 → 0.3.5

data/lib/cfoundry/v1/base.rb

@@ -58,7 +58,7 @@ module CFoundry::V1
     end
 
     def create_user(payload)
-      post(payload, "users")
+      post(payload, "users", :json => nil)
     end
 
     def user(email)

data/lib/cfoundry/v2/client.rb

@@ -154,13 +154,16 @@ module CFoundry::V2
         end
       end
 
-      define_method(:"#{singular}_from") do |path|
+      define_method(:"#{singular}_from") do |path, *args|
+        depth, _ = args
+        depth ||= 1
+
         uri = URI.parse(path)
 
         if uri.query
-          uri.query += "&inline-relations-depth=1"
+          uri.query += "&inline-relations-depth=#{depth}"
         else
-          uri.query = "inline-relations-depth=1"
+          uri.query = "inline-relations-depth=#{depth}"
         end
 
         send(
@@ -171,13 +174,16 @@ module CFoundry::V2
             nil => :json))
       end
 
-      define_method(:"#{plural}_from") do |path|
+      define_method(:"#{plural}_from") do |path, *args|
+        depth, _ = args
+        depth ||= 1
+
         uri = URI.parse(path)
 
         if uri.query
-          uri.query += "&inline-relations-depth=1"
+          uri.query += "&inline-relations-depth=#{depth}"
         else
-          uri.query = "inline-relations-depth=1"
+          uri.query = "inline-relations-depth=#{depth}"
         end
 
         @base.request_path(

data/lib/cfoundry/v2/model.rb

@@ -28,7 +28,10 @@ module CFoundry::V2
           if manifest[:entity].key? name
             @client.send(:"make_#{obj}", manifest[:entity][name])
           else
-            @client.send(:"#{name}_from", send("#{obj}_url"))
+            @client.send(
+              :"#{obj}_from",
+              send("#{name}_url"),
+              opts[:depth] || 1)
           end
         }
 
@@ -46,7 +49,9 @@ module CFoundry::V2
 
       def to_many(plural, opts = {})
         singular = plural.to_s.sub(/s$/, "").to_sym
+
         object = opts[:as] || singular
+        plural_object = object.to_s.sub(/s$/, "").to_sym
 
         define_method(plural) {
           if manifest[:entity].key? plural
@@ -54,7 +59,10 @@ module CFoundry::V2
               @client.send(:"make_#{object}", json)
             end
           else
-            @client.send(:"#{plural}_from", send("#{plural}_url"))
+            @client.send(
+              :"#{plural_object}_from",
+              send("#{plural}_url"),
+              opts[:depth] || 1)
           end
         }
 
@@ -115,7 +123,7 @@ module CFoundry::V2
       @manifest =
         @client.base.send(
           :"create_#{object_name}",
-          @manifest[:entity].merge(self.class.defaults))
+          self.class.defaults.merge(@manifest[:entity]))
 
       @id = @manifest[:metadata][:guid]
 

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-15 00:00:00 Z
+date: 2012-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client