iron_mq 2.0.0 → 2.1.0

data/Gemfile.lock

@@ -1,42 +1,26 @@
 PATH
   remote: .
   specs:
-    iron_mq (1.9.1)
+    iron_mq (2.0.0)
       iron_core (>= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.2.8)
     beanstalk-client (1.1.1)
-    concur (0.1.2)
-      em-http-request
-      em-http-request
-      eventmachine
-      eventmachine
+    concur (1.0.0)
       faraday
       faraday
-    cookiejar (0.3.0)
-    em-http-request (1.0.2)
-      addressable (>= 2.2.3)
-      cookiejar
-      em-socksify
-      eventmachine (>= 1.0.0.beta.4)
-      http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.0)
-      eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.0.rc.4)
     faraday (0.8.1)
       multipart-post (~> 1.1)
-    ffi (1.0.11)
-    http_parser.rb (0.5.3)
-    iron_core (0.2.0)
+    ffi (1.1.3)
+    iron_core (0.3.3)
       rest (>= 2.0.0)
     mime-types (1.19)
     multipart-post (1.1.5)
     net-http-persistent (2.7)
     rake (0.9.2.2)
-    rest (2.0.0)
+    rest (2.0.2)
       net-http-persistent
       rest-client (>= 0.3.0)
     rest-client (1.6.7)
@@ -45,7 +29,7 @@ GEM
     typhoeus (0.4.2)
       ffi (~> 1.0)
       mime-types (~> 1.18)
-    uber_config (0.0.3)
+    uber_config (0.0.6)
 
 PLATFORMS
   ruby

data/lib/iron_mq/queues.rb

@@ -28,6 +28,13 @@ module IronMQ
       ret
     end
 
+    def clear(options={})
+      @client.logger.debug "Clearing queue #{options[:name]}"
+      r1 = @client.post("#{path(options)}/clear", options)
+      p r1
+      r1
+    end
+
     # options:
     #  :name => can specify an alternative queue name
     def get(options={})
@@ -74,6 +81,10 @@ module IronMQ
       raw["name"]
     end
 
+    def reload
+      load_queue
+    end
+
     # Used if lazy loading
     def load_queue
       q = @client.queues.get(:name=>name)
@@ -82,6 +93,10 @@ module IronMQ
       q
     end
 
+    def clear()
+      @client.queues.clear(:name=>name)
+    end
+
     def size
       return raw["size"] if raw["size"]
       return @size if @size
@@ -109,6 +124,7 @@ module IronMQ
     def delete(id, options={})
       @client.messages.delete(id, options.merge(:queue_name=>name))
     end
+
   end
 
 end

data/lib/iron_mq/version.rb

@@ -1,3 +1,3 @@
 module IronMQ
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/test/long_run.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'concur'
+require 'uber_config'
 begin
   require File.join(File.dirname(__FILE__), '..', 'lib', 'iron_mq')
 rescue Exception => ex
@@ -9,15 +10,11 @@ end
 
 require_relative 'long_run_worker'
 
-@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "config.yml")))
+@config = UberConfig.load
 @num_to_add = 1000
 
-#IronWorker.configure do |c|
-#  c.token = @config['iron_mq']['token']
-#  c.project_id = @config['iron_mq']['project_id']
-#end
-
 worker = LongRunWorker.new
+worker.queue_name = "concur5"
 worker.config = @config
 worker.num_to_add = @num_to_add
 worker.run

data/test/long_run_worker.rb

@@ -3,12 +3,12 @@ require 'iron_mq'
 
 class LongRunWorker
 
-  attr_accessor :config, :num_to_add
+  attr_accessor :config, :num_to_add, :queue_name
 
   def run
 
     @client = IronMQ::Client.new(@config['iron'])
-    @client.queue_name = 'ironmq-gem-long'
+    queue = @client.queue(queue_name)
 
     @error_count = 0
 
@@ -19,7 +19,7 @@ class LongRunWorker
       task = executor.execute do
         begin
           puts "POST #{i}..."
-          res = @client.messages.post("hello world! #{i}")
+          res = queue.post("hello world! #{i}")
         rescue => ex
           puts "ERROR! #{ex.class.name}: #{ex.message} -- #{ex.backtrace.inspect}"
           @error_count += 1
@@ -34,26 +34,40 @@ class LongRunWorker
       puts "waiting #{i}, queue size=#{executor.queue_size}"
       sleep 2
     end
-
-
     put_time = (Time.now.to_f - start.to_f)
     puts "Finished pushing in #{put_time} seconds"
 
+    queue = @client.queue(queue_name)
+    queue_size_after_push = queue.size
+    puts "QUEUE SIZE: #{queue_size_after_push}"
+
     #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
+      task = executor.execute do
+        puts "GET #{i}..."
+        res = queue.get()
+        p res
+        puts "DELETE #{i}..."
+        res = queue.delete(res.id)
+        p res
+      end
+    end
+    i = 0
+    while executor.queue_size > 0 do
+      i += 1
+      puts "waiting #{i}, queue size=#{executor.queue_size}"
+      sleep 2
     end
 
+    queue = @client.queue(queue_name)
+
     puts "Finished pushing #{@num_to_add} items in #{put_time} seconds."
+    puts "QUEUE SIZE after push: #{queue_size_after_push}"
     puts "Finished getting and deleting #{@num_to_add} items in #{(Time.now.to_f - start.to_f)} seconds."
+    puts "QUEUE SIZE after delete: #{queue.size}"
     puts "Errors: #{@error_count}"
 
     executor.shutdown

data/test/quick_run.rb

@@ -5,7 +5,7 @@ class QuickRun < TestBase
 
   def setup
     super
-    @client.queue_name = 'ironmq-gem-quick'
+    @client.queue_name = 'ironmq-gem_quick'
     clear_queue
   end
 

data/test/test_beanstalkd.rb

@@ -25,7 +25,7 @@ class BeanstalkTests < TestBase
 
   def test_basics
     omit_if @skip # bypass this test if rackspace
-    puts 'test_basics'
+    puts 'test_basics3'
 
     queue_name = "beanstalk_test"
     clear_queue(queue_name)

data/test/test_iron_mq.rb

@@ -19,7 +19,7 @@ class IronMQTests < TestBase
   end
  
   def test_performance_post_100_messages
-    @client.queue_name = 'test_basics'
+    @client.queue_name = 'test_basics3'
     # slower to rackspace since this is running on aws
     timeout = @client.host.include?('rackspace') ? 40 : 10
     assert_performance timeout do
@@ -31,7 +31,7 @@ class IronMQTests < TestBase
 
 
   def test_basics
-    @client.queue_name = 'test_basics'
+    @client.queue_name = 'test_basics3'
     clear_queue
 
     res = @client.messages.post("hello world!")
@@ -41,6 +41,7 @@ class IronMQTests < TestBase
     assert res.msg
 
     queue = @client.queues.get(:name => @client.queue_name)
+    p queue
     assert queue.size == 1
     res = @client.messages.get()
     p res
@@ -75,7 +76,7 @@ class IronMQTests < TestBase
 
 
     # new style of referencing queue
-    queue = @client.queue("test_basics")
+    queue = @client.queue("test_basics3")
     v = "hello big world"
     res = queue.post(v)
     p res
@@ -185,7 +186,7 @@ class IronMQTests < TestBase
     assert res.size == 0
 
 
-    queue = @client.queue("test_basics")
+    queue = @client.queue("test_basics3")
     assert queue.name
     assert queue.size
 
@@ -237,61 +238,62 @@ class IronMQTests < TestBase
     end
   end
 
-  # PUT THIS BACK IN WHEN READY
-  #def test_release
-  #  puts 'test_release'
-  #  @client.queue_name = "test_release"
-  #  clear_queue
-  #  msgTxt = "testMessage-"+Time.now.to_s
-  #  puts msgTxt
-  #  msg_id = @client.messages.post(msgTxt, {:timeout => 3600}).id
-  #  puts "msg_id: #{msg_id}"
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg.id == msg_id
-  #  # Ok, so should have received same message, now let's release it quicker than the original timeout
-  #
-  #  # but first, ensure the next get is nil
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg.nil?
-  #
-  #  # now release it instantly
-  #  @client.messages.release(msg_id)
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg
-  #  assert msg.id == msg_id
-  #
-  #  # ok, so should be reserved again
-  #  msgr = @client.messages.get
-  #  p msgr
-  #  assert msgr.nil?
-  #
-  #  # let's release it in 10 seconds
-  #  @client.messages.release(msg_id, :delay=>10)
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg.nil?
-  #
-  #  sleep 11
-  #
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg
-  #
-  #  msg.release(:delay => 5)
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg.nil?
-  #
-  #  sleep 6
-  #
-  #  msg = @client.messages.get
-  #  p msg
-  #  assert msg
-  #
-  #end
+  def test_release
+    puts 'test_release'
+    @client.queue_name = "test_release"
+    clear_queue
+    msgTxt = "testMessage-"+Time.now.to_s
+    puts msgTxt
+    msg_id = @client.messages.post(msgTxt, {:timeout => 60*5}).id
+    puts "msg_id: #{msg_id}"
+    msg = @client.messages.get
+    p msg
+    assert msg.id == msg_id
+    # Ok, so should have received same message, now let's release it quicker than the original timeout
+
+    # but first, ensure the next get is nil
+    msg = @client.messages.get
+    p msg
+    assert msg.nil?
+
+    # now release it instantly
+    @client.messages.release(msg_id)
+    msg = @client.messages.get
+    p msg
+    assert msg
+    assert msg.id == msg_id
+
+    # ok, so should be reserved again
+    msgr = @client.messages.get
+    p msgr
+    assert msgr.nil?
+
+    # let's release it in 10 seconds
+    @client.messages.release(msg_id, :delay=>10)
+    msg = @client.messages.get
+    p msg
+    assert msg.nil?
+
+    sleep 11
+
+    msg = @client.messages.get
+    p msg
+    assert msg
+
+    msg.release(:delay => 5)
+    msg = @client.messages.get
+    p msg
+    assert msg.nil?
+
+    sleep 6
+
+    msg = @client.messages.get
+    p msg
+    assert msg
+
+  end
+
+
 
 end
 

data/test/tmp.rb

@@ -0,0 +1,37 @@
+# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
+
+#$abt_config = {:hello=>'abt_config_ya'}
+
+gem 'test-unit'
+require 'test/unit'
+require 'yaml'
+require_relative 'test_base'
+
+class IronMQTests < TestBase
+  def setup
+    super
+
+  end
+
+  def test_clear
+
+    q = @client.queue("clearer")
+
+    clear_queue(q.name)
+
+    val = "hi mr clean"
+    q.post(val)
+    assert q.size == 1
+
+    q.clear
+    msg = q.get
+    assert msg.nil?
+
+    q.reload
+
+    assert q.size == 0
+
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -165,6 +165,7 @@ files:
 - test/test_beanstalkd.rb
 - test/test_bulk.rb
 - test/test_iron_mq.rb
+- test/tmp.rb
 homepage: https://github.com/iron-io/iron_mq_ruby
 licenses: []
 post_install_message: 
@@ -198,3 +199,4 @@ test_files:
 - test/test_beanstalkd.rb
 - test/test_bulk.rb
 - test/test_iron_mq.rb
+- test/tmp.rb