cloud-queues 1.0.1 → 1.0.2

data/lib/cloud-queues.rb

@@ -8,4 +8,5 @@ require_relative "cloud-queues/version"
 require_relative "cloud-queues/client"
 require_relative "cloud-queues/queue"
 require_relative "cloud-queues/message"
+require_relative "cloud-queues/messages"
 require_relative "cloud-queues/claim"

data/lib/cloud-queues/claim.rb

@@ -30,8 +30,7 @@ module CloudQueues
     end
 
     def messages
-      msgs = refresh["messages"]
-      @messages = msgs.map { |message| Message.new(queue, message) }
+      @messages = process_messages(refresh)
     end
 
     def update(options = {})
@@ -54,6 +53,10 @@ module CloudQueues
 
     private
 
+    def process_messages(body)
+      Messages.new(queue, body["messages"].map{|msg| Message.new(queue, msg) }, body["links"] )
+    end
+
     def refresh
       @client.request(method: :get, path: path).body
     end

data/lib/cloud-queues/messages.rb

@@ -0,0 +1,42 @@
+module CloudQueues
+  class Messages
+    include Enumerable
+
+    attr_accessor :queue
+
+    attr_reader :marker
+
+    def initialize(queue, msgs, links)
+      @queue = queue
+      @messages = msgs
+
+      @marker = find_marker links if links
+    end
+
+    def each(&block)
+      @messages.each(&block)
+    end
+
+    def [](index)
+      @messages[index]
+    end
+
+    def next(options = {})
+      if @marker
+        @queue.messages options.merge(marker: @marker)
+      else
+        # We don't have a next marker because this set of messages was
+        # never intended to be part of a larger set.
+        nil
+      end
+    end
+
+    private
+
+    def find_marker(links)
+      uri = URI.parse(links.select{|link| link["rel"] == "next" }[0]["href"])
+      return uri.query.match(/marker=([^&]+)/)[1]
+    end
+
+  end
+end

data/lib/cloud-queues/queue.rb

@@ -39,13 +39,17 @@ module CloudQueues
       response = @client.request_all(options.class == String ? nil : "messages",
                                      method: :get, path: "#{path}/messages", expects: [200, 204], query: options)
       return [] if response.status == 204
-      response.body.class == Hash ? process_messages(response.body["messages"]) : process_messages(response.body)
+      if response.body.class == Hash
+        return process_messages(response.body["messages"], response.body["links"])
+      else
+        return process_messages(response.body)
+      end
     end
 
     def get(id, options = {})
       options = options[:claim_id] ? {claim_id: options[:claim_id]} : {}
       msgs = @client.request(method: :get, path: "#{path}/messages/#{id}", query: options)
-      process_messages([msgs.body])[0]
+      process_message(msgs.body)
     end
 
     def put(*msgs)
@@ -132,8 +136,12 @@ module CloudQueues
 
     private
 
-    def process_messages(msgs)
-      msgs.map { |message| Message.new(self, message) }
+    def process_messages(msgs, links = nil)
+      Messages.new(self, msgs.map{|msg| process_message(msg) }, links)
+    end
+
+    def process_message(msg)
+      Message.new(self, msg)
     end
 
     def process_claim(claim_id, msgs)

data/lib/cloud-queues/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-queues
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -60,6 +60,7 @@ files:
 - lib/cloud-queues/claim.rb
 - lib/cloud-queues/client.rb
 - lib/cloud-queues/message.rb
+- lib/cloud-queues/messages.rb
 - lib/cloud-queues/queue.rb
 - lib/cloud-queues/version.rb
 - lib/cloud-queues.rb