cloud-queues 1.0.2 → 1.0.3

data/lib/cloud-queues/client.rb

@@ -131,13 +131,14 @@ module CloudQueues
         limit = 10
       end
 
-      response = request(options)
+      first_response = response = request(options)
 
-      if collection_key and response.status != 204
+      if collection_key and first_response.status != 204
         # the next href link will have the query represented in it
         options.delete :query
 
-        collection = response.body[collection_key]
+        collection = first_response.body[collection_key]
+        last_links = first_response.body["links"]
 
         while response.body[collection_key].count >= limit and collection.count < absolute_limit
           next_link = response.body["links"].select{|l| l["rel"] == "next" }[0]["href"]
@@ -147,12 +148,14 @@ module CloudQueues
 
           break if response.status == 204
           collection += response.body[collection_key]
+          last_links = response.body["links"]
         end
 
-        response.body[collection_key] = collection
+        first_response.body[collection_key] = collection
+        first_response.body["links"] = last_links
       end
 
-      return response
+      return first_response
     end
 
     private

data/lib/cloud-queues/messages.rb

@@ -23,11 +23,16 @@ module CloudQueues
 
     def next(options = {})
       if @marker
-        @queue.messages options.merge(marker: @marker)
+        more = @queue.messages options.merge(marker: @marker)
+        if more.class == Array and more.count == 0
+          @messages = more
+          return self
+        end
+        return more
       else
         # We don't have a next marker because this set of messages was
         # never intended to be part of a larger set.
-        nil
+        return nil
       end
     end
 

data/lib/cloud-queues/version.rb

@@ -1,3 +1,3 @@
 module CloudQueues
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-queues
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon