ironmq 1.2.1 → 1.2.2

data/README.markdown

@@ -33,3 +33,13 @@ a timeout if you don't delete it (default timeout is 10 minutes).
     p res
 
 Delete a message from the queue when you're done with it.
+
+Queue Selection
+===============
+
+One of the following:
+
+1. Pass `:queue_name=>'my_queue'` into IronMQ::Client.new
+1. `@client.queue_name = 'my_queue'`
+1. Pass `:queue_name=>'my_queue'` into any post(), get(), or delete()
+

data/Rakefile

@@ -10,7 +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 'patron'
     gem.required_ruby_version = '>= 1.9'
   end
   Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 1
+:patch: 2
 :build: 

data/lib/ironmq/client.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'rest_client'
+require 'patron'
 
 
 module IronMQ
@@ -11,12 +11,20 @@ module IronMQ
     def initialize(options={})
       @token = options[:token] || options['token']
       @project_id = options[:project_id] || options['project_id']
-      @queue_name = options[:queue_name] || options['queue_name']
+      @queue_name = options[:queue_name] || options['queue_name'] || "default"
       @scheme = options[:scheme] || options['scheme'] || "http"
       @host = options[:host] || options['host'] || "mq-aws-us-east-1.iron.io"
       @port = options[:port] || options['port'] || 80
       # todo: default https
       @base_url = "#{@scheme}://#{@host}:#{@port}/1"
+
+      sess = Patron::Session.new
+      sess.timeout = 10
+      sess.base_url = @base_url
+      sess.headers['User-Agent'] = 'IronMQ Ruby Client'
+      #sess.enable_debug "/tmp/patron.debug"
+      @http_sess = sess
+
     end
 
     def messages
@@ -27,28 +35,33 @@ module IronMQ
     def post(path, params={})
       url = "#{@base_url}#{path}"
       puts 'url=' + url
-      response = RestClient.post(url, {'oauth' => @token}.merge(params),
-                                 :content_type => :json)
+      response = @http_sess.post(path, {'oauth' => @token}.merge(params))
+      #{:content_type => 'application/json'})
       puts 'response: ' + response.inspect
-      res = JSON.parse(response)
+      body = response.body
+      res = JSON.parse(body)
       res
     end
 
     def get(path, params={})
       url = "#{@base_url}#{path}"
       puts 'url=' + url
-      response = RestClient.get(url,
-                                {:params => {'oauth'=>@token}.merge(params)})
-      res = JSON.parse(response)
+      response = @http_sess.request(:get, path,
+                                    {},
+                                    :query=>{'oauth'=>@token}.merge(params))
+      body = response.body
+      res = JSON.parse(body)
       res
     end
 
     def delete(path, params={})
       url = "#{@base_url}#{path}"
       puts 'url=' + url
-      response = RestClient.delete(url,
-                                         {:params => {'oauth'=>@token}.merge(params)})
-      res = JSON.parse(response)
+      response = @http_sess.request(:delete, path,
+                                    {},
+                                    :query=>{'oauth'=>@token}.merge(params))
+      body = response.body
+      res = JSON.parse(body)
       puts 'response: ' + res.inspect
       res
     end
@@ -64,7 +77,7 @@ 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] || @client.queue_name}/messages"
     end
 
     # options:

metadata

@@ -2,7 +2,7 @@
 name: ironmq
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -13,7 +13,7 @@ cert_chain: []
 date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: patron
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false