iron_mq 2.1.1 → 2.1.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    iron_mq (2.1.0)
-      iron_core (>= 0.2.0)
+    iron_mq (2.1.2)
+      iron_core (>= 0.4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -11,11 +11,11 @@ GEM
     concur (1.0.0)
       faraday
       faraday
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
-    ffi (1.1.3)
-    iron_core (0.3.3)
-      rest (>= 2.0.0)
+    ffi (1.1.5)
+    iron_core (0.4.2)
+      rest (>= 2.0.2)
     mime-types (1.19)
     multipart-post (1.1.5)
     net-http-persistent (2.7)

data/README.md

@@ -33,15 +33,20 @@ Now you can use it:
 **Pop** a message off the queue:
 
     msg = @queue.get()
-    p msg
+    puts msg.body
+
+**Poll** for messages:
+
+    @queue.poll do |msg|
+      puts msg.body
+    end
 
 When you pop/get a message from the queue, it will NOT be deleted. It will eventually go back onto the queue after
 a timeout if you don't delete it (default timeout is 10 minutes).
 
 **Delete** a message from the queue:
 
-    res = msg.delete # or @queue.delete(msg.id)
-    p res
+    msg.delete # or @queue.delete(msg.id)
 
 Delete a message from the queue when you're done with it.
 

data/iron_mq.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  gem.add_runtime_dependency "iron_core", ">= 0.2.0"
+  gem.add_runtime_dependency "iron_core", ">= 0.4.2"
 
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "rake"

data/lib/iron_mq/client.rb

@@ -11,12 +11,12 @@ module IronMQ
 
     def initialize(options={})
       default_options = {
-        :scheme => 'https',
-        :host => IronMQ::Client::AWS_US_EAST_HOST,
-        :port => 443,
-        :api_version => 1,
-        :user_agent => 'iron_mq_ruby-' + IronMQ::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
-        :queue_name => 'default'
+          :scheme => 'https',
+          :host => IronMQ::Client::AWS_US_EAST_HOST,
+          :port => 443,
+          :api_version => 1,
+          :user_agent => 'iron_mq_ruby-' + IronMQ::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
+          :queue_name => 'default'
       }
 
       super('iron', 'mq', options, default_options, [:project_id, :token, :api_version, :queue_name])
@@ -33,15 +33,14 @@ module IronMQ
       super.merge({'Authorization' => "OAuth #{@token}"})
     end
 
-    def url
+    def base_url
       super + @api_version.to_s + '/'
     end
 
     def queue(name)
-      return Queue.new(self, {"name"=>name})
+      return Queue.new(self, {"name" => name})
     end
 
-
     def messages
       return Messages.new(self)
     end

data/lib/iron_mq/queues.rb

@@ -10,7 +10,7 @@ module IronMQ
     def path(options={})
       path = "projects/#{@client.project_id}/queues"
       if options[:name]
-        path << "/#{URI.escape(options[:name])}"
+        path << "/#{CGI::escape(options[:name])}"
       end
       path
     end
@@ -31,7 +31,14 @@ module IronMQ
     def clear(options={})
       @client.logger.debug "Clearing queue #{options[:name]}"
       r1 = @client.post("#{path(options)}/clear", options)
-      p r1
+      @client.logger.debug "Clear result: #{r1}"
+      r1
+    end
+
+    def delete(options={})
+      @client.logger.debug "Deleting queue #{options[:name]}"
+      r1 = @client.delete("#{path(options)}", options)
+      @client.logger.debug "Delete result: #{r1}"
       r1
     end
 
@@ -97,6 +104,10 @@ module IronMQ
       @client.queues.clear(:name => name)
     end
 
+    def delete_queue()
+      @client.queues.delete(:name=>name)
+    end
+
     def size
       return raw["size"] if raw["size"]
       return @size if @size
@@ -127,7 +138,7 @@ module IronMQ
     #
     # options:
     # - :sleep_duration=>seconds => time between polls if msg is nil. default 1.
-    # - :break_on_nil=>true/false => if true, will break if msg is nil (ie: queue is empty)
+    # - :break_if_nil=>true/false => if true, will break if msg is nil (ie: queue is empty)
     def poll(options={}, &blk)
       sleep_duration = options[:sleep_duration] || 1
       while true

data/lib/iron_mq/version.rb

@@ -1,3 +1,3 @@
 module IronMQ
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/test/test_iron_mq.rb

@@ -19,7 +19,7 @@ class IronMQTests < TestBase
   end
 
   def test_performance_post_100_messages
-    @client.queue_name = 'test_basics3'
+    @client.queue_name = 'test_basics_6'
     # slower to rackspace since this is running on aws
     timeout = @client.host.include?('rackspace') ? 40 : 12
     assert_performance timeout do
@@ -31,7 +31,8 @@ class IronMQTests < TestBase
 
 
   def test_basics
-    @client.queue_name = 'test_basics3'
+    queue_name = 'test_basics_6'
+    @client.queue_name = queue_name
     clear_queue
 
     res = @client.messages.post("hello world!")
@@ -42,7 +43,7 @@ class IronMQTests < TestBase
 
     queue = @client.queues.get(:name => @client.queue_name)
     p queue
-    assert queue.size == 1
+    assert queue.reload.size == 1, "Size was not 1 after insert, it was: #{queue.size}"
     res = @client.messages.get()
     p res
     assert res["id"]
@@ -75,7 +76,7 @@ class IronMQTests < TestBase
 
 
     # new style of referencing queue
-    queue = @client.queue("test_basics3")
+    queue = @client.queue(queue_name)
     v = "hello big world"
     res = queue.post(v)
     p res
@@ -113,7 +114,7 @@ class IronMQTests < TestBase
 
   # TODO: pass :timeout in post/get messages and test those
   def test_timeout
-    @client.queue_name = "test_timeout"
+    @client.queue_name = "test_timeout_6"
     clear_queue
 
     res = @client.messages.post("hello world timeout!")
@@ -185,7 +186,7 @@ class IronMQTests < TestBase
     assert res.size == 0
 
 
-    queue = @client.queue("test_basics3")
+    queue = @client.queue("test_basics_6")
     assert queue.name
     assert queue.size
 
@@ -194,7 +195,7 @@ class IronMQTests < TestBase
 
   def test_delay
     puts 'test_delay'
-    @client.queue_name = "test_delay"
+    @client.queue_name = "test_delay_6"
     clear_queue
     msgTxt = "testMessage-"+Time.now.to_s
     puts msgTxt
@@ -210,7 +211,7 @@ class IronMQTests < TestBase
 
   def test_batch
     puts 'test_batch'
-    @client.queue_name = "test_batch"
+    @client.queue_name = "test_batch_6"
     clear_queue
 
     x = []
@@ -239,7 +240,7 @@ class IronMQTests < TestBase
 
   def test_release
     puts 'test_release'
-    @client.queue_name = "test_release"
+    @client.queue_name = "test_release_6"
     clear_queue
     msgTxt = "testMessage-"+Time.now.to_s
     puts msgTxt
@@ -294,7 +295,7 @@ class IronMQTests < TestBase
 
   def test_clear
 
-    q = @client.queue("clearer")
+    q = @client.queue("clearer_6")
 
     clear_queue(q.name)
 
@@ -308,14 +309,14 @@ class IronMQTests < TestBase
 
     q.reload
 
-    assert q.size == 0
+    assert q.reload.size == 0, "Size was not zero after clear, it was: #{q.size}"
 
   end
 
 
 
   def test_poll
-    queue = @client.queue("test_poll")
+    queue = @client.queue("test_poll_6")
     queue.clear
 
     v = "hello world"
@@ -328,11 +329,30 @@ class IronMQTests < TestBase
       assert msg.body.include?("hello")
       i += 1
     end
-    assert i == 5
+    assert i == 5, "Polled #{i} messages, but there should have only been five messages in queue. "
 
-    assert queue.reload.size == 0
+    assert queue.reload.size == 0, "Size was not zero after poll, it was: #{queue.size}"
 
   end
+  #
+  #def test_delete
+  #  queue = @client.queue("test_delete")
+  #  queue.post("hi")
+  #  queue.reload
+  #  old_id = queue.id
+  #  queue.delete_queue
+  #
+  #  puts "sleeping for a bit to let queue delete..."
+  #  sleep 60
+  #
+  #  queue.post("hi2")
+  #  p queue
+  #  queue.reload
+  #  assert queue.id != old_id, "old_id: #{old_id} is equal to new id: #{queue.id}"
+  #  assert queue.size == 1
+  #  queue.get("").body == "hi2"
+  #
+  #end
 
 
 end

data/test/tmp.rb

@@ -13,4 +13,4 @@ class IronMQTests < TestBase
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement