henchman 0.0.2 → 0.0.3

data/henchman.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "henchman"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Martin Bruse"]
   s.email       = ["martin@oort.se"]
   s.homepage    = "https://github.com/zond/henchman"

data/lib/henchman.rb

@@ -247,21 +247,21 @@ module Henchman
   # @param [String] queue_name the name of the queue to enqueue on.
   # @param [Object] message the message to enqueue.
   #
-  def enqueue(queue_name, message)
-    EM::Synchrony.sync(aenqueue(queue_name, message))
+  def enqueue(queue_name, message, headers = {})
+    EM::Synchrony.sync(aenqueue(queue_name, message, headers))
   end
 
   #
   # Enqueue a message asynchronously.
   #
-  # @param (see #publish)
+  # @param (see #enqueue)
   #
   # @return [EM::Deferrable] a deferrable that will succeed when the publishing is done.
   #
-  def aenqueue(queue_name, message)
+  def aenqueue(queue_name, message, headers = {})
     deferrable = EM::DefaultDeferrable.new
     with_direct_exchange do |exchange|
-      exchange.publish(MultiJson.encode(message), :routing_key => queue_name) do
+      exchange.publish(MultiJson.encode(message), :headers => headers, :routing_key => queue_name) do
         deferrable.set_deferred_status :succeeded
       end
     end
@@ -274,8 +274,8 @@ module Henchman
   # @param [String] exchange_name the name of the exchange to publish on.
   # @param [Object] message the object to publish
   #
-  def publish(exchange_name, message)
-    EM::Synchrony.sync(apublish(exchange_name, message))
+  def publish(exchange_name, message, headers = {})
+    EM::Synchrony.sync(apublish(exchange_name, message, headers))
   end
   
   #
@@ -285,10 +285,10 @@ module Henchman
   #
   # @return [EM::Deferrable] a deferrable that will succeed when the publishing is done.
   #
-  def apublish(exchange_name, message)
+  def apublish(exchange_name, message, headers = {})
     deferrable = EM::DefaultDeferrable.new
     with_fanout_exchange(exchange_name) do |exchange|
-      exchange.publish(MultiJson.encode(message)) do
+      exchange.publish(MultiJson.encode(message), :headers => headers) do
         deferrable.set_deferred_status :succeeded
       end
     end

data/lib/henchman/worker.rb

@@ -48,6 +48,13 @@ module Henchman
         @message = message
       end
 
+      #
+      # @return [String] the name of the queue the worker of this task listens to.
+      #
+      def queue_name
+        worker.queue_name
+      end
+
       #
       # Call this {::Henchman::Worker::Task}.
       #

data/spec/henchman_spec.rb

@@ -34,6 +34,38 @@ describe Henchman do
       end
     end
 
+    it 'should allow enqueing of headers' do
+      val = rand(1 << 32)
+      found = nil
+      deferrable = EM::DefaultDeferrable.new
+      Henchman::Worker.new("test.queue") do
+        if headers.header[:headers]["val"] == val
+          found = val
+          deferrable.set_deferred_status :succeeded
+        end
+        nil
+      end.consume!
+      Henchman.enqueue("test.queue", {}, {:val => val})
+      EM::Synchrony.sync deferrable
+      found.should == val
+    end
+
+    it 'should allow publishing of headers' do
+      val = rand(1 << 32)
+      found = nil
+      deferrable = EM::DefaultDeferrable.new
+      Henchman::Worker.new("test.receiver") do
+        if headers.header[:headers]["val"] == val
+          found = val
+          deferrable.set_deferred_status :succeeded
+        end
+        nil
+      end.subscribe!
+      Henchman.publish("test.receiver", {}, {:val => val})
+      EM::Synchrony.sync deferrable
+      found.should == val
+    end
+
     it 'should consume jobs' do
       val = rand(1 << 32)
       found = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: henchman
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70283255941400 !ruby/object:Gem::Requirement
+  requirement: &70232597137660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283255941400
+  version_requirements: *70232597137660
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70283255940920 !ruby/object:Gem::Requirement
+  requirement: &70232597137180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283255940920
+  version_requirements: *70232597137180
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70283255940460 !ruby/object:Gem::Requirement
+  requirement: &70232597136720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283255940460
+  version_requirements: *70232597136720
 description: A maximally simple amqp wrapper
 email:
 - martin@oort.se