iron_mq 1.2.8 → 1.3.0

data/Rakefile

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

data/VERSION.yml

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

data/iron_mq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iron_mq"
-  s.version = "1.2.8"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2011-12-14"
+  s.date = "2011-12-18"
   s.description = "Ruby client for IronMQ"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -39,15 +39,21 @@ 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<typhoeus>, [">= 0"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      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"])
     else
-      s.add_dependency(%q<typhoeus>, [">= 0"])
-      s.add_dependency(%q<typhoeus>, [">= 0"])
+      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"])
     end
   else
-    s.add_dependency(%q<typhoeus>, [">= 0"])
-    s.add_dependency(%q<typhoeus>, [">= 0"])
+    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"])
   end
 end
 

data/lib/iron_mq/client.rb

@@ -1,6 +1,6 @@
 require 'json'
-require 'typhoeus'
 require 'logger'
+require 'rest'
 
 module IronMQ
 
@@ -21,6 +21,8 @@ module IronMQ
 
       @base_url = "#{@scheme}://#{@host}:#{@port}/1"
 
+      @rest = Rest::Client.new
+
     end
 
     def messages
@@ -49,38 +51,41 @@ module IronMQ
       }
     end
 
-    def post(path, params={})
+
+    def get(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 = Typhoeus::Request.post(url, req_hash)
-      @logger.debug 'typhoeus response=' + response.inspect
+      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)
-      #@logger.debug 'response: ' + res.inspect
-      #body = response.body
-      #res = JSON.parse(body)
       return res, response.code
     end
 
-    def get(path, params={})
+    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[:params] = params
-      @logger.debug 'req_hash=' + req_hash.inspect
-      response = Typhoeus::Request.get(url, 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 = Typhoeus::Request.delete(url, req_hash)
+      response = @rest.delete(url, req_hash)
       res = check_response(response)
       #body = response.body
       #res = JSON.parse(body)

data/test/test_iron_mq.rb

@@ -93,8 +93,8 @@ class IronMQTests < TestBase
     end
     assert res.size > 0
 
-    res = @client.queues.list(:page=>2)
-    puts "res.size=" + res.size.to_s
+    res = @client.queues.list(:page=>5)
+    puts "res.size 2=" + res.size.to_s
     res.each do |q|
       p q.name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: &11957140 !ruby/object:Gem::Requirement
+  name: rest-client
+  requirement: &14412840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11957140
+  version_requirements: *14412840
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: &11955980 !ruby/object:Gem::Requirement
+  name: rest
+  requirement: &14412360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11955980
+  version_requirements: *14412360
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &14411880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *14411880
+- !ruby/object:Gem::Dependency
+  name: rest
+  requirement: &14411400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *14411400
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []