cfoundry 0.3.38 → 0.3.39

data/lib/cfoundry/v2/base.rb

@@ -68,8 +68,10 @@ module CFoundry::V2
       end
 
       define_method(plural) do |*args|
-        get("v2", plural, nil => :json, :params => params_from(args))
+        all_pages(
+          get("v2", plural, nil => :json, :params => params_from(args)))
       end
+
     end
 
     def resource_match(fingerprints)
@@ -120,6 +122,17 @@ module CFoundry::V2
       params
     end
 
+    def all_pages(paginated)
+      payload = paginated[:resources]
+
+      while next_page = paginated[:next_url]
+        paginated = request_path(:get, next_page, nil => :json)
+        payload += paginated[:resources]
+      end
+
+      payload
+    end
+
     private
 
     def handle_response(response, accept)

data/lib/cfoundry/v2/client.rb

@@ -167,7 +167,7 @@ module CFoundry::V2
           query[:space_guid] ||= current_space.guid
         end
 
-        @base.send(plural, depth, query)[:resources].collect do |json|
+        @base.send(plural, depth, query).collect do |json|
           send(:"make_#{singular}", json)
         end
       end
@@ -193,11 +193,14 @@ module CFoundry::V2
       end
 
       define_method(:"#{plural}_from") do |path, *args|
-        @base.request_path(
+        objs = @base.all_pages(
+          @base.request_path(
             :get,
             path,
             nil => :json,
-            :params => @base.params_from(args))[:resources].collect do |json|
+            :params => @base.params_from(args)))
+
+        objs.collect do |json|
           send(:"make_#{singular}", json)
         end
       end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 3
-  - 38
-  version: 0.3.38
+  - 39
+  version: 0.3.39
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-02 00:00:00 Z
+date: 2012-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client