ironmq 1.2.4 → 1.2.5

data/README.markdown

@@ -4,6 +4,10 @@ IronMQ Ruby Client
 Getting Started
 ==============
 
+Install the gem:
+
+    gem install ironmq
+
 Create an IronMQ client object:
 
     @client = IronMQ::Client.new('token'=>'MYTOKEN', 'project_id'=>'MYPROJECTID')

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 'patron'
+    gem.add_dependency 'typhoeus'
     gem.required_ruby_version = '>= 1.9'
   end
   Jeweler::GemcutterTasks.new
@@ -27,12 +27,12 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'doc'
-  rdoc.title = "beanstalk-client #{version}"
+  rdoc.title = "ironmq_gem #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION.yml

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

data/ironmq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ironmq}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Travis Reeder}]
-  s.date = %q{2011-10-14}
+  s.date = %q{2011-11-01}
   s.description = %q{Ruby client for IronMQ}
   s.email = %q{travis@iron.io}
   s.extra_rdoc_files = [
@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
     "ironmq.gemspec",
     "lib/ironmq.rb",
     "lib/ironmq/client.rb",
-    "test/ironmq_tests.rb"
+    "test/ironmq_tests.rb",
+    "test/long_run.rb"
   ]
   s.homepage = %q{http://www.iron.io}
   s.require_paths = [%q{lib}]
@@ -34,12 +35,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<patron>, [">= 0"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
     else
-      s.add_dependency(%q<patron>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, [">= 0"])
     end
   else
-    s.add_dependency(%q<patron>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, [">= 0"])
   end
 end
 

data/lib/ironmq/client.rb

@@ -1,12 +1,12 @@
 require 'json'
-require 'patron'
+require 'typhoeus'
 require 'logger'
 
 module IronMQ
 
   class Client
 
-    attr_accessor :token, :project_id, :queue_name, :base_url, :logger
+    attr_accessor :token, :project_id, :queue_name, :logger
 
     def initialize(options={})
       @logger = Logger.new(STDOUT)
@@ -15,18 +15,11 @@ module IronMQ
       @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'] || "http"
+      @scheme = options[:scheme] || options['scheme'] || "https"
       @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"
+      @port = options[:port] || options['port'] || 443
 
-      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
+      @base_url = "#{@scheme}://#{@host}:#{@port}/1"
 
     end
 
@@ -34,48 +27,74 @@ module IronMQ
       return Messages.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}"}
+      }
+    end
 
     def post(path, params={})
-      url = "#{@base_url}#{path}"
+      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'})
+      #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 = Typhoeus::Request.post(url, req_hash)
       check_response(response)
       @logger.debug 'response: ' + response.inspect
       body = response.body
       res = JSON.parse(body)
-      return res, response.status
+      return res, response.code
     end
 
     def get(path, params={})
-      url = "#{@base_url}#{path}"
+      url = full_url(path)
       @logger.debug 'url=' + url
-      response = @http_sess.request(:get, path,
-                                    {},
-                                    :query=>{'oauth'=>@token}.merge(params))
+      req_hash = common_req_hash
+      req_hash[:params] = params
+      response = Typhoeus::Request.get(url, req_hash)
       res = check_response(response)
-
-      return res, response.status
+      return res, response.code
     end
 
     def delete(path, params={})
-      url = "#{@base_url}#{path}"
+      url = "#{base_url}#{path}"
       @logger.debug 'url=' + url
-      response = @http_sess.request(:delete, path,
-                                    {},
-                                    :query=>{'oauth'=>@token}.merge(params))
+      req_hash = common_req_hash
+      req_hash[:params] = params
+      response = Typhoeus::Request.delete(url, req_hash)
       check_response(response)
       body = response.body
       res = JSON.parse(body)
       @logger.debug 'response: ' + res.inspect
-      return res, response.status
+      return res, response.code
     end
 
     def check_response(response)
-      status = response.status
+      # 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
       res = JSON.parse(body)
       if status < 400
-        
+
       else
         raise IronMQ::Error.new(res["msg"], :status=>status)
       end
@@ -117,6 +136,7 @@ module IronMQ
         if ex.status == 404
           return nil
         end
+        raise ex
       end
 
 
@@ -126,6 +146,7 @@ module IronMQ
     #  :queue_name => can specify an alternative queue name
     def post(payload, options={})
       res, status = @client.post(path(options), :body=>payload)
+      return Message.new(self, res)
     end
 
     def delete(message_id, options={})

data/test/long_run.rb

@@ -0,0 +1,37 @@
+require 'yaml'
+begin
+  require File.join(File.dirname(__FILE__), '../lib/ironmq')
+rescue Exception => ex
+  puts "Could NOT load current ironmq: " + ex.message
+  raise ex
+end
+
+@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "ironmq_gem", "test", "config.yml")))
+@client = IronMQ::Client.new(@config['ironmq'])
+@client.queue_name = 'ironmq-gem-tests'
+@num_to_add = @config['count']
+
+start = Time.now
+puts "Queuing #{@num_to_add} items at #{start}..."
+@num_to_add.times do |i|
+	puts "POST #{i}..."
+	res = @client.messages.post("hello world! #{i}")
+	p res
+end
+put_time = (Time.now.to_f - start.to_f)
+puts "Finished pushing in #{put_time} seconds"
+
+start = Time.now
+puts "Getting and deleting #{@num_to_add} items at #{start}..."
+@num_to_add.times do |i|
+    puts "GET #{i}..."
+    res = @client.messages.get()
+    p res
+    puts "DELETE #{i}..."
+    res = @client.messages.delete(res["id"])
+    p res
+end
+
+puts "Finished pushing #{@num_to_add} items in #{put_time} seconds."
+puts "Finished getting and deleting #{@num_to_add} items in #{(Time.now.to_f - start.to_f)} seconds."
+

metadata

@@ -2,7 +2,7 @@
 name: ironmq
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,10 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: patron
+  name: typhoeus
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -39,6 +39,7 @@ files:
 - lib/ironmq.rb
 - lib/ironmq/client.rb
 - test/ironmq_tests.rb
+- test/long_run.rb
 homepage: http://www.iron.io
 licenses: []