iron_mq 1.3.1 → 1.4.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 1
-:minor: 3
-:patch: 1
+:minor: 4
+:patch: 0
 :build: 

data/iron_mq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iron_mq"
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2012-01-04"
+  s.date = "2012-01-05"
   s.description = "Ruby client for IronMQ"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [

data/lib/iron_mq/messages.rb

@@ -17,7 +17,20 @@ module IronMQ
     def get(options={})
       begin
         res, status = @client.get(path(options), options)
-        return Message.new(self, res)
+        @client.logger.debug "GET response: " + res.inspect
+        ret = []
+        res["messages"].each do |m|
+          ret << Message.new(self, m)
+        end
+        if options[:n]
+          return ret
+        else
+          if ret.size > 0
+            return ret[0]
+          else
+            return nil
+          end
+        end
       rescue IronMQ::Error => ex
         if ex.status == 404
           return nil
@@ -25,7 +38,6 @@ module IronMQ
         raise ex
       end
 
-
     end
 
     # options:
@@ -34,9 +46,24 @@ module IronMQ
     #  :timeout => The time in seconds to wait after message is taken off the queue, before it is put back on. Delete before :timeout to ensure it does not go back on the queue.
     #  :expires_in => After this time, message will be automatically removed from the queue.
     def post(payload, options={})
-      options[:body] = payload
-      res, status = @client.post(path(options), options)
-      return Message.new(self, res)
+      batch = false
+      if payload.is_a?(Array)
+        batch = true
+        msgs = payload
+      else
+        options[:body] = payload
+        msgs = []
+        msgs << options
+      end
+      to_send = {}
+      to_send[:messages] = msgs
+      res, status = @client.post(path(options), to_send)
+      #return Message.new(self, res)
+      if batch
+        return res
+      else
+        return ResponseBase.new({"id"=>res["ids"][0], "msg"=>res["msg"]})
+      end
     end
 
     def delete(message_id, options={})
@@ -47,10 +74,8 @@ module IronMQ
 
   end
 
-  class Message
-
-    def initialize(messages, res)
-      @messages = messages
+  class ResponseBase
+    def initialize(res)
       @data = res
     end
 
@@ -66,6 +91,20 @@ module IronMQ
       raw["id"]
     end
 
+    def msg
+      raw["msg"]
+    end
+
+  end
+
+  class Message < ResponseBase
+
+    def initialize(messages, res)
+      super(res)
+      @messages = messages
+    end
+
+
     def body
       raw["body"]
     end

data/test/test_base.rb

@@ -4,7 +4,7 @@ require 'yaml'
 begin
   require File.join(File.dirname(__FILE__), '../lib/iron_mq')
 rescue Exception => ex
-  puts "Could NOT load current ironmq: " + ex.message
+  puts "Could NOT load current iron_mq: " + ex.message
   raise ex
 end
 
@@ -23,6 +23,7 @@ class TestBase < Test::Unit::TestCase
 
   def load_config
     # check for config
+    # First check if running in abt worker
     if defined? $abt_config
       @config = $abt_config
       return @config
@@ -34,4 +35,18 @@ class TestBase < Test::Unit::TestCase
     end
 
   end
+
+
+  def clear_queue(queue_name=nil)
+    queue_name ||= @client.queue_name
+    puts "clearing queue #{queue_name}"
+    while res = @client.messages.get(:queue_name=>queue_name)
+      p res
+      puts res.body.to_s
+      res.delete
+    end
+    puts 'cleared.'
+  end
+
+
 end

data/test/test_iron_mq.rb

@@ -11,25 +11,28 @@ class IronMQTests < TestBase
   def setup
     super
 
-    puts 'clearing queue'
-    while res = @client.messages.get()
-      p res
-      puts res.body.to_s
-      res.delete
-    end
-    puts 'cleared.'
+    clear_queue()
 
   end
 
+
   def test_basics
+    @client.queue_name = 'test_basics'
+    clear_queue
 
     res = @client.messages.post("hello world!")
     p res
+    assert res["id"]
+    assert res.id
+    assert res.msg
+
     queue = @client.queues.get(:name=>@client.queue_name)
     assert queue.size == 1
 
     res = @client.messages.get()
     p res
+    assert res["id"]
+    assert res.id
 
     res = @client.messages.delete(res["id"])
     p res
@@ -46,6 +49,7 @@ class IronMQTests < TestBase
 
     msg = @client.messages.get()
     p msg
+    assert msg
 
     res = msg.delete
     p res
@@ -58,6 +62,9 @@ class IronMQTests < TestBase
 
   # TODO: pass :timeout in post/get messages and test those
   def test_timeout
+    @client.queue_name = "test_timeout"
+    clear_queue
+
     res = @client.messages.post("hello world timeout!")
     p res
 
@@ -87,7 +94,7 @@ class IronMQTests < TestBase
 
   def test_queues
     res = @client.queues.list()
-    puts "res.size=" + res.size.to_s
+    puts "res.size: " + res.size.to_s
     res.each do |q|
       puts "queue_name: " + q.name
       puts "queue size: " + q.size.to_s
@@ -96,7 +103,7 @@ class IronMQTests < TestBase
     assert res.size > 0
 
     res = @client.queues.list(:page=>5)
-    puts "res.size 2=" + res.size.to_s
+    puts "res.size 2: " + res.size.to_s
     res.each do |q|
       p q.name
     end
@@ -106,7 +113,50 @@ class IronMQTests < TestBase
   end
 
   def test_delay
-    # TODO
+    puts 'test_delay'
+    @client.queue_name = "test_delay"
+    clear_queue
+    msgTxt = "testMessage-"+Time.now.to_s
+    puts msgTxt
+    @client.messages.post(msgTxt, {:delay => 10})
+    msg = @client.messages.get
+    p msg
+    assert msg.nil?
+    sleep 10
+    msg = @client.messages.get
+    p msg
+    assert msg
+  end
+
+  def test_batch
+    puts 'test_batch'
+    @client.queue_name = "test_batch"
+    clear_queue
+
+    x = []
+    10.times do |i|
+      x << {:body=>"body #{i}"}
+    end
+    resp = @client.messages.post(x)
+    assert resp["ids"]
+    assert resp["ids"].is_a?(Array)
+    assert resp["ids"].size == 10
+
+    msg = @client.messages.get()
+    assert msg
+    assert msg['id']
+    msg.delete
+
+    msgs = @client.messages.get(:n=>10)
+    assert msgs.is_a?(Array)
+    assert msgs.size == 9, "size should be 9, but it's #{msgs.size}"
+    assert msgs[0]["id"]
+
+    msgs.each do |m|
+      m.delete
+    end
+
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &12253800 !ruby/object:Gem::Requirement
+  requirement: &24074940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12253800
+  version_requirements: *24074940
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &12253220 !ruby/object:Gem::Requirement
+  requirement: &24074340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12253220
+  version_requirements: *24074340
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &12252420 !ruby/object:Gem::Requirement
+  requirement: &24073540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12252420
+  version_requirements: *24073540
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &12251440 !ruby/object:Gem::Requirement
+  requirement: &24072540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12251440
+  version_requirements: *24072540
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []