iron_mq 1.5.0 → 1.7.0

data/Rakefile

@@ -10,8 +10,7 @@ begin
     gem.email = "travis@iron.io"
     gem.homepage = "http://www.iron.io"
     gem.authors = ["Travis Reeder"]
-    gem.add_dependency 'rest-client'
-    gem.add_dependency 'rest'
+    gem.add_dependency 'iron_core'
     #gem.add_dependency 'typhoeus'
     gem.required_ruby_version = '>= 1.9'
   end

data/VERSION.yml

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

data/iron_mq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iron_mq"
-  s.version = "1.5.0"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2012-03-02"
+  s.date = "2012-06-04"
   s.description = "Ruby client for IronMQ"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -37,28 +37,22 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.iron.io"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Ruby client for IronMQ"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<rest>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<rest>, [">= 0"])
+      s.add_runtime_dependency(%q<iron_core>, [">= 0"])
+      s.add_runtime_dependency(%q<iron_core>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<rest>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<rest>, [">= 0"])
+      s.add_dependency(%q<iron_core>, [">= 0"])
+      s.add_dependency(%q<iron_core>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<rest>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<rest>, [">= 0"])
+    s.add_dependency(%q<iron_core>, [">= 0"])
+    s.add_dependency(%q<iron_core>, [">= 0"])
   end
 end
 

data/lib/iron_mq/client.rb

@@ -1,29 +1,34 @@
-require 'json'
-require 'logger'
-require 'rest'
+require 'yaml'
+
+require 'iron_core'
 
 module IronMQ
+  @@version = nil
 
-  class Client
+  def self.version
+    if @@version.nil?
+      v = YAML.load(File.read(File.dirname(__FILE__) + '/../../VERSION.yml'))
+      $stderr.puts v.inspect
+      @@version = [v[:major].to_s, v[:minor].to_s, v[:patch].to_s].join('.')
+    end
 
-    attr_accessor :token, :project_id, :queue_name, :logger,
-        :scheme, :host, :port
+    @@version
+  end
 
-    def initialize(options={})
-      @logger = Logger.new(STDOUT)
-      @logger.level=Logger::INFO
+  class Client < IronCore::Client
+    AWS_US_EAST_HOST = 'mq-aws-us-east-1.iron.io'
 
-      @token = options[:token] || options['token']
-      @project_id = options[:project_id] || options['project_id']
-      @queue_name = options[:queue_name] || options['queue_name'] || "default"
-      @scheme = options[:scheme] || options['scheme'] || "https"
-      @host = options[:host] || options['host'] || "mq-aws-us-east-1.iron.io"
-      @port = options[:port] || options['port'] || 443
+    attr_accessor :queue_name
 
-      @base_url = "#{@scheme}://#{@host}:#{@port}/1"
+    def initialize(options={})
+      super('mq', options, [:queue_name])
 
-      @rest = Rest::Client.new
+      load_from_hash(:scheme => 'https', :host => IronMQ::Client::AWS_US_EAST_HOST, :port => 443, :api_version => 1, :user_agent => 'iron_mq_ruby-' + IronMQ.version + ' (iron_core_ruby-' + IronCore.version + ')', :queue_name => 'default')
 
+      if (not @token) || (not @project_id)
+        IronCore::Logger.error 'IronMQ', 'Both token and project_id must be specified' 
+        raise IronCore::IronError.new('Both token and project_id must be specified')
+      end
     end
 
     def messages
@@ -33,105 +38,5 @@ module IronMQ
     def queues
       return Queues.new(self)
     end
-
-    def base_url
-      #"#{scheme}://#{host}:#{port}/1"
-      @base_url
-    end
-
-    def full_url(path)
-      url = "#{base_url}#{path}"
-      url
-    end
-
-    def common_req_hash
-      {
-          :headers=>{"Content-Type" => 'application/json',
-                     "Authorization"=>"OAuth #{@token}",
-                     "User-Agent"=>"IronMQ Ruby Client"}
-      }
-    end
-
-
-    def get(path, params={})
-      url = full_url(path)
-      @logger.debug 'url=' + url
-      req_hash = common_req_hash
-      req_hash[:params] = params if params
-      @logger.debug 'req_hash=' + req_hash.inspect
-      response = @rest.get(url, req_hash)
-      @logger.debug 'GET response=' + response.inspect
-      res = check_response(response)
-      return res, response.code
-    end
-
-    def post(path, params={})
-      url = full_url(path)
-      @logger.debug 'url=' + url
-      #response = @http_sess.post(path + "?oauth=#{@token}", {'oauth' => @token}.merge(params).to_json, {"Content-Type" => 'application/json'})
-      req_hash = common_req_hash
-      req_hash[:body] = params.to_json
-      response = @rest.post(url, req_hash)
-      @logger.debug 'POST response=' + response.inspect
-      res = check_response(response)
-      #@logger.debug 'response: ' + res.inspect
-      #body = response.body
-      #res = JSON.parse(body)
-      return res, response.code
-    end
-
-
-    def delete(path, params={})
-      url = "#{base_url}#{path}"
-      @logger.debug 'url=' + url
-      req_hash = common_req_hash
-      req_hash[:params] = params
-      response = @rest.delete(url, req_hash)
-      res = check_response(response)
-      #body = response.body
-      #res = JSON.parse(body)
-      #@logger.debug 'response: ' + res.inspect
-      return res, response.code
-    end
-
-    def check_response(response)
-      # response.code    # http status code
-      #response.time    # time in seconds the request took
-      #response.headers # the http headers
-      #response.headers_hash # http headers put into a hash
-      #response.body    # the response body
-      status = response.code
-      body = response.body
-      # todo: check content-type == application/json before parsing
-      @logger.debug "response code=" + status.to_s
-      @logger.debug "response body=" + body.inspect
-      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("Status #{status}: #{res["msg"]}", :status=>status)
-      end
-      res
-    end
-
   end
-
-  class Error < StandardError
-    def initialize(msg, options={})
-      super(msg)
-      @options = options
-    end
-
-    def status
-      @options[:status]
-    end
-  end
-
-
 end
-

data/lib/iron_mq/messages.rb

@@ -8,36 +8,27 @@ module IronMQ
     end
 
     def path(options={})
-      path = "/projects/#{@client.project_id}/queues/#{options[:queue_name] || @client.queue_name}/messages"
+      path = "projects/#{@client.project_id}/queues/#{options[:queue_name] || options['queue_name'] || @client.queue_name}/messages"
     end
 
     # options:
     #  :queue_name => can specify an alternative queue name
     #  :timeout => amount of time before message goes back on the queue
     def get(options={})
-      begin
-        res, status = @client.get(path(options), options)
-        @client.logger.debug "GET response: " + res.inspect
-        ret = []
-        res["messages"].each do |m|
-          ret << Message.new(self, m)
-        end
-        if options[:n]
-          return ret
+      res = @client.parse_response(@client.get(path(options), options))
+      ret = []
+      res["messages"].each do |m|
+        ret << Message.new(self, m)
+      end
+      if options[:n] || options['n']
+        return ret
+      else
+        if ret.size > 0
+          return ret[0]
         else
-          if ret.size > 0
-            return ret[0]
-          else
-            return nil
-          end
-        end
-      rescue IronMQ::Error => ex
-        if ex.status == 404
           return nil
         end
-        raise ex
       end
-
     end
 
     # options:
@@ -57,8 +48,7 @@ module IronMQ
       end
       to_send = {}
       to_send[:messages] = msgs
-      res, status = @client.post(path(options), to_send)
-      #return Message.new(self, res)
+      res = @client.parse_response(@client.post(path(options), to_send))
       if batch
         return res
       else
@@ -68,7 +58,7 @@ module IronMQ
 
     def delete(message_id, options={})
       path2 = "#{self.path(options)}/#{message_id}"
-      res, status = @client.delete(path2)
+      res = @client.parse_response(@client.delete(path2))
       return ResponseBase.new(res)
     end
 

data/lib/iron_mq/queues.rb

@@ -8,12 +8,14 @@ module IronMQ
     end
 
     def path(options={})
-      path = "/projects/#{@client.project_id}/queues"
+      path = "projects/#{@client.project_id}/queues"
     end
 
     def list(options={})
       ret = []
-      res, status = @client.get("#{path(options)}", options)
+      r1 = @client.get("#{path(options)}", options)
+      #p r1
+      res = @client.parse_response(r1)
       res.each do |q|
         #p q
         q = Queue.new(self, q)
@@ -25,7 +27,7 @@ module IronMQ
     # options:
     #  :name => can specify an alternative queue name
     def get(options={})
-      res, status = @client.get("#{path(options)}/#{options[:name]}")
+      res = @client.parse_response(@client.get("#{path(options)}/#{options[:name]}"))
       return Queue.new(self, res)
     end
 

data/test/Gemfile

@@ -2,3 +2,5 @@ source 'http://rubygems.org'
 gem 'beanstalk-client'
 gem 'test-unit'
 gem 'concur'
+gem 'uber_config'
+gem 'iron_core'

data/test/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.2.8)
     beanstalk-client (1.1.1)
     concur (0.1.2)
       em-http-request
@@ -11,23 +11,31 @@ GEM
       faraday
       faraday
     cookiejar (0.3.0)
-    em-http-request (1.0.1)
+    em-http-request (1.0.2)
       addressable (>= 2.2.3)
       cookiejar
       em-socksify
       eventmachine (>= 1.0.0.beta.4)
       http_parser.rb (>= 0.5.3)
-    em-socksify (0.1.0)
-      eventmachine
+    em-socksify (0.2.0)
+      eventmachine (>= 1.0.0.beta.4)
     eventmachine (1.0.0.beta.4)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.8.1)
+      multipart-post (~> 1.1)
     http_parser.rb (0.5.3)
-    multipart-post (1.1.4)
-    rack (1.4.0)
-    test-unit (2.4.4)
+    iron_core (0.1.2)
+      bundler (> 1.0.0)
+      rest
+      rest-client
+    mime-types (1.18)
+    multipart-post (1.1.5)
+    rest (0.2.0)
+      rest-client
+      rest-client
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    test-unit (2.4.9)
+    uber_config (0.0.1)
 
 PLATFORMS
   ruby
@@ -35,4 +43,6 @@ PLATFORMS
 DEPENDENCIES
   beanstalk-client
   concur
+  iron_core
   test-unit
+  uber_config

data/test/long_run_worker.rb

@@ -14,7 +14,7 @@ class LongRunWorker < IronWorker::Base
 
     start = Time.now
     puts "Queuing #{@num_to_add} items at #{start}..."
-    executor = Concur::Executor.new_thread_pool_executor(20)
+    executor = Concur::Executor.new_thread_pool_executor(50)
     @num_to_add.times do |i|
       task = executor.execute do
         begin
@@ -31,7 +31,7 @@ class LongRunWorker < IronWorker::Base
     while executor.queue_size > 0 do
       i += 1
       puts "waiting #{i}, queue size=#{executor.queue_size}"
-      sleep 0.5
+      sleep 2
     end
 
 

data/test/schedule_abt.rb

@@ -1,4 +1,27 @@
-worker = Abt::TestWorker.new
+require 'abt'
+require 'time'
+require_relative 'test_base'
+
+# Config for abt tests to run on IronWorker
+@abt_config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "abt", "test", "config.yml")))
+IronWorker.configure do |c|
+  c.token = @abt_config['iron']['token']
+  c.project_id = @abt_config['iron']['project_id']
+end
+
+# IronWorker.logger.level = Logger::DEBUG
+# Config to run iron_mq_ruby tests
+@test_config = TestBase.load_config
+
+worker = Abt::AbtWorker.new
 worker.git_url = "git://github.com/iron-io/iron_mq_ruby.git"
 worker.test_config = @test_config
-worker.run_local
+worker.add_notifier(:hip_chat_notifier, :config=>@abt_config["hipchat"])
+worker.upload # Must upload after adding notifier to ensure it's merged
+#worker.run_local
+#worker.queue
+#status = worker.wait_until_complete
+#p status
+#puts "LOG:"
+#puts worker.get_log
+#worker.schedule(:start_at=>Time.now.iso8601, :run_every=>3600)

data/test/test_base.rb

@@ -1,6 +1,7 @@
 gem 'test-unit'
 require 'test/unit'
 require 'yaml'
+require 'uber_config'
 begin
   require File.join(File.dirname(__FILE__), '../lib/iron_mq')
 rescue Exception => ex
@@ -13,29 +14,14 @@ class TestBase < Test::Unit::TestCase
   def setup
     puts 'setup'
     # check multiple config locations
-    @config = load_config
+    @config = UberConfig.load
     puts "config=" + @config.inspect
-    @client = IronMQ::Client.new(@config['iron_mq'])
-    @client.logger.level = Logger::DEBUG
+    @client = IronMQ::Client.new(@config['iron'])
+    IronCore::Logger.logger.level = Logger::DEBUG
     @client.queue_name = 'ironmq-ruby-tests'
 
   end
 
-  def load_config
-    # check for config
-    # First check if running in abt worker
-    if defined? $abt_config
-      @config = $abt_config
-      return @config
-    end
-    cf = File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "test", "config.yml"))
-    if File.exist?(cf)
-      @config = YAML::load_file(cf)
-      return @config
-    end
-
-  end
-
 
   def clear_queue(queue_name=nil)
     queue_name ||= @client.queue_name

data/test/test_beanstalkd.rb

@@ -8,46 +8,219 @@ require 'beanstalk-client'
 require 'yaml'
 require_relative 'test_base'
 
-class IronMQTests < TestBase
+class BeanstalkTests < TestBase
   def setup
     super
 
+    config = @config['iron']
+    @host = "#{config['host'] || "mq-aws-us-east-1.iron.io"}:#{config['beanstalkd_port'] || 11300}"
+    puts "beanstalkd url: #{@host}"
+    @skip = @host.include? 'rackspace'
+    return if @skip # bypass these tests if rackspace
+    @beanstalk = Beanstalk::Connection.new(@host)
+    @beanstalk.put("oauth #{config['token']} #{config['project_id']}")
+
+    clear_tube('default')
   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']}")
+  def test_basics
+    omit_if @skip # bypass this test if rackspace
+    puts 'test_basics'
+
     queue_name = "beanstalk_test"
     clear_queue(queue_name)
-    beanstalk.use(queue_name)
-    beanstalk.watch(queue_name)
+    @beanstalk.use(queue_name)
+    @beanstalk.watch(queue_name)
+
+    #puts 'reserving...'
+    #job = beanstalk.reserve(1)
+    #p job
+    #exit
 
     msg = "hello #{Time.now}"
-    beanstalk.put(msg)
-    job = beanstalk.reserve
-    assert_equal msg, job.body, "body not the same as message."
+    puts "msg=" + msg
+    @beanstalk.put(msg)
+    job = @beanstalk.reserve
+    p job
+    p job.body
+    assert_equal msg, job.body, "job.body #{job.body} not the same as the one we put on #{msg}."
     job.delete
     job = assert_raise(Beanstalk::TimedOut) {
-      beanstalk.reserve(1)
+      @beanstalk.reserve(1)
     }
 
     hasher = {:x => 1, :y => "hello", "yo" => "scooby doo"}
-    beanstalk.put(hasher.to_json)
-    job = beanstalk.reserve(1)
+    @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
+
+  def clear_tube(tube)
+    omit_if @skip # bypass this test if rackspace
+    watched = @beanstalk.list_tubes_watched(true)
+    puts 'watched: ' + watched.inspect
+    @beanstalk.watch(tube)
+    puts "clear #{tube}"
+    # clean up anything in queue
+    while x = reserve(0) do
+      puts 'deleting ' + x.inspect
+      x.delete
+    end
+    puts 'done clearing'
+    @beanstalk.ignore(tube) if not watched.include?(tube)
+  end
+
+  def test_basics2
+    omit_if @skip # bypass this test if rackspace
+    puts 'test_basics'
+    msg = "hello #{Time.now}"
+    @beanstalk.put(msg)
+    job = reserve
+    puts 'first job: ' + job.inspect
+    puts "body=" + job.body # prints "hello"
+    assert_equal msg, job.body, "body not the same as message."
+    job.delete
+    puts 'deleted'
+    job = reserve(1)
+    puts 'second job = ' + job.inspect
+    assert job.nil?, "second job was not nil " + job.inspect
+
+    hasher = {:x => 1, :y => "hello", "yo" => "scooby doo"}
+    @beanstalk.put(hasher.to_json)
+    job = reserve(1)
     got = JSON.parse(job.body)
+    puts 'got=' + got.inspect
     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)
+    @beanstalk.put(msg)
+    job = reserve(1)
     assert_equal msg, job.body, "#{job.body} does not equal #{msg}"
     job.delete
   end
 
+  def test_timeout
+    omit_if @skip # bypass this test if rackspace
+    puts 'test_timeout'
+    msg = "timeout message #{Time.now}"
+    # timeout of 10 seconds
+    res = @beanstalk.put(msg, 65536, 0, 10)
+    puts 'result: ' + res.inspect
+    job = reserve(0)
+    puts 'first timeout job: ' + job.inspect
+    assert_equal msg, job.body, "body not the same as message."
+
+    niljob = reserve(0)
+    assert niljob.nil?, "job is not nil! #{niljob.inspect}"
+
+    # let it time out
+    sleep 10
+    job = reserve(0)
+    puts 'second delayed job: ' + job.inspect
+    assert_not_nil job, "job is nil"
+    assert_equal msg, job.body, "body not the same as message."
+    job.delete
+  end
+
+  def test_delay
+    omit_if @skip # bypass this test if rackspace
+    puts 'test_delay'
+    msg = "delayed message #{Time.now}"
+    # delay of 2 seconds
+    @beanstalk.put(msg, 65536, 2)
+
+    # delay should still be in effect, so job is nil
+    job = reserve(0)
+    assert job.nil?, "job is not nil"
+
+    # wait for delay to expire
+    sleep 2
+    job = reserve(0)
+    assert_not_nil job, "job is nil"
+    assert_equal msg, job.body, "body not the same as message."
+    job.delete
+  end
+
+  def tube_message(tube)
+    omit_if @skip # bypass this test if rackspace
+    "hello #{tube}! #{Time.now}"
+  end
+
+  def reserve(timeout=nil)
+    omit_if @skip # bypass this test if rackspace
+    begin
+      job = @beanstalk.reserve(timeout)
+      puts 'got job: ' + job.inspect
+      return job
+    rescue Beanstalk::TimedOut => ex
+      puts "Timed out: #{ex.message}"
+      return nil
+    end
+  end
+
+  def test_tubes
+    omit_if @skip # bypass this test if rackspace
+    clear_tube('youtube')
+    tube1 = 'default'
+    msg1 = tube_message(tube1)
+    @beanstalk.put(msg1)
+    tube2 = 'youtube'
+    @beanstalk.use(tube2) # switch tubes to put messages on
+    msg2 = tube_message(tube2)
+    @beanstalk.put(msg2)
+                          # now we have a single message in two different tubes.
+                          # let's first try to ensure we only get the one off the default tube.
+    job = reserve(1)
+    assert_equal msg1, job.body, "body #{job.body.to_s} does not equal #{msg1}"
+    job.delete
+                          # second message should not come off since we're not watching that tube.
+    job = reserve(1)
+    assert job.nil?, "second job was not nil " + job.inspect
+
+    @beanstalk.watch(tube2)
+    job = reserve(1)
+    assert_equal msg2, job.body, "body #{job.body.to_s} does not equal #{msg2}"
+    job.delete
+
+    # Now that we're watching both tubes we should get messages put into either.
+    @beanstalk.use(tube1)
+    msg3 = tube_message(tube1)
+    @beanstalk.put(msg3)
+    job = reserve(1)
+    assert_equal msg3, job.body
+    job.delete
+
+    # now put one in default and one in tube2, then we'll ignore default
+    msg1 = tube_message(tube1)
+    @beanstalk.put(msg1)
+    @beanstalk.use(tube2) # switch tubes to put messages on
+    msg2 = tube_message(tube2)
+    @beanstalk.put(msg2)
+
+    @beanstalk.ignore(tube1)
+    job = reserve(1)
+    assert_equal msg2, job.body, "body #{job.body.to_s} does not equal #{msg2}"
+    job.delete
+    job = reserve(1)
+    assert job.nil?
+
+    # clean up the last message from default
+    @beanstalk.watch(tube1)
+    job = reserve(1)
+    assert_equal msg1, job.body, "body #{job.body.to_s} does not equal #{msg1}"
+    job.delete
+  end
+
+
 end

data/test/test_iron_mq.rb

@@ -4,7 +4,6 @@
 
 gem 'test-unit'
 require 'test/unit'
-require 'beanstalk-client'
 require 'yaml'
 require_relative 'test_base'
 
@@ -23,18 +22,14 @@ class IronMQTests < TestBase
     @client.queue_name = 'test_basics'
     clear_queue
 
-    queue = @client.queues.get(:name=>@client.queue_name)
-    total_messages = queue.total_messages
-
     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)
+    queue = @client.queues.get(:name => @client.queue_name)
     assert queue.size == 1
-    assert queue.total_messages == (total_messages+1)
     res = @client.messages.get()
     p res
     assert res["id"]
@@ -47,7 +42,7 @@ class IronMQTests < TestBase
     p res
     assert res.nil?
 
-    queue = @client.queues.get(:name=>@client.queue_name)
+    queue = @client.queues.get(:name => @client.queue_name)
     assert queue.size == 0
 
     res = @client.messages.post("hello world 2!")
@@ -93,12 +88,13 @@ class IronMQTests < TestBase
     sleep 45
 
     msg2 = @client.messages.get()
+    assert msg2
     assert msg.id == msg2.id
 
     msg2.delete
 
     # now try explicit timeout
-    res = @client.messages.post("hello world timeout2!", :timeout=>10)
+    res = @client.messages.post("hello world timeout2!", :timeout => 10)
     p res
     msg = @client.messages.get()
     p msg
@@ -107,6 +103,7 @@ class IronMQTests < TestBase
     p msg4
     assert msg4.nil?
     puts 'sleeping 15 seconds...'
+    sleep 15
     msg2 = @client.messages.get()
     assert msg2
     assert msg.id == msg2.id
@@ -114,6 +111,13 @@ class IronMQTests < TestBase
   end
 
   def test_queues
+    puts 'test_queues'
+
+    assert_raise IronCore::IronResponseError do
+      # should raise a 404
+      q = @client.queues.get(:name => "some_queue_that_does_not_exist")
+    end
+
     res = @client.queues.list()
     puts "res.size: " + res.size.to_s
     res.each do |q|
@@ -123,7 +127,7 @@ class IronMQTests < TestBase
     end
     assert res.size > 0
 
-    res = @client.queues.list(:page=>5)
+    res = @client.queues.list(:page => 5)
     puts "res.size 2: " + res.size.to_s
     res.each do |q|
       p q.name
@@ -156,7 +160,7 @@ class IronMQTests < TestBase
 
     x = []
     10.times do |i|
-      x << {:body=>"body #{i}"}
+      x << {:body => "body #{i}"}
     end
     resp = @client.messages.post(x)
     assert resp["ids"]
@@ -168,7 +172,7 @@ class IronMQTests < TestBase
     assert msg['id']
     msg.delete
 
-    msgs = @client.messages.get(:n=>10)
+    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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &14061040 !ruby/object:Gem::Requirement
+  name: iron_core
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14061040
-- !ruby/object:Gem::Dependency
-  name: rest
-  requirement: &14060480 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *14060480
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &14059900 !ruby/object:Gem::Requirement
+  name: iron_core
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14059900
-- !ruby/object:Gem::Dependency
-  name: rest
-  requirement: &14059100 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *14059100
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []
@@ -99,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby client for IronMQ