roger_rabbit 0.0.1 → 0.0.2

data/README

@@ -1,29 +1,22 @@
-require 'rubygems'
-require 'test/unit'
 require 'roger_rabbit'
 
-class TestRogerRabbit < Test::Unit::TestCase
 
-  # You should have rabbitmq installed and running.
-  def test_it
-    queue_name = "test"
-    2.times do
-      RogerRabbit.publish queue_name, :joe => 'cool'
-    end
+RogerRabbit.publish "queue-name", :joe => "cool"
 
-    count = 0
+RogerRabbit.consume "queue-name" do |msg|
+  # msg is { :joe => "cool" }
+end
+
+RogerRabbit.rpc_listen("another-queue") do |args|
+  args.merge({:true => true})
+end
+  
+# RPC with result directly returned
+result = RogerRabbit.rpc_message("another-queue", :joe => "cool")
+# result is { :joe => "cool", :true => "true" }
 
-    # RogerRabbit.consume will loop forever, so we're
-    # going to break out of it with a Timeout.
-    assert_raises(Timeout::Error) do
-      Timeout.timeout(0.05) do
-        RogerRabbit.consume queue_name do |args|
-          assert_equal({ "joe" => 'cool' }, args)
-          count += 1
-        end
-      end
-    end
 
-    assert_equal 2, count, "we should have consumed 2 messages"
-  end
+# RPC with result returned in a block
+RogerRabbit.rpc_message("another-queue", :joe => "cool") do |result|
+  # result is { :joe => "cool", :true => "true" }
 end

data/lib/roger_rabbit.rb

@@ -2,33 +2,84 @@ require 'bunny'
 require 'json'
 require 'active_support/hash_with_indifferent_access'
 
+# WARNING: I don't understand yet how rabbitmq works
+# This probably doesn't work at all.
 module RogerRabbit
   def self.bunny
-    if ! @bunny
-      @bunny = Bunny.new
-      @bunny.start
-      @bunny.qos
+    if ! Thread.current[:bunny]
+      Thread.current[:bunny] = Bunny.new
+      Thread.current[:bunny].start
+      Thread.current[:bunny].qos
     end
-    @bunny
+    Thread.current[:bunny]
   end
 
   def self.bunny_queue queue_name
-    @queues ||= {}
-    @queues[queue_name] ||= bunny.queue(queue_name)
+    Thread.current[:queues] = {}
+    Thread.current[:queues][:queue_name] ||= bunny.queue(queue_name)
+  end
+
+  # WARNING: I don't understand yet how RPC works in
+  # rabbitmq.  Need to do more research. This probably
+  # doesn't really work.
+  def self.rpc_listen queue_name, &block
+    # Exchange definition
+    bunny.exchange('reply', :type => :direct)
+    bunny.exchange('out',   :type => :direct)
+
+    bunny.queue('rpc').bind('out')
+
+    # Publish!
+    bunny.queue('rpc').subscribe(:header => true) do |msg|
+      result = block.call(deserialize(msg))
+      bunny.exchange('reply').publish(serialize(result), :key => msg[:header].reply_to)
+    end
+  end
+
+  # WARNING: I don't understand yet how RPC works in
+  # rabbitmq.  Need to do more research. This probably
+  # doesn't really work.
+  def self.rpc_message queue_name, hash, &block
+    # Exchange definition
+    bunny.exchange('reply', :type => :direct)
+    bunny.exchange('out',   :type => :direct)
+
+    # Create the temporary queue and bind it
+    reply = bunny.queue
+    reply.bind('reply', :key => reply.name)
+
+    # Publish!
+    bunny.exchange('out').publish(serialize(hash), :reply_to => reply.name)
+
+    reply.subscribe do |msg|
+      msg = deserialize(msg)
+      yield msg if block_given?
+      reply.unsubscribe
+      return msg
+    end
   end
 
   def self.consume queue_name, &block
     bunny_queue(queue_name).subscribe(:ack => true) do |msg|
       begin
-        yield ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(msg[:payload]))
+        yield deserialize(msg)
       rescue JSON::ParserError => e
         puts e.message
       end
     end
   end
 
-  def self.publish queue_name, args
-    args = args.to_json
-    bunny_queue(queue_name).publish(args)
+  def self.publish queue_name, hash
+    bunny_queue(queue_name).publish(serialize(hash))
+  end
+
+  private
+
+  def self.serialize hash
+    hash.to_json
+  end
+
+  def self.deserialize hash
+    ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(hash[:payload]))
   end
 end

data/lib/roger_rabbit/version.rb

@@ -1,3 +1,3 @@
 module RogerRabbit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_roger_rabbit.rb

@@ -2,10 +2,10 @@ require 'rubygems'
 require 'test/unit'
 require 'roger_rabbit'
 
+# You should have rabbitmq installed and running.
 class TestRogerRabbit < Test::Unit::TestCase
 
-  # You should have rabbitmq installed and running.
-  def test_it
+  def test_publish_consume
     queue_name = "test"
     2.times do
       RogerRabbit.publish queue_name, :joe => 'cool'
@@ -27,4 +27,34 @@ class TestRogerRabbit < Test::Unit::TestCase
 
     assert_equal 2, count, "we should have consumed 2 messages"
   end
+
+  def test_rpc
+    queue_name = "rpc"
+
+    t = Thread.new do
+      RogerRabbit.rpc_listen(queue_name) do |args|
+        result = {}
+        args.each do |key, value|
+          result[key] = "#{value}est"
+        end
+        result
+      end
+    end
+
+    count = 0
+
+    # With block
+    RogerRabbit.rpc_message(queue_name, :joe => 'cool') do |result|
+      assert_equal({"joe" => "coolest"}, result)
+      count += 1
+    end
+
+    # Without block
+    result = RogerRabbit.rpc_message(queue_name, :joe => 'cool')
+    assert_equal({"joe" => "coolest"}, result)
+    count += 1
+
+    sleep 0.1 # Wait for thread to finish
+    assert_equal 2, count
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: roger_rabbit
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joe Van Dyk