iron_mq 4.0.5 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59de953d559a2e493b72d7d9f5d588fb45b09522
-  data.tar.gz: ff331240b424418b610a83bb37f4091d5ac6f8af
+  metadata.gz: 1f1f8bd2435758c3f0e785860745e53693f420dd
+  data.tar.gz: 8c528651911fbab189d39f2517a6916ccff76455
 SHA512:
-  metadata.gz: 24378f0dcf15c8f5c54759dfe6bac0e556ffa05905e9fb26597c28bfd63b23b3146a5a8dff5285cf9b0668e6b9036ac023b9df2ebd6caa795f2954fc9136aad6
-  data.tar.gz: 3ffaa342f10a49f5cd638b75e7440b4d2d36cc709f186866740cbd1013aa57e672f1e4db1302dcc38a05a5c116e82a633c4a72a055b5ee4e1f92d7dd2e506bd2
+  metadata.gz: dff00f9dc21895c394d2b0b03fd37e4cc3994d80b980ac9ac1e56c4169c07b540f42df0a07ae02eb3015261695de0bfeb8bd55655ec2024c092d033122254493
+  data.tar.gz: f55c54ab596adc06964a1209b7ed5bef4c09c4ce4013dcedeec0a6d234489c8abbd28834acfd7320d06f50704ae7fd232b4b7990ac35d064c77337e109efc762

data/Gemfile.lock

@@ -9,33 +9,34 @@ GEM
   specs:
     beanstalk-client (1.1.1)
     concur (2.1.1)
-    ethon (0.6.1)
+    ethon (0.6.2)
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
-    ffi (1.9.0)
+    ffi (1.9.3)
     go (1.1.0)
       concur
-    iron_core (1.0.1)
-      rest (>= 2.2.0)
-    iron_worker_ng (1.0.2)
-      bundler (>= 1.2.0)
+    iron_core (1.0.3)
+      rest (>= 2.6.4)
+    iron_worker_ng (1.0.4)
+      bundler
       iron_core (>= 1.0.0)
       rubyzip (= 0.9.9)
-    mime-types (1.25)
-    minitest (5.0.8)
+    mime-types (1.25.1)
+    minitest (5.2.1)
     net-http-persistent (2.9)
+    netrc (0.7.7)
     quicky (0.4.0)
-    rake (10.1.0)
-    rest (2.6.3)
+    rake (10.1.1)
+    rest (2.7.0)
       net-http-persistent
-      rest-client (>= 0.3.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+      rest_client (>= 1.7.1)
+    rest_client (1.7.2)
+      netrc (~> 0.7.7)
     rubyzip (0.9.9)
     test-unit (2.5.5)
-    typhoeus (0.6.5)
-      ethon (~> 0.6.1)
-    uber_config (1.0.5)
+    typhoeus (0.6.7)
+      ethon (~> 0.6.2)
+    uber_config (1.1.0)
 
 PLATFORMS
   ruby

data/lib/iron_mq/alert.rb

@@ -11,21 +11,25 @@ module IronMQ
     end
 
     def id
-      @raw["id"]
+      @raw['id']
     end
 
     # alert type
     def type
-      @raw["type"]
+      @raw['type']
     end
 
     # target queue
     def queue
-      @raw["queue"]
+      @raw['queue']
     end
 
     def trigger
-      @raw["trigger"]
+      @raw['trigger']
+    end
+
+    def direction
+      @raw['direction']
     end
 
     # `options` was kept for backward compatibility
@@ -33,9 +37,9 @@ module IronMQ
       @message.call_api_and_parse_response(:delete, path)
     rescue Rest::HttpError => ex
       if ex.code == 404
-        IronCore::Logger.info("IronMQ", "Delete got 404, safe to ignore.")
+        IronCore::Logger.info('IronMQ', 'Delete got 404, safe to ignore.')
         # return ResponseBase as normal
-        ResponseBase.new({"msg" => "Deleted"}, 404)
+        ResponseBase.new({'msg' => 'Deleted'}, 404)
       else
         raise ex
       end

data/lib/iron_mq/queues.rb

@@ -8,7 +8,6 @@ module IronMQ
     def initialize(client, queue_name)
       @client = client
       @name = queue_name
-
     end
 
     def info
@@ -17,9 +16,8 @@ module IronMQ
 
     # this is only run once if it hasn't been called before unless force is true, then it will force reload.
     def load
-      if @raw.nil?
-        reload
-      end
+      reload if @raw.nil?
+
       @raw
     end
 
@@ -243,11 +241,7 @@ module IronMQ
     private
 
     def to_alerts(alert_array)
-      r = []
-      alert_array.each do |a|
-        r << Alert.new(self, a)
-      end
-      r
+      alert_array.each_with_object([]) { |a, res| res << Alert.new(self, a) }
     end
 
     def path(ext_path)

data/lib/iron_mq/subscribers.rb

@@ -10,6 +10,14 @@ module IronMQ
       @options = options
     end
 
+    def url
+      @raw['url']
+    end
+
+    def headers
+      @raw['headers']
+    end
+
     # `options` was kept for backward compatibility
     def delete(options = {})
       @message.call_api_and_parse_response(:delete, path)

data/lib/iron_mq/version.rb

@@ -1,3 +1,4 @@
 module IronMQ
-  VERSION = "4.0.5"
+  VERSION = "4.1.0"
 end
+

data/test/test_alerts.rb

@@ -13,130 +13,217 @@ class TestAlerts < TestBase
   def test_size_alerts
     return if @skip
 
-    # Add a normal size alert
-    # Post x messages
-    # check to ensure alert was triggered
+    type = 'size'
+    trigger = 10
+    # Test size alets, direction is ascending
+    queue, alert_queue = clear_queue_add_alert(type, trigger, 'asc')
 
-    x = rand(1000)
-    qname = "alert-queue-#{x}"
-    clear_queue(qname)
-    queue = @client.queue(qname)
-    puts "queue: #{queue}"
-    trigger_value = 10
-    # todo: should :queue be called something else, like target_queue? or url and have to use ironmq:// url?
-    target_queue_name = "alert-target-queue-#{x}"
-    r = queue.add_alert({:type => "size", :trigger => trigger_value, :queue => target_queue_name})
-    p r
+    # queue size will be trigger + 3
+    trigger_alert(queue, alert_queue, trigger, 3)
 
-    alerts = queue.alerts
-    p alerts
-    assert_equal 1, alerts.size
-    alert = alerts[0]
-    assert_equal "size", alert.type
-    assert_equal trigger_value, alert.trigger
-    assert_equal target_queue_name, alert.queue
+    # must not trigger alert, queue size will be trigger + 13
+    post_messages(queue, 10)
+    assert_equal 1, get_queue_size(alert_queue)
 
-    target_queue = @client.queue(target_queue_name)
-    assert_equal 0, target_queue.size
+    # must not trigger alert, queue size will be trigger - 3
+    delete_messages(queue, 16)
+    assert_equal 1, get_queue_size(alert_queue)
 
-    (trigger_value - 1).times do |i|
-      puts "posting #{i}"
-      queue.post("message #{i}")
-    end
-    sleep 0.5
-    assert_equal 0, target_queue.size
-    queue.post("message #{trigger_value}")
-    sleep 0.5
-    assert_equal trigger_value, queue.size
-    assert_equal 1, target_queue.size
-
-    # now let's get it down the reset point and trigger it again
-    (trigger_value / 2).times do |i|
-      m = queue.get
-      m.delete
-    end
-    assert_equal trigger_value/2, queue.size
-    assert_equal 1, target_queue.size
+    trigger_alert(queue, alert_queue, trigger)
 
-    # once it's at half, it should reset so let's get it back up to trigger_value again
-    (trigger_value / 2).times do |i|
-      queue.post("second set: message #{i}")
-    end
-    sleep 0.5
-    assert_equal trigger_value, queue.size
-    assert_equal 2, target_queue.size
+    delete_queues(queue, alert_queue)
 
-    queue.delete_queue
-    target_queue.delete_queue
+    # Test size alerts, direction is descending
+    queue, alert_queue = clear_queue_add_alert(type, trigger, 'desc')
 
-  end
+    # must not trigger descending alert
+    post_messages(queue, 15)
+    assert_equal 0, get_queue_size(alert_queue)
+
+    # will remove 5 msgs, queue size will be 10
+    trigger_alert(queue, alert_queue, trigger)
+
+    # must not trigger alert
+    post_messages(queue, 12)
+    assert_equal 1, get_queue_size(alert_queue)
+
+    trigger_alert(queue, alert_queue, trigger)
+
+    # must not trigger alert
+    delete_messages(queue, 8)
+    assert_equal 2, get_queue_size(alert_queue)
+
+    delete_queues(queue, alert_queue)
+
+    # Test size alerts, direction is "both"
+    queue, alert_queue = clear_queue_add_alert(type, trigger, 'both')
 
+    # trigger ascending alert
+    trigger_alert(queue, alert_queue, trigger)
+
+    # must not trigger alert
+    post_messages(queue, 8)
+    assert_equal 1, get_queue_size(alert_queue)
+
+    # trigger descending alert, queue size will be trigger - 3
+    trigger_alert(queue, alert_queue, trigger, 3)
+
+    # trigger ascending alert, queue size will be trigger + 3
+    trigger_alert(queue, alert_queue, trigger, 3)
+
+    delete_queues(queue, alert_queue)
+  end
 
   def test_progressive_alerts
     return if @skip
 
-    # Add a normal size alert
-    # Post x messages
-    # check to ensure alert was triggered
+    type = 'progressive'
+    trigger = 10
+    # Test ascending progressive alert
+    queue, alert_queue = clear_queue_add_alert(type, trigger, 'asc')
+
+    # Trigger 3 alerts
+    (1..3).each { |n| trigger_alert(queue, alert_queue, n * trigger) }
+
+    # Must not trigger alerts
+    delete_messages(queue, 15)
+    assert_equal 3, get_queue_size(alert_queue)
+
+    trig = (get_queue_size(queue) / trigger.to_f).ceil * trigger
+    trigger_alert(queue, alert_queue, trig)
+
+    # must not trigger alert
+    delete_messages(queue, get_queue_size(queue) - 1)
+
+    delete_queues(queue, alert_queue)
+
+    # Test descending progressive alert
+    queue, alert_queue = clear_queue_add_alert(type, trigger, 'desc')
+
+    # must not trigger alert
+    post_messages(queue, 25)
+    assert_equal 0, get_queue_size(alert_queue)
+
+    # trigger descending alert twice
+    2.downto(1) { |n| trigger_alert(queue, alert_queue, n * trigger) }
+
+    # must not trigger alert at size of 0
+    delete_messages(queue, 5)
+    assert_equal 2, get_queue_size(alert_queue)
+
+    # must not trigger alert
+    post_messages(queue, 15)
+    assert_equal 2, get_queue_size(alert_queue)
+
+    delete_queues(queue, alert_queue)
+
+    # Test "both" direction progressive alerts
+    queue, alert_queue = clear_queue_add_alert(type, trigger, 'both')
+
+    trigger_alert(queue, alert_queue, trigger, 2)
+    trigger_alert(queue, alert_queue, 2 * trigger) # queue size = 2 * trigger
+
+    # must not trigger descending alert
+    delete_messages(queue, trigger / 2)
+    assert_equal 2, get_queue_size(alert_queue)
+
+    # trigger descending alert, queue size will be trigger - 3
+    trigger_alert(queue, alert_queue, trigger, 3)
+
+    # trigger ascending alert, queue size will be trigger + 5
+    trigger_alert(queue, alert_queue, trigger, 5)
+
+    # must not trigger alerts below, queue size will be 2 * trigger - 1
+    post_messages(queue, trigger - 5 - 1)
+    assert_equal 4, get_queue_size(alert_queue)
+
+    # one message before trigger value
+    delete_messages(queue, trigger - 2)
+    assert_equal 4, get_queue_size(alert_queue)
+
+    delete_queues(queue, alert_queue)
+  end
+
+  def post_messages(queue, n)
+    queue.post(Array.new(n, { :body => 'message' }))
+    sleep 1
+  end
+
+  def delete_messages(queue, n)
+    msgs = queue.get(:n => n)
+    [msgs].flatten.each { |msg| msg.delete }
+    sleep 1
+  end
+
+  def delete_queues(*queues)
+    queues.each { |q| q.delete_queue }
+  end
+
+  def trigger_alert(queue, alert_queue, trigger, overhead = 0)
+    puts "trigger_alert(), called at #{caller[0]}"
+
+    qsize = get_queue_size(queue)
+    puts "Initial queue size is #{qsize}"
+    puts 'Alert is already triggered!' if qsize == trigger
+    aq_size = get_queue_size(alert_queue)
+
+    if qsize < trigger
+      nmsgs = trigger - qsize - 1
+      puts "Try to trigger ascending alert... post #{nmsgs} messages"
+      post_messages(queue, nmsgs)
+    else
+      nmsgs = qsize - trigger - 1
+      puts "Try to trigger descending alert... delete #{nmsgs} messages"
+      delete_messages(queue, nmsgs)
+    end
+    assert_equal aq_size, get_queue_size(alert_queue)
+
+    if qsize < trigger
+      puts "Post more #{1 + overhead} messages"
+      post_messages(queue, 1 + overhead)
+    else
+      puts "Delete more #{1 + overhead} messages"
+      delete_messages(queue, 1 + overhead)
+    end
+    assert_equal aq_size + 1, get_queue_size(alert_queue)
+  end
+
+  def clear_queue_add_alert(type, trigger, direction)
+    puts "clear_queue_add_alert(), called at #{caller[0]}"
+
+    qname = "#{type}-#{direction}-#{trigger}"
+    alert_qname = "#{qname}-alerts"
 
-    x = rand(1000)
-    qname = "alert-queue-#{x}"
     queue = @client.queue(qname)
-    trigger_value = 10
-    # todo: should :queue be called something else, like target_queue? or url and have to use ironmq:// url?
-    target_queue_name = "alert-target-queue-#{x}"
-    r = queue.add_alert({:type => "progressive", :trigger => trigger_value, :queue => target_queue_name})
-    p r
+    alert_queue = @client.queue(alert_qname)
+    # delete instead of clearing to remove all alerts from queue
+    delete_queues(queue, alert_queue)
+    # todo: should :queue be called something else,
+    # like alert_queue? or url and have to use ironmq:// url?
+    r = queue.add_alert({ :type => type, :trigger => trigger,
+                          :queue => alert_qname, :direction => direction })
+    #p r
 
     alerts = queue.alerts
+    #p alerts
+
     assert_equal 1, alerts.size
     alert = alerts[0]
-    assert_equal "progressive", alert.type
-    assert_equal trigger_value, alert.trigger
-    assert_equal target_queue_name, alert.queue
-
-    target_queue = @client.queue(target_queue_name)
-    assert_equal 0, target_queue.size
-
-    post_messages(queue, trigger_value)
-    assert_equal trigger_value, queue.size
-    assert_equal 1, target_queue.size
-
-    # now let's do it again and see if it tiggers again
-    post_messages(queue, trigger_value)
-    assert_equal trigger_value * 2, queue.size
-    assert_equal 2, target_queue.size
-
-    # now let's do it once again and see if it triggers again
-    post_messages(queue, trigger_value)
-    assert_equal trigger_value * 3, queue.size
-    assert_equal 3, target_queue.size
-
-    # now let's get it down to the reset point and trigger it again
-    (trigger_value).times do |i|
-      m = queue.get
-      m.delete
-    end
-    sleep 0.5
-    assert_equal trigger_value*2, queue.size
-    assert_equal 3, target_queue.size
-
-    # once it's at half, it should reset so let's get it back up to trigger_value again
-    post_messages(queue, trigger_value)
-    assert_equal trigger_value*3, queue.size
-    assert_equal 4, target_queue.size
-
-    queue.delete_queue
-    target_queue.delete_queue
+    #p alert
+    assert_equal type, alert.type
+    assert_equal trigger, alert.trigger
+    assert_equal alert_qname, alert.queue
+    assert_equal direction, alert.direction
 
+    [queue, @client.queue(alert_qname)]
   end
 
-  def post_messages(queue, num)
-    (num).times do |i|
-      queue.post("message #{i}")
+  def get_queue_size(queue)
+    begin
+      queue.reload.size
+    rescue Rest::HttpError => ex
+      ex.message =~ /404/ ? 0 : raise(ex)
     end
-    sleep 0.5
   end
-  
 
 end

data/test/test_push_queues.rb

@@ -12,6 +12,50 @@ class TestPushQueues < TestBase
     key = "pushq-#{t}-#{i}-#{random}"
   end
 
+  def test_subscriber_add_remove
+    puts "test_subscriber_add_remove"
+    qname = "subscribers_add_remove_test"
+    s = "http://nowhere.com:8080/somepath"
+    s2 = "http://somewhere.com"
+    queue = @client.queue(qname)
+    subscribers = [{:url => s}]
+    res = queue.update_queue(:subscribers => subscribers)
+    LOG.debug queue.subscribers
+    assert_equal 1, queue.subscribers.size
+
+    queue.reload
+    assert_equal 1, queue.subscribers.size
+    p queue.subscribers[0].url
+    queue.remove_subscriber({:url => s})
+    queue.reload
+    assert_equal 0, queue.subscribers.size
+    p queue.subscribers
+
+    # add it back with add
+    queue.add_subscriber({:url => s})
+    queue.reload
+    assert_equal 1, queue.subscribers.size
+    p queue.subscribers[0].url
+    queue.remove_subscriber({:url => s})
+    queue.reload
+    assert_equal 0, queue.subscribers.size
+    p queue.subscribers
+
+    # add two, remove first
+    queue.add_subscriber({:url => s})
+    queue.add_subscriber({:url => s2})
+    queue.reload
+    assert_equal 2, queue.subscribers.size
+    p queue.subscribers[0].url
+    queue.remove_subscriber({:url => s})
+    queue.reload
+    assert_equal 1, queue.subscribers.size
+    p queue.subscribers[0].url
+    assert_equal s2, queue.subscribers[0].url
+
+    queue.delete_queue
+  end
+
 
   def test_queue_subscriptions
     puts "test_queue_subscriptions"
@@ -69,6 +113,7 @@ class TestPushQueues < TestBase
               url = "http://rest-test.iron.io/stored/#{key}"
               LOG.info "checking url #{url}"
               response = @rest.get(url)
+              p response.body
               parsed = JSON.parse(response.body)
               LOG.debug parsed['body']
               assert_equal msg, parsed['body']
@@ -78,7 +123,7 @@ class TestPushQueues < TestBase
               LOG.debug ex.code
               assert_equal 404, ex.code
             end
-          end          
+          end
           assert_not_equal tries, 0
         end
       elsif t == "unicast"
@@ -103,7 +148,7 @@ class TestPushQueues < TestBase
             end
           end
           break if found == 1
-        end        
+        end
         assert_not_equal tries, 0
       end
 
@@ -111,7 +156,7 @@ class TestPushQueues < TestBase
       while tries > 0
 
         # Need to wait > 60s here, because in case of retries on pusherd
-        # side (due lost connection for example) there will be no response earlier 
+        # side (due lost connection for example) there will be no response earlier
         # (default retries_delay is 60s).
         sleep 1
         tries -= 1
@@ -149,6 +194,60 @@ class TestPushQueues < TestBase
     end
   end
 
+  def test_headers
+    puts "test_headers"
+    qname = "push-headers"
+    subscribers = []
+
+    x = rand(1000)
+    key = "somemsg_#{x}"
+    subscribers << {:url => "http://rest-test.iron.io/code/200?store=#{key}",
+    :headers=>{"Content-Type"=>"application/json"}}
+
+    queue = @client.queue(qname)
+    queue.update_queue(:subscribers => subscribers,
+                       :push_type => "multicast")
+
+    LOG.debug queue.subscribers
+    assert_equal subscribers.size, queue.subscribers.size
+    queue.reload.subscribers.each do |s|
+      p s.headers
+      assert_not_nil s.headers['Content-Type']
+    end
+
+    msg = "{\"hello\": #{x}}"
+    m = queue.post(msg)
+
+    LOG.info "Checking results..."
+    @rest = Rest::Client.new
+    found = 0
+    tries = MAX_TRIES
+    while tries > 0
+      tries -= 1
+      sleep 1
+      begin
+        url = "http://rest-test.iron.io/stored/#{key}"
+        LOG.info "checking url #{url}"
+        response = @rest.get(url)
+        p response.body
+        parsed = JSON.parse(response.body)
+        LOG.debug parsed['body']
+        assert_equal msg, parsed['body']
+        assert_not_nil parsed['headers']['Content-Type']
+        assert_equal 'application/json', parsed['headers']['Content-Type']
+        break
+      rescue Rest::HttpError => ex
+        LOG.debug ex.code
+        assert_equal 404, ex.code
+      end
+      assert_not_equal tries, 0
+    end
+
+    # delete queue after all tests on it were completed
+    resp = queue.delete_queue
+    assert_equal 200, resp.code, "API must respond with HTTP 200 status, but returned HTTP #{resp.code}"
+  end
+
 
   def test_failure
     @rest = Rest::Client.new
@@ -176,7 +275,7 @@ class TestPushQueues < TestBase
     msg = "hello #{x}"
     m = queue.post(msg)
     LOG.debug m
-    
+
     tries = MAX_TRIES
     while tries > 0
       sleep 0.5
@@ -333,7 +432,7 @@ class TestPushQueues < TestBase
         subscribers = queue.messages.get(m.id).subscribers
         LOG.debug subscribers
         next unless num_subscribers == subscribers.size
-        
+
         do_retry = false
         subscribers.each do |s|
           LOG.debug s
@@ -385,7 +484,7 @@ class TestPushQueues < TestBase
   end
 
 
-  # tests when converting a push queue back to a pull queue
+# 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"},
@@ -406,7 +505,7 @@ class TestPushQueues < TestBase
     assert_nil queue.push_type
 
   end
-    
+
   def test_error_queues
     @rest = Rest::Client.new
     qname = "badrobot"
@@ -435,7 +534,7 @@ class TestPushQueues < TestBase
     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'
@@ -468,7 +567,7 @@ class TestPushQueues < TestBase
       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
@@ -482,14 +581,14 @@ class TestPushQueues < TestBase
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0
 platform: ruby
 authors:
 - Yury Yantsevich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for IronMQ by www.iron.io