iron_mq 4.0.3 → 4.0.5

data/test/test_mq_worker_subscribers.rb

@@ -0,0 +1,71 @@
+#
+# This test requires a hello worker in your project, run next line to add one:
+# iron_worker upload https://github.com/treeder/hello_worker/blob/master/hello.worker --config config.yml
+#
+
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
+require 'logger'
+require 'iron_worker_ng'
+
+
+class TestWorkerSubscribers < TestBase
+
+  def setup
+    super
+  end
+
+  def make_key(i, t, random=0)
+    key = "pushq-#{t}-#{i}-#{random}"
+  end
+
+  def test_mq_worker_subscribers
+
+    publisher_name = "publisher"
+    receiver_name = "push_receiver"
+    code_name = "hello"
+    queue = @client.queue(publisher_name)
+    receiver_queue = @client.queue(receiver_name)
+    clear_queue(receiver_name)
+
+    # test for bad subscribers
+    puts "raising..."
+    assert_raise Rest::HttpError do
+      # can't subscribe to self
+      res = queue.update_queue(:subscribers => [{:url => "ironmq:///#{publisher_name}"}])
+    end
+    
+    assert_raise Rest::HttpError do
+      # must have a token if sending to different project_id
+      res = queue.update_queue(:subscribers => [{:url => "ironmq://ABCDEFG@/somerandomqueue"}])
+    end
+    
+    subscribers = []
+    subscribers << {:url => "ironmq:///#{receiver_name}"}
+    subscribers << {:url => "ironworker:///#{code_name}"}
+  
+    res = queue.update_queue(:subscribers => subscribers)
+
+    LOG.debug queue.subscribers
+    assert_equal subscribers.size, queue.subscribers.size
+
+    body = "Hello IronMQ pusher!"
+    m = queue.post(body)
+
+    sleep 5
+    # now check that there's a message in the queue and that the worker got a job
+    receiver_queue.reload
+    assert_equal 1, receiver_queue.size
+    m2 = receiver_queue.get
+    assert_equal body, m2.body
+    m2.delete
+
+
+    wc = @config['iron']
+    wc[:host] = wc[:worker_host] if wc[:worker_host]
+    iron_worker = IronWorkerNG::Client.new(wc)
+    tasks = iron_worker.tasks.list(:code_name=>code_name, :from_time=>(Time.now - 30).to_i)
+    assert_equal 1, tasks.size
+  end
+
+  
+end

data/test/test_push_queues.rb

@@ -14,6 +14,7 @@ class TestPushQueues < TestBase
 
 
   def test_queue_subscriptions
+    puts "test_queue_subscriptions"
     types = ["multicast", "unicast"]
     # to delete queues later (clear project)
     queue_names = []
@@ -63,7 +64,7 @@ class TestPushQueues < TestBase
           tries = MAX_TRIES
           while tries > 0
             tries -= 1
-            sleep 0.5
+            sleep 1
             begin
               url = "http://rest-test.iron.io/stored/#{key}"
               LOG.info "checking url #{url}"
@@ -201,7 +202,8 @@ class TestPushQueues < TestBase
 
     tries = MAX_TRIES
     while tries > 0
-      sleep 0.5
+      puts 'sleeping for 5 to wait for retry'
+      sleep 5
       tries -= 1
       subscribers = queue.messages.get(m.id).subscribers
       LOG.debug subscribers
@@ -217,6 +219,7 @@ class TestPushQueues < TestBase
             do_retry = true
           end
         else
+          # this one should error a couple times, then be successful
           LOG.info "retries_remaining: #{s["retries_remaining"]}"
           if ["deleted", "error"].include? s["status"] || 200 == s["status_code"]
             assert_equal 0, s["retries_remaining"]
@@ -237,6 +240,7 @@ class TestPushQueues < TestBase
 
 
   def test_202
+    puts "test_202"
     types = ["multicast"]
     types.each do |t|
 
@@ -257,9 +261,13 @@ class TestPushQueues < TestBase
       res = queue.update_queue(:subscribers => subscribers,
                                :push_type => t)
 
+      queue.reload
       LOG.debug queue
+      queue = @client.queue(qname)
 
       assert_equal num_subscribers, queue.subscribers.size
+      assert_equal t, queue.push_type
+      puts "queue.push_type: #{queue.push_type}"
       # todo: assert subscriptions match
 
       msg = "hello #{x}"
@@ -292,6 +300,7 @@ class TestPushQueues < TestBase
         subscribers = queue.messages.get(m.id).subscribers
         LOG.debug subscribers
         assert_equal num_subscribers, subscribers.size
+        assert_equal t, queue.push_type
 
         do_retry = false
         subscribers.each do |s|
@@ -342,7 +351,6 @@ class TestPushQueues < TestBase
     end
   end
 
-
   def test_post_and_instantiate
     queue = @client.queue('push_and_instantiate')
 
@@ -376,4 +384,116 @@ class TestPushQueues < TestBase
     assert_equal 200, resp.code, "API must response with HTTP 200 status, but returned HTTP #{resp.code}"
   end
 
+
+  # tests when converting a push queue back to a pull queue
+  def test_converting_types
+    queue = @client.queue('converting_queue')
+    subscribers = [{:url => "http://rest-test.iron.io/code/200"},
+                   {:url => "http://rest-test.iron.io/code/200"}]
+
+    res = queue.update_queue(:subscribers => subscribers,
+                             :push_type => 'multicast')
+    queue.reload
+
+    assert_equal "multicast", queue.push_type
+
+    p queue.update_queue(:push_type => 'pull')
+
+    queue.reload
+
+    p queue.push_type
+
+    assert_nil queue.push_type
+
+  end
+    
+  def test_error_queues
+    @rest = Rest::Client.new
+    qname = "badrobot"
+    error_queue_name = "#{qname}--errors"
+    clear_queue(qname)
+    clear_queue(error_queue_name)
+
+    x = rand(1000)
+
+    subscribers = []
+    subscribers << {:url => "http://rest-test.iron.io/code/503"}
+    subscriber_urls = subscribers
+    num_subscribers = subscribers.size
+
+    queue = @client.queue(qname)
+    res = queue.update_queue(:subscribers => subscribers,
+                             :push_type => "multicast",
+                             :retries => 3,
+                             :retries_delay => 3
+    )
+    res = queue.update_queue(:error_queue => error_queue_name)
+
+    msg = "hello #{x}"
+    puts "Pushing msg: #{msg}"
+    m = queue.post(msg)
+    orig_id = m.id
+    puts "Msg id on post: #{orig_id}"
+    LOG.debug m
+    
+    tries = MAX_TRIES
+    while tries > 0
+      puts 'sleeping for 5 to wait for retry'
+      sleep 5
+      tries -= 1
+      subscribers = queue.messages.get(m.id).subscribers
+      LOG.debug subscribers
+      assert_equal num_subscribers, subscribers.size
+      do_retry = false
+      subscribers.each do |s|
+        LOG.debug s
+        if s["url"] == "http://rest-test.iron.io/code/503"
+          if "error" == s["status"]
+            assert_equal 0, s["retries_remaining"]
+          else
+            assert_equal 503, s["status_code"]
+            do_retry = true
+          end
+        else
+          # this one should error a couple times, then be successful
+          LOG.info "retries_remaining: #{s["retries_remaining"]}"
+          if ["deleted", "error"].include? s["status"] || 200 == s["status_code"]
+            assert_equal 0, s["retries_remaining"]
+          else
+            do_retry = true
+          end
+        end
+      end
+      next if do_retry
+      break
+    end
+    assert_not_equal tries, 0
+  
+    # check that the failed messages is in the error queue
+    error_queue = @client.queue(error_queue_name)
+    em = error_queue.get
+    assert_not_nil em
+    puts "rawbody: " + em.body
+    error_hash = JSON.parse(em.body)
+    p error_hash
+    assert error_hash['subscribers']
+    assert_equal subscriber_urls[0][:url], error_hash['subscribers'][0]['url']
+    assert_equal 503, error_hash['code']
+    assert_equal orig_id, error_hash['source_msg_id']
+    assert_not_nil error_hash['msg']
+    em.delete
+    
+    # now let's get the original message
+    orig_msg = queue.get_message(error_hash['source_msg_id'])
+    puts "orig_msg:"
+    p orig_msg
+    p orig_msg.body
+    assert msg, orig_msg.body
+  
+    error_queue.delete_queue
+    # delete queue on test complete
+    resp = queue.delete_queue
+    assert_equal 200, resp.code, "API must response with HTTP 200 status, but returned HTTP #{resp.code}"
+  end
+
 end

data/test/tmp.rb

@@ -0,0 +1,14 @@
+gem 'test-unit'
+require 'test/unit'
+require 'yaml'
+require_relative 'test_base'
+
+class TmpTests < TestBase
+  def setup
+    super
+
+  end
+
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.5
 platform: ruby
 authors:
 - Yury Yantsevich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: concur
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: quicky
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -138,7 +138,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: quicky
+  name: iron_worker_ng
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: go
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -166,6 +180,7 @@ files:
 - Rakefile
 - iron_mq.gemspec
 - lib/iron_mq.rb
+- lib/iron_mq/alert.rb
 - lib/iron_mq/client.rb
 - lib/iron_mq/messages.rb
 - lib/iron_mq/queues.rb
@@ -175,12 +190,16 @@ files:
 - test/long_run.rb
 - test/long_run_worker.rb
 - test/quick_run.rb
+- test/quick_run2.rb
 - test/schedule_abt.rb
+- test/test_alerts.rb
 - test/test_base.rb
 - test/test_beanstalkd.rb
 - test/test_bulk.rb
 - test/test_iron_mq.rb
+- test/test_mq_worker_subscribers.rb
 - test/test_push_queues.rb
+- test/tmp.rb
 homepage: https://github.com/iron-io/iron_mq_ruby
 licenses: []
 metadata: {}
@@ -200,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby client for IronMQ by www.iron.io
@@ -208,9 +227,13 @@ test_files:
 - test/long_run.rb
 - test/long_run_worker.rb
 - test/quick_run.rb
+- test/quick_run2.rb
 - test/schedule_abt.rb
+- test/test_alerts.rb
 - test/test_base.rb
 - test/test_beanstalkd.rb
 - test/test_bulk.rb
 - test/test_iron_mq.rb
+- test/test_mq_worker_subscribers.rb
 - test/test_push_queues.rb
+- test/tmp.rb