ironmq 1.2.2 → 1.2.3

data/VERSION.yml

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

data/ironmq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ironmq}
-  s.version = "1.2.1"
+  s.version = "1.2.3"
 
   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-12}
+  s.date = %q{2011-10-13}
   s.description = %q{Ruby client for IronMQ}
   s.email = %q{travis@iron.io}
   s.extra_rdoc_files = [
@@ -34,12 +34,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<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<patron>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<patron>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<patron>, [">= 0"])
   end
 end
 

data/lib/ironmq/client.rb

@@ -1,14 +1,17 @@
 require 'json'
 require 'patron'
-
+require 'logger'
 
 module IronMQ
 
   class Client
 
-    attr_accessor :token, :project_id, :queue_name, :base_url
+    attr_accessor :token, :project_id, :queue_name, :base_url, :logger
 
     def initialize(options={})
+      @logger = Logger.new(STDOUT)
+      @logger.level=Logger::INFO
+
       @token = options[:token] || options['token']
       @project_id = options[:project_id] || options['project_id']
       @queue_name = options[:queue_name] || options['queue_name'] || "default"
@@ -34,40 +37,64 @@ module IronMQ
 
     def post(path, params={})
       url = "#{@base_url}#{path}"
-      puts 'url=' + url
-      response = @http_sess.post(path, {'oauth' => @token}.merge(params))
-      #{:content_type => 'application/json'})
-      puts 'response: ' + response.inspect
+      @logger.debug 'url=' + url
+      response = @http_sess.post(path + "?oauth=#{@token}", {'oauth' => @token}.merge(params).to_json, {"Content-Type" => 'application/json'})
+      check_response(response)
+      @logger.debug 'response: ' + response.inspect
       body = response.body
       res = JSON.parse(body)
-      res
+      return res, response.status
     end
 
     def get(path, params={})
       url = "#{@base_url}#{path}"
-      puts 'url=' + url
+      @logger.debug 'url=' + url
       response = @http_sess.request(:get, path,
                                     {},
                                     :query=>{'oauth'=>@token}.merge(params))
-      body = response.body
-      res = JSON.parse(body)
-      res
+      res = check_response(response)
+
+      return res, response.status
     end
 
     def delete(path, params={})
       url = "#{@base_url}#{path}"
-      puts 'url=' + url
+      @logger.debug 'url=' + url
       response = @http_sess.request(:delete, path,
                                     {},
                                     :query=>{'oauth'=>@token}.merge(params))
+      check_response(response)
       body = response.body
       res = JSON.parse(body)
-      puts 'response: ' + res.inspect
+      @logger.debug 'response: ' + res.inspect
+      return res, response.status
+    end
+
+    def check_response(response)
+      status = response.status
+      body = response.body
+      res = JSON.parse(body)
+      if status < 400
+        
+      else
+        raise IronMQ::Error.new(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
+
   class Messages
 
     attr_accessor :client
@@ -83,24 +110,59 @@ module IronMQ
     # options:
     #  :queue_name => can specify an alternative queue name
     def get(options={})
-      res = @client.get(path(options))
-      res
+      begin
+        res, status = @client.get(path(options))
+        return Message.new(self, res)
+      rescue IronMQ::Error => ex
+        if ex.status == 404
+          return nil
+        end
+      end
+
+
     end
 
     # options:
     #  :queue_name => can specify an alternative queue name
     def post(payload, options={})
-      res = @client.post(path(options), :payload=>payload)
-      res
+      res, status = @client.post(path(options), :body=>payload)
     end
 
     def delete(message_id, options={})
       path2 = "#{self.path(options)}/#{message_id}"
-      res = @client.delete(path2)
+      res, status = @client.delete(path2)
       res
     end
 
   end
 
+  class Message
+
+    def initialize(messages, res)
+      @messages = messages
+      @data = res
+    end
+
+    def raw
+      @data
+    end
+
+    def [](key)
+      raw[key]
+    end
+
+    def id
+      raw["id"]
+    end
+
+    def body
+      raw["body"]
+    end
+
+    def delete
+      @messages.delete(self.id)
+    end
+  end
+
 end
 

data/test/ironmq_tests.rb

@@ -15,6 +15,7 @@ class IronMQTests < Test::Unit::TestCase
     puts 'setup'
     @config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "ironmq_gem", "test", "config.yml")))
     @client = IronMQ::Client.new(@config['ironmq'])
+    @client.logger.level = Logger::DEBUG
     @client.queue_name = 'ironmq-gem-tests'
   end
 

metadata

@@ -2,7 +2,7 @@
 name: ironmq
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: patron