ElmerFudd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c77507d5550d32879e421a33c9c667eceed1bb5
-  data.tar.gz: 7016a77b2fd57fd16f022fd27867e2d68543f93c
+  metadata.gz: 6fc3cc1a95abd4ab256ec11a4ac3926ee326ee19
+  data.tar.gz: d9932a4afdfe4d8e1565c7db8960a9bd491af4c2
 SHA512:
-  metadata.gz: e5e12979ea5778ac402d96698f5d5b73b116fabfc6c840a6ada53efdd2bfd8fed60283abd24a2de0d6c48b2516c897e1d360f93bf581c53cc05dea2a762298a2
-  data.tar.gz: 7cfede537d36e38d866ca688d8c987327ccaf5765bf859e2078e68f69a732e5af8f7b5d7faa0282c3d9bfe7bd018522522852412e239ae533ec7efb123bf0ae7
+  metadata.gz: 1f555023cf6f2bd03d2f6fcb707247bceaa32f6e9be4e47d8fe51692d3c941884613b248e06b2386cd3b8d7312b6b887f41a1bf20ef7453c980d682c08db62e6
+  data.tar.gz: eb6ca5e463ffc71e9cecbd549c9a4a8d769f52206e7f06bc22de08f432d8f9cebcd6b1d79ecfbbb44e7a47718fcd83c625d07a25e5310fae7148154c09af5da5

data/lib/ElmerFudd/version.rb

@@ -1,3 +1,3 @@
 module ElmerFudd
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/ElmerFudd/worker.rb

@@ -7,6 +7,10 @@ module ElmerFudd
     class << self
       attr_writer :durable_queues
       def durable_queues; @durable_queues.nil? ? true : @durable_queues; end
+
+      # When set to true, every handler will receive a separate channel
+      attr_writer :single_channel
+      def single_channel; @single_channel.nil? ? true : @single_channel; end
     end
 
     def self.handlers
@@ -91,18 +95,23 @@ module ElmerFudd
     end
 
     def env
-      @env ||= Env.new(channel, @logger, self.class)
+      self.class.single_channel ? @env ||= new_env : new_env
+    end
+
+    def new_env
+      Env.new(new_channel, @logger, self.class)
     end
 
     def connection
       @connection.tap { |c| c.start unless c.connected? }
     end
 
-    def channel
-      @channel ||= connection.create_channel
-      @channel.recover_cancelled_consumers!
-      @channel.tap do |c|
-        c.prefetch(@concurrency)
+    def new_channel
+      connection.create_channel.tap do |channel|
+        channel.recover_cancelled_consumers!
+        channel.tap do |c|
+          c.prefetch(@concurrency)
+        end
       end
     end
   end

data/test/smoke/cast_test.rb

@@ -27,7 +27,7 @@ class CastTest < MiniTest::Test
     @publisher.cast TEST_QUEUE, message: "hello"
 
     Timeout.timeout(0.5) do
-      assert "hello", $responses.pop
+      assert_equal "hello", $responses.pop
     end
   end
 
@@ -45,7 +45,7 @@ class CastTest < MiniTest::Test
     @publisher.cast TEST_QUEUE, message: "hello2"
 
     Timeout.timeout(0.5) do
-      assert "hello2", $responses.pop
+      assert_equal "hello2", $responses.pop
     end
   end
 

data/test/smoke/single_channel_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class SingleChannelTest < MiniTest::Test
+  include RabbitHelper
+  TEST_QUEUE = "test.ElmerFudd.cast"
+  TEST_QUEUE_2 = "test.ElmerFudd.cast"
+
+  class TestWorker < ElmerFudd::Worker
+    default_filters ElmerFudd::JsonFilter
+    self.single_channel = false
+
+    handle_cast(Route(TEST_QUEUE)) do |_env, message|
+      if delay = message.payload["delay"]
+        sleep delay
+      end
+
+      $responses << message.payload["message"]
+    end
+
+    handle_cast(Route(TEST_QUEUE_2)) do |_env, message|
+      if delay = message.payload["delay"]
+        sleep delay
+      end
+
+      $responses << message.payload["message"]
+    end
+  end
+
+  def teardown
+    remove_queue TEST_QUEUE
+    remove_queue TEST_QUEUE_2
+    super
+  end
+
+  def test_basic_cast
+    start_worker TestWorker
+    @publisher.cast TEST_QUEUE, message: "hello1", delay: 0.9
+    @publisher.cast TEST_QUEUE_2, message: "hello2", delay: 0.9
+
+    Timeout.timeout(1) do
+      assert_equal %w(hello1 hello2), [$responses.pop, $responses.pop].sort
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ElmerFudd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrzej Sliwa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -121,6 +121,7 @@ files:
 - test/smoke/cast_test.rb
 - test/smoke/event_test.rb
 - test/smoke/external_handlers_test.rb
+- test/smoke/single_channel_test.rb
 - test/test_helper.rb
 - test/unit/benchmark_filter_test.rb
 homepage: https://github.com/bonusboxme/ElmerFudd
@@ -152,5 +153,6 @@ test_files:
 - test/smoke/cast_test.rb
 - test/smoke/event_test.rb
 - test/smoke/external_handlers_test.rb
+- test/smoke/single_channel_test.rb
 - test/test_helper.rb
 - test/unit/benchmark_filter_test.rb