ironmq 1.2.5 → 1.2.6

data/README.markdown

@@ -10,7 +10,7 @@ Install the gem:
 
 Create an IronMQ client object:
 
-    @client = IronMQ::Client.new('token'=>'MYTOKEN', 'project_id'=>'MYPROJECTID')
+    @ironmq = IronMQ::Client.new('token'=>'MYTOKEN', 'project_id'=>'MYPROJECTID')
 
 You can get your `token` and `project_id` at http://www.iron.io .
 
@@ -20,12 +20,12 @@ The Basics
 
 **Push** a message on the queue:
 
-    res = @client.messages.post("hello world!")
-    p res
+    msg = @ironmq.messages.post("hello world!")
+    p msg
 
 **Pop** a message off the queue:
 
-    res = @client.messages.get()
+    msg = @ironmq.messages.get()
     p res
 
 When you pop/get a message from the queue, it will NOT be deleted. It will eventually go back onto the queue after
@@ -33,7 +33,7 @@ a timeout if you don't delete it (default timeout is 10 minutes).
 
 **Delete** a message from the queue:
 
-    res = @client.messages.delete(res["id"])
+    res = msg.delete # or @ironmq.messages.delete(msg["id"])
     p res
 
 Delete a message from the queue when you're done with it.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  require 'jeweler'
+  require 'jeweler2'
   Jeweler::Tasks.new do |gem|
     gem.name = "ironmq"
     gem.summary = "Ruby client for IronMQ"
@@ -15,7 +15,7 @@ begin
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler2"
 end
 
 require 'rake/testtask'

data/VERSION.yml

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

data/ironmq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ironmq}
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Travis Reeder}]
-  s.date = %q{2011-11-01}
+  s.date = %q{2011-11-10}
   s.description = %q{Ruby client for IronMQ}
   s.email = %q{travis@iron.io}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "ironmq.gemspec",
     "lib/ironmq.rb",
     "lib/ironmq/client.rb",
+    "lib/ironmq/messages.rb",
     "test/ironmq_tests.rb",
     "test/long_run.rb"
   ]
@@ -36,11 +37,14 @@ Gem::Specification.new do |s|
 
     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"])
     else
       s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, [">= 0"])
     end
   else
     s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, [">= 0"])
   end
 end
 

data/lib/ironmq.rb

@@ -1 +1,2 @@
+require_relative 'ironmq/messages'
 require_relative 'ironmq/client'

data/lib/ironmq/client.rb

@@ -40,7 +40,8 @@ module IronMQ
     def common_req_hash
       {
           :headers=>{"Content-Type" => 'application/json',
-                     "Authorization"=>"OAuth #{@token}"}
+                     "Authorization"=>"OAuth #{@token}",
+                     "User-Agent"=>"IronMQ Ruby Client"}
       }
     end
 
@@ -51,10 +52,11 @@ module IronMQ
       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)
+      @logger.debug 'typhoeus response=' + response.inspect
+      res = check_response(response)
+      #@logger.debug 'response: ' + res.inspect
+      #body = response.body
+      #res = JSON.parse(body)
       return res, response.code
     end
 
@@ -74,10 +76,10 @@ module IronMQ
       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
+      res = check_response(response)
+      #body = response.body
+      #res = JSON.parse(body)
+      #@logger.debug 'response: ' + res.inspect
       return res, response.code
     end
 
@@ -114,76 +116,6 @@ module IronMQ
     end
   end
 
-  class Messages
-
-    attr_accessor :client
-
-    def initialize(client)
-      @client = client
-    end
-
-    def path(options={})
-      path = "/projects/#{@client.project_id}/queues/#{options[:queue_name] || @client.queue_name}/messages"
-    end
-
-    # options:
-    #  :queue_name => can specify an alternative queue name
-    def get(options={})
-      begin
-        res, status = @client.get(path(options))
-        return Message.new(self, res)
-      rescue IronMQ::Error => ex
-        if ex.status == 404
-          return nil
-        end
-        raise ex
-      end
-
-
-    end
-
-    # options:
-    #  :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={})
-      path2 = "#{self.path(options)}/#{message_id}"
-      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/lib/ironmq/messages.rb

@@ -0,0 +1,78 @@
+module IronMQ
+  class Messages
+
+    attr_accessor :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    def path(options={})
+      path = "/projects/#{@client.project_id}/queues/#{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
+        params = nil
+        if options[:timeout]
+          params = {:timeout => options[:timeout]}
+        end
+        res, status = @client.get(path(options), params)
+        return Message.new(self, res)
+      rescue IronMQ::Error => ex
+        if ex.status == 404
+          return nil
+        end
+        raise ex
+      end
+
+
+    end
+
+    # options:
+    #  :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={})
+      path2 = "#{self.path(options)}/#{message_id}"
+      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,8 +15,17 @@ 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.logger.level = Logger::DEBUG
     @client.queue_name = 'ironmq-gem-tests'
+
+    puts 'clearing queue'
+    while res = @client.messages.get()
+      p res
+      puts res.body.to_s
+      res.delete
+    end
+    puts 'cleared.'
+
   end
 
   def test_basics
@@ -25,9 +34,55 @@ class IronMQTests < Test::Unit::TestCase
 
     res = @client.messages.get()
     p res
-    
+
     res = @client.messages.delete(res["id"])
     p res
+    puts "shouldn't be any more"
+    res = @client.messages.get()
+    p res
+    assert res.nil?
+
+    res = @client.messages.post("hello world 2!")
+    p res
+
+    msg = @client.messages.get()
+    p msg
+
+    res = msg.delete
+    p res
+
+    puts "shouldn't be any more"
+    res = @client.messages.get()
+    p res
+    assert res.nil?
+  end
+
+  def test_timeout
+    res = @client.messages.post("hello world timeout!")
+    p res
+
+    msg = @client.messages.get()
+    p msg
+
+    msg4 = @client.messages.get()
+    p msg4
+    assert msg4.nil?
+
+    puts 'sleeping 45 seconds...'
+    sleep 45
+
+    msg3 = @client.messages.get()
+    p msg3
+    assert msg3.nil?
+
+    puts 'sleeping another 45 seconds...'
+    sleep 45
+
+    msg2 = @client.messages.get()
+    assert msg.id == msg2.id
+
+    msg2.delete
+
   end
 end
 

data/test/long_run.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'concur'
 begin
   require File.join(File.dirname(__FILE__), '../lib/ironmq')
 rescue Exception => ex
@@ -8,30 +9,49 @@ 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'
+@client.queue_name = 'ironmq-gem-long'
 @num_to_add = @config['count']
 
 start = Time.now
 puts "Queuing #{@num_to_add} items at #{start}..."
+executor = Concur::Executor.new_thread_pool_executor(50)
 @num_to_add.times do |i|
-	puts "POST #{i}..."
-	res = @client.messages.post("hello world! #{i}")
-	p res
+  task = executor.execute do
+    begin
+      puts "POST #{i}..."
+      res = @client.messages.post("hello world! #{i}")
+    rescue => ex
+      puts "ERROR! #{ex.class.name}: #{ex.message} -- #{ex.backtrace.inspect}"
+      raise ex
+    end
+  end
 end
+
+i = 0
+while executor.queue_size > 0 do
+  i += 1
+  puts "waiting #{i}, queue size=#{executor.queue_size}"
+  sleep 0.5
+end
+
+
 put_time = (Time.now.to_f - start.to_f)
 puts "Finished pushing in #{put_time} seconds"
 
+exit if true
+
 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
+  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."
 
+executor.shutdown

metadata

@@ -1,71 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ironmq
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.6
   prerelease: 
-  version: 1.2.5
 platform: ruby
-authors: 
+authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: typhoeus
+  requirement: &17190840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *17190840
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: &17190320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *17190320
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - Rakefile
 - VERSION.yml
 - ironmq.gemspec
 - lib/ironmq.rb
 - lib/ironmq/client.rb
+- lib/ironmq/messages.rb
 - test/ironmq_tests.rb
 - test/long_run.rb
 homepage: http://www.iron.io
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.9"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.9'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Ruby client for IronMQ
 test_files: []
-