iron_mq 1.4.1 → 1.5.0

data/VERSION.yml

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

data/iron_mq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iron_mq"
-  s.version = "1.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2012-02-08"
+  s.date = "2012-03-02"
   s.description = "Ruby client for IronMQ"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -29,7 +29,9 @@ Gem::Specification.new do |s|
     "test/long_run.rb",
     "test/long_run_worker.rb",
     "test/quick_run.rb",
+    "test/schedule_abt.rb",
     "test/test_base.rb",
+    "test/test_beanstalkd.rb",
     "test/test_iron_mq.rb"
   ]
   s.homepage = "http://www.iron.io"

data/lib/iron_mq/client.rb

@@ -105,11 +105,16 @@ module IronMQ
       # todo: check content-type == application/json before parsing
       @logger.debug "response code=" + status.to_s
       @logger.debug "response body=" + body.inspect
-      res = JSON.parse(body)
+      begin
+        res = JSON.parse(body)
+      rescue => ex
+        # an unexpected error response
+        raise IronMQ::Error.new("Status #{status}: #{ex.class.name}: #{ex.message}", :status=>status)
+      end
       if status < 400
 
       else
-        raise IronMQ::Error.new(res["msg"], :status=>status)
+        raise IronMQ::Error.new("Status #{status}: #{res["msg"]}", :status=>status)
       end
       res
     end

data/lib/iron_mq/messages.rb

@@ -69,7 +69,7 @@ module IronMQ
     def delete(message_id, options={})
       path2 = "#{self.path(options)}/#{message_id}"
       res, status = @client.delete(path2)
-      res
+      return ResponseBase.new(res)
     end
 
   end

data/test/long_run.rb

@@ -20,11 +20,11 @@ end
 worker = LongRunWorker.new
 worker.config = @config
 worker.num_to_add = @num_to_add
-#worker.run_local
-worker.queue
-status = worker.wait_until_complete
-p status
-puts worker.get_log
+worker.run_local
+#worker.queue
+#status = worker.wait_until_complete
+#p status
+#puts worker.get_log
 
 
 

data/test/schedule_abt.rb

@@ -0,0 +1,4 @@
+worker = Abt::TestWorker.new
+worker.git_url = "git://github.com/iron-io/iron_mq_ruby.git"
+worker.test_config = @test_config
+worker.run_local

data/test/test_beanstalkd.rb

@@ -0,0 +1,53 @@
+# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
+
+#$abt_config = {:hello=>'abt_config_ya'}
+
+gem 'test-unit'
+require 'test/unit'
+require 'beanstalk-client'
+require 'yaml'
+require_relative 'test_base'
+
+class IronMQTests < TestBase
+  def setup
+    super
+
+  end
+
+  def test_beanstalk
+    puts 'test_beanstalk'
+    config = @config['iron_mq']
+    h = "#{config['host']||"mq-aws-us-east-1.iron.io"}:#{config['beanstalkd_port']||11300}"
+    puts "beanstalkd url: #{h}"
+    beanstalk = Beanstalk::Connection.new(h)
+    beanstalk.put("oauth #{config['token']} #{config['project_id']}")
+    queue_name = "beanstalk_test"
+    clear_queue(queue_name)
+    beanstalk.use(queue_name)
+    beanstalk.watch(queue_name)
+
+    msg = "hello #{Time.now}"
+    beanstalk.put(msg)
+    job = beanstalk.reserve
+    assert_equal msg, job.body, "body not the same as message."
+    job.delete
+    job = assert_raise(Beanstalk::TimedOut) {
+      beanstalk.reserve(1)
+    }
+
+    hasher = {:x => 1, :y => "hello", "yo" => "scooby doo"}
+    beanstalk.put(hasher.to_json)
+    job = beanstalk.reserve(1)
+    got = JSON.parse(job.body)
+    assert got.is_a?(Hash)
+    assert_equal hasher[:x], got['x']
+    job.delete
+
+    msg = "hello there\nthis is a new line"
+    beanstalk.put(msg)
+    job = beanstalk.reserve(1)
+    assert_equal msg, job.body, "#{job.body} does not equal #{msg}"
+    job.delete
+  end
+
+end

data/test/test_iron_mq.rb

@@ -12,6 +12,9 @@ class IronMQTests < TestBase
   def setup
     super
 
+    queues = @client.queues.list
+    p queues
+
     clear_queue()
 
   end
@@ -73,6 +76,7 @@ class IronMQTests < TestBase
 
     msg = @client.messages.get()
     p msg
+    assert msg
 
     msg4 = @client.messages.get()
     p msg4
@@ -93,6 +97,20 @@ class IronMQTests < TestBase
 
     msg2.delete
 
+    # now try explicit timeout
+    res = @client.messages.post("hello world timeout2!", :timeout=>10)
+    p res
+    msg = @client.messages.get()
+    p msg
+    assert msg
+    msg4 = @client.messages.get()
+    p msg4
+    assert msg4.nil?
+    puts 'sleeping 15 seconds...'
+    msg2 = @client.messages.get()
+    assert msg2
+    assert msg.id == msg2.id
+
   end
 
   def test_queues
@@ -160,37 +178,5 @@ class IronMQTests < TestBase
     end
   end
 
-  def test_beanstalk
-    puts 'test_beanstalk'
-    config = @config['iron_mq']
-    h = "#{config['host']||"mq-aws-us-east-1.iron.io"}:#{config['beanstalkd_port']||11300}"
-    beanstalk = Beanstalk::Connection.new(h)
-    beanstalk.put("oauth #{config['token']} #{config['project_id']}")
-    beanstalk.use(@client.queue_name)
-    beanstalk.watch(@client.queue_name)
-
-    msg = "hello #{Time.now}"
-    beanstalk.put(msg)
-    job = beanstalk.reserve
-    assert_equal msg, job.body, "body not the same as message."
-    job.delete
-    job = assert_raise(Beanstalk::TimedOut) {
-      beanstalk.reserve(1)
-    }
-
-    hasher = {:x=>1, :y=>"hello", "yo"=>"scooby doo"}
-    beanstalk.put(hasher.to_json)
-    job = beanstalk.reserve(1)
-    got = JSON.parse(job.body)
-    assert got.is_a?(Hash)
-    assert_equal hasher[:x], got['x']
-    job.delete
-
-    msg = "hello there\nthis is a new line"
-    beanstalk.put(msg)
-    job = beanstalk.reserve(1)
-    assert_equal msg, job.body, "#{job.body} does not equal #{msg}"
-    job.delete
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-03-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &22831660 !ruby/object:Gem::Requirement
+  requirement: &14061040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22831660
+  version_requirements: *14061040
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &22830400 !ruby/object:Gem::Requirement
+  requirement: &14060480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22830400
+  version_requirements: *14060480
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &22829360 !ruby/object:Gem::Requirement
+  requirement: &14059900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22829360
+  version_requirements: *14059900
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &22828720 !ruby/object:Gem::Requirement
+  requirement: &14059100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22828720
+  version_requirements: *14059100
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []
@@ -75,7 +75,9 @@ files:
 - test/long_run.rb
 - test/long_run_worker.rb
 - test/quick_run.rb
+- test/schedule_abt.rb
 - test/test_base.rb
+- test/test_beanstalkd.rb
 - test/test_iron_mq.rb
 homepage: http://www.iron.io
 licenses: []