action_subscriber 1.6.0 → 1.7.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d313afcc25cfffc3977ac51fd000454a5203a302
-  data.tar.gz: 6e6b1cef5a1431f8d8b3d1e2f4dc6e11797f21c7
+  metadata.gz: 06d750a3ce695babe3b26f24e06284e0461d0654
+  data.tar.gz: abdfb7fa508022788480938484238e044cd5b159
 SHA512:
-  metadata.gz: 83dba20046583695e060cba67c22cb85effe54a649973d9d08716a25964497214a1496e8f0f7f23f9ed805f999c18ba212dfa1d3551201032eff06f03a9c5d4e
-  data.tar.gz: 54e4e53b941c3d2f8f7e86e79d24cf0d53bee320161a812f9bf7e501e392277ee900270e3da495c2ab914d288e54abfd086c5383903ba85dfe48631b77ad11e6
+  metadata.gz: 75831f62c6cc6652a8e4e99b4716af452e6dbe371bdb4c7057b5bca1c0fe4165a668db899205a79c622b5b7060abc07380951b3192d8f36894fc6099717c99d1
+  data.tar.gz: e55a1dcd87c163f673819bb3aeb670c561023f493e7c6e0ad527a418ca4a6cfb52ae700765830c5ba313fb6cdda593cacab2b5d3be6a692e8755f6cb6db36f9b

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
  - 2.1
  - 2.2
  - jruby-1.7
- - jruby-9.0.1.0
+ - jruby-9.0.4.0
  - jruby-head
  - rbx-2
 services:

data/bin/action_subscriber

@@ -26,10 +26,10 @@ module ActionSubscriber
       require options[:app]
 
       $0 = "Action Subscriber server #{object_id}"
-      puts "Loading configuration..."
+      ::ActionSubscriber.logger.info "Loading configuration..."
 
       ::ActionSubscriber::Configuration.configure_from_yaml_and_cli(options)
-      puts "Starting server..."
+      ::ActionSubscriber.logger.info "Starting server..."
 
       case ::ActionSubscriber.configuration.mode
       when /pop/i then

data/lib/action_subscriber.rb

@@ -14,6 +14,7 @@ require "action_subscriber/version"
 require "action_subscriber/default_routing"
 require "action_subscriber/dsl"
 require "action_subscriber/configuration"
+require "action_subscriber/logging"
 require "action_subscriber/message_retry"
 require "action_subscriber/middleware"
 require "action_subscriber/rabbit_connection"
@@ -61,15 +62,19 @@ module ActionSubscriber
     @route_set = RouteSet.new(routes)
   end
 
+  def self.logger
+    ::ActionSubscriber::Logging.logger
+  end
+
   def self.print_subscriptions
-    puts configuration.inspect
+    logger.info configuration.inspect
     route_set.routes.group_by(&:subscriber).each do |subscriber, routes|
-      puts subscriber.name
+      logger.info subscriber.name
       routes.each do |route|
-        puts "  -- method: #{route.action}"
-        puts "    --    exchange: #{route.exchange}"
-        puts "    --       queue: #{route.queue}"
-        puts "    -- routing_key: #{route.routing_key}"
+        logger.info "  -- method: #{route.action}"
+        logger.info "    --    exchange: #{route.exchange}"
+        logger.info "    --       queue: #{route.queue}"
+        logger.info "    -- routing_key: #{route.routing_key}"
       end
     end
   end
@@ -112,7 +117,7 @@ module ActionSubscriber
   #
   def self.route_set
     @route_set ||= begin
-      puts "DEPRECATION WARNING: We are inferring your routes by looking at your subscribers. This behavior is deprecated and will be removed in version 2.0. Please see the routing guide at https://github.com/mxenabled/action_subscriber/blob/master/routing.md"
+      logger.warn "DEPRECATION WARNING: We are inferring your routes by looking at your subscribers. This behavior is deprecated and will be removed in version 2.0. Please see the routing guide at https://github.com/mxenabled/action_subscriber/blob/master/routing.md"
       RouteSet.new(self.send(:default_routes))
     end
   end

data/lib/action_subscriber/babou.rb

@@ -11,11 +11,11 @@ module ActionSubscriber
       sleep_time = ::ActionSubscriber.configuration.pop_interval.to_i / 1000.0
 
       ::ActionSubscriber.start_queues
-      puts "\nAction Subscriber is popping messages every #{sleep_time} seconds.\n"
+      logger.info "Action Subscriber is popping messages every #{sleep_time} seconds."
 
       # How often do we want the timer checking for new pops
       # since we included an eager popper we decreased the
-      # default check interval to 100ms
+      # default check interval to 100m
       while true
         ::ActionSubscriber.auto_pop! unless shutting_down?
         sleep sleep_time
@@ -33,7 +33,7 @@ module ActionSubscriber
       load_subscribers unless subscribers_loaded?
 
       ::ActionSubscriber.start_subscribers
-      puts "\nAction Subscriber connected\n"
+      logger.info "Action Subscriber connected"
 
       while true
         sleep 1.0 #just hang around waiting for messages
@@ -68,6 +68,10 @@ module ActionSubscriber
       end
     end
 
+    def self.logger
+      ::ActionSubscriber::Logging.logger
+    end
+
     def self.reload_active_record
       if defined?(::ActiveRecord::Base) && !::ActiveRecord::Base.connected?
         ::ActiveRecord::Base.establish_connection
@@ -82,11 +86,12 @@ module ActionSubscriber
       @shutting_down = true
       ::Thread.new do
         ::ActionSubscriber.stop_subscribers!
-        puts "stopped all subscribers"
+        logger.info "stopped all subscribers"
       end.join
     end
 
     def self.stop_server!
+      # this method is called from within a TRAP context so we can't use the logger
       puts "Stopping server..."
       wait_loops = 0
       ::ActionSubscriber::Babou.stop_receving_messages!

data/lib/action_subscriber/bunny/subscriber.rb

@@ -1,6 +1,8 @@
 module ActionSubscriber
   module Bunny
     module Subscriber
+      include ::ActionSubscriber::Logging
+
       def bunny_consumers
         @bunny_consumers ||= []
       end
@@ -29,7 +31,7 @@ module ActionSubscriber
               :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(route.subscriber, encoded_payload, properties)
-            enqueue_env(env)
+            enqueue_env(route.threadpool, env)
           end
         end
       end
@@ -52,7 +54,7 @@ module ActionSubscriber
               :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(route.subscriber, encoded_payload, properties)
-            enqueue_env(env)
+            enqueue_env(route.threadpool, env)
           end
           bunny_consumers << consumer
           queue.subscribe_with(consumer)
@@ -61,8 +63,9 @@ module ActionSubscriber
 
       private
 
-      def enqueue_env(env)
-        ::ActionSubscriber::Threadpool.pool.async(env) do |env|
+      def enqueue_env(threadpool, env)
+        logger.info "RECEIVED #{env.message_id} from #{env.queue}"
+        threadpool.async(env) do |env|
           ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key do
             ::ActionSubscriber.config.middleware.call(env)
           end

data/lib/action_subscriber/logging.rb

@@ -0,0 +1,27 @@
+# Taken from https://github.com/mperham/sidekiq/blob/7f882787e53d234042ff18099241403300a47585/lib/sidekiq/logging.rb
+require 'time'
+require 'logger'
+
+module ActionSubscriber
+  module Logging
+    def self.initialize_logger(log_target = STDOUT)
+      oldlogger = defined?(@logger) ? @logger : nil
+      @logger = Logger.new(log_target)
+      @logger.level = Logger::INFO
+      oldlogger.close if oldlogger && !$TESTING # don't want to close testing's STDOUT logging
+      @logger
+    end
+
+    def self.logger
+      defined?(@logger) ? @logger : initialize_logger
+    end
+
+    def self.logger=(log)
+      @logger = (log ? log : Logger.new('/dev/null'))
+    end
+
+    def logger
+      ::ActionSubscriber::Logging.logger
+    end
+  end
+end

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -1,6 +1,8 @@
 module ActionSubscriber
   module MarchHare
     module Subscriber
+      include ::ActionSubscriber::Logging
+
       def cancel_consumers!
         march_hare_consumers.each(&:cancel)
       end
@@ -25,7 +27,7 @@ module ActionSubscriber
               :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(route.subscriber, encoded_payload, properties)
-            enqueue_env(env)
+            enqueue_env(route.threadpool, env)
           end
         end
 
@@ -49,7 +51,7 @@ module ActionSubscriber
               :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(route.subscriber, encoded_payload, properties)
-            enqueue_env(env)
+            enqueue_env(route.threadpool, env)
           end
 
           march_hare_consumers << consumer
@@ -62,8 +64,9 @@ module ActionSubscriber
 
       private
 
-      def enqueue_env(env)
-        ::ActionSubscriber::Threadpool.pool.async(env) do |env|
+      def enqueue_env(threadpool, env)
+        logger.info "RECEIVED #{env.message_id} from #{env.queue}"
+        threadpool.async(env) do |env|
           ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key do
             ::ActionSubscriber.config.middleware.call(env)
           end

data/lib/action_subscriber/middleware/env.rb

@@ -30,7 +30,7 @@ module ActionSubscriber
         @encoded_payload = encoded_payload
         @exchange = properties.fetch(:exchange)
         @headers = properties.fetch(:headers) || {}
-        @message_id = properties.fetch(:message_id)
+        @message_id = properties.fetch(:message_id) || ::Random.new.bytes(3).unpack("H*")[0]
         @queue = properties.fetch(:queue)
         @routing_key = properties.fetch(:routing_key)
         @subscriber = subscriber

data/lib/action_subscriber/middleware/error_handler.rb

@@ -1,6 +1,8 @@
 module ActionSubscriber
   module Middleware
     class ErrorHandler
+      include ::ActionSubscriber::Logging
+
       def initialize(app)
         @app = app
       end
@@ -8,6 +10,7 @@ module ActionSubscriber
       def call(env)
         @app.call(env)
       rescue => error
+        logger.error "FAILED #{env.message_id}"
         ::ActionSubscriber.configuration.error_handler.call(error, env.to_h)
       end
     end

data/lib/action_subscriber/middleware/router.rb

@@ -1,12 +1,16 @@
 module ActionSubscriber
   module Middleware
     class Router
+      include ::ActionSubscriber::Logging
+
       def initialize(app)
         @app = app
       end
 
       def call(env)
+        logger.info "START #{env.message_id} #{env.subscriber}##{env.action}"
         env.subscriber.run_action_with_filters(env, env.action)
+        logger.info "FINISHED #{env.message_id}"
       end
     end
   end

data/lib/action_subscriber/route.rb

@@ -4,18 +4,20 @@ module ActionSubscriber
                 :action,
                 :exchange,
                 :prefetch,
+                :queue,
                 :routing_key,
                 :subscriber,
-                :queue
+                :threadpool
 
     def initialize(attributes)
       @acknowledgements = attributes.fetch(:acknowledgements)
       @action = attributes.fetch(:action)
       @exchange = attributes.fetch(:exchange).to_s
       @prefetch = attributes.fetch(:prefetch) { ::ActionSubscriber.config.prefetch }
+      @queue = attributes.fetch(:queue)
       @routing_key = attributes.fetch(:routing_key)
       @subscriber = attributes.fetch(:subscriber)
-      @queue = attributes.fetch(:queue)
+      @threadpool = attributes.fetch(:threadpool) { ::ActionSubscriber::Threadpool.pool(:default) }
     end
 
     def acknowledgements?

data/lib/action_subscriber/threadpool.rb

@@ -4,17 +4,29 @@ module ActionSubscriber
     # Class Methods
     #
     def self.busy?
-      (pool.pool_size == pool.busy_size)
+      pools.any? do |_pool_name, pool|
+        pool.pool_size == pool.busy_size
+      end
     end
 
-    def self.perform_async(*args)
-      self.pool.async.perform(*args)
+    def self.new_pool(name, pool_size = nil)
+      fail ArgumentError, "#{name} already exists as a threadpool" if pools.key?(name)
+      pool_size ||= ::ActionSubscriber.config.threadpool_size
+      pools[name] = ::Lifeguard::InfiniteThreadpool.new(
+        :pool_size => pool_size
+      )
     end
 
-    def self.pool
-      @pool ||= ::Lifeguard::InfiniteThreadpool.new(
-        :pool_size => ::ActionSubscriber.config.threadpool_size
-      )
+    def self.pool(which_pool = :default)
+      pools[which_pool]
+    end
+
+    def self.pools
+      @pools ||= {
+        :default => ::Lifeguard::InfiniteThreadpool.new(
+          :pool_size => ::ActionSubscriber.config.threadpool_size
+        )
+      }
     end
 
     def self.ready?
@@ -22,8 +34,9 @@ module ActionSubscriber
     end
 
     def self.ready_size
-      ready_size = pool.pool_size - pool.busy_size
-      return ready_size >= 0 ? ready_size : 0
+      pools.inject(0) do |total_ready, (_pool_name, pool)|
+        total_ready + [0, pool.pool_size - pool.busy_size].max
+      end
     end
   end
 end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.6.0"
+  VERSION = "1.7.0.pre0"
 end

data/spec/integration/around_filters_spec.rb

@@ -22,15 +22,17 @@ class InstaSubscriber < ActionSubscriber::Base
 end
 
 describe "subscriber filters", :integration => true do
-  let(:connection) { subscriber.connection }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for InstaSubscriber
+    end
+  end
   let(:subscriber) { InstaSubscriber }
 
   it "runs multiple around filters" do
     $messages = []  #testing the order of things
     ::ActionSubscriber.auto_subscribe!
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish("hEY Guyz!", :routing_key => "insta.first")
+    ::ActionSubscriber::Publisher.publish("insta.first", "hEY Guyz!", "events")
 
     verify_expectation_within(1.0) do
       expect($messages).to eq [:whisper_before, :yell_before, "hEY Guyz!", :yell_after, :whisper_after]

data/spec/integration/at_least_once_spec.rb

@@ -8,14 +8,16 @@ class GorbyPuffSubscriber < ActionSubscriber::Base
 end
 
 describe "at_least_once! mode", :integration => true do
-  let(:connection) { subscriber.connection }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for GorbyPuffSubscriber
+    end
+  end
   let(:subscriber) { GorbyPuffSubscriber }
 
   it "retries a failed job until it succeeds" do
     ::ActionSubscriber.auto_subscribe!
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish("GrumpFace", :routing_key => "gorby_puff.grumpy")
+    ::ActionSubscriber::Publisher.publish("gorby_puff.grumpy", "GrumpFace", "events")
 
     verify_expectation_within(2.0) do
       expect($messages).to eq Set.new(["GrumpFace::0","GrumpFace::1","GrumpFace::2"])

data/spec/integration/at_most_once_spec.rb

@@ -8,14 +8,16 @@ class PokemonSubscriber < ActionSubscriber::Base
 end
 
 describe "at_most_once! mode", :integration => true do
-  let(:connection) { subscriber.connection }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for PokemonSubscriber
+    end
+  end
   let(:subscriber) { PokemonSubscriber }
 
   it "does not retry a failed message" do
     ::ActionSubscriber.auto_subscribe!
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish("All Pokemon have been caught", :routing_key => "pokemon.caught_em_all")
+    ::ActionSubscriber::Publisher.publish("pokemon.caught_em_all", "All Pokemon have been caught", "events")
 
     verify_expectation_within(1.0) do
       expect($messages.size).to eq 1

data/spec/integration/automatic_reconnect_spec.rb

@@ -8,14 +8,17 @@ end
 
 describe "Automatically reconnect on connection failure", :integration => true, :slow => true do
   let(:connection) { subscriber.connection }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for GusSubscriber
+    end
+  end
   let(:http_client) { RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
   let(:subscriber) { GusSubscriber }
 
   it "reconnects when a connection drops" do
     ::ActionSubscriber::auto_subscribe!
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish("First", :routing_key => "gus.spoke")
+    ::ActionSubscriber::Publisher.publish("gus.spoke", "First", "events")
     verify_expectation_within(5.0) do
       expect($messages).to eq(Set.new(["First"]))
     end
@@ -26,9 +29,7 @@ describe "Automatically reconnect on connection failure", :integration => true,
       expect(connection).to be_open
     end
 
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish("Second", :routing_key => "gus.spoke")
+    ::ActionSubscriber::Publisher.publish("gus.spoke", "Second", "events")
     verify_expectation_within(5.0) do
       expect($messages).to eq(Set.new(["First", "Second"]))
     end

data/spec/integration/basic_subscriber_spec.rb

@@ -1,32 +1,23 @@
 class BasicPushSubscriber < ActionSubscriber::Base
-  publisher :greg
-
-  # queue => alice.greg.basic_push.booked
-  # routing_key => greg.basic_push.booked
   def booked
     $messages << payload
   end
-
-  queue_for :cancelled, "basic.cancelled"
-  routing_key_for :cancelled, "basic.cancelled"
-
-  def cancelled
-    $messages << payload
-  end
 end
 
 describe "A Basic Subscriber", :integration => true do
-  let(:connection) { subscriber.connection }
-  let(:subscriber) { BasicPushSubscriber }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      route ::BasicPushSubscriber, :booked
+    end
+  end
 
   context "ActionSubscriber.auto_pop!" do
     it "routes messages to the right place" do
-      ::ActionSubscriber::Publisher.publish("greg.basic_push.booked", "Ohai Booked", "events")
-      ::ActionSubscriber::Publisher.publish("basic.cancelled", "Ohai Cancelled", "events")
+      ::ActionSubscriber::Publisher.publish("basic_push.booked", "Ohai Booked", "events")
 
       verify_expectation_within(2.0) do
         ::ActionSubscriber.auto_pop!
-        expect($messages).to eq(Set.new(["Ohai Booked", "Ohai Cancelled"]))
+        expect($messages).to eq(Set.new(["Ohai Booked"]))
       end
     end
   end
@@ -34,13 +25,10 @@ describe "A Basic Subscriber", :integration => true do
   context "ActionSubscriber.auto_subscribe!" do
     it "routes messages to the right place" do
       ::ActionSubscriber.auto_subscribe!
-      channel = connection.create_channel
-      exchange = channel.topic("events")
-      exchange.publish("Ohai Booked", :routing_key => "greg.basic_push.booked")
-      exchange.publish("Ohai Cancelled", :routing_key => "basic.cancelled")
+      ::ActionSubscriber::Publisher.publish("basic_push.booked", "Ohai Booked", "events")
 
       verify_expectation_within(2.0) do
-        expect($messages).to eq(Set.new(["Ohai Booked", "Ohai Cancelled"]))
+        expect($messages).to eq(Set.new(["Ohai Booked"]))
       end
     end
   end

data/spec/integration/custom_headers_spec.rb

@@ -7,6 +7,11 @@ class PrankSubscriber < ActionSubscriber::Base
 end
 
 describe "Custom Headers Are Published and Received", :integration => true do
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for PrankSubscriber
+    end
+  end
   let(:headers) { { "Custom" => "content/header" } }
 
   it "works for auto_pop!" do

data/spec/integration/decoding_payloads_spec.rb

@@ -10,14 +10,17 @@ end
 
 describe "Payload Decoding", :integration => true do
   let(:connection) { subscriber.connection }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for TwitterSubscriber
+    end
+  end
   let(:subscriber) { TwitterSubscriber }
   let(:json_string) { '{"foo": "bar"}' }
 
   it "decodes json by default" do
     ::ActionSubscriber.auto_subscribe!
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish(json_string, :routing_key => "twitter.tweet", :content_type => "application/json")
+    ::ActionSubscriber::Publisher.publish("twitter.tweet", json_string, "events", :content_type => "application/json")
 
     verify_expectation_within(2.0) do
       expect($messages).to eq Set.new([{
@@ -35,9 +38,7 @@ describe "Payload Decoding", :integration => true do
 
     it "it decodes the payload using the custom decoder" do
       ::ActionSubscriber.auto_subscribe!
-      channel = connection.create_channel
-      exchange = channel.topic("events")
-      exchange.publish(json_string, :routing_key => "twitter.tweet", :content_type => content_type)
+      ::ActionSubscriber::Publisher.publish("twitter.tweet", json_string, "events", :content_type => content_type)
 
       verify_expectation_within(2.0) do
         expect($messages).to eq Set.new([{

data/spec/integration/inferred_routes_spec.rb

@@ -0,0 +1,46 @@
+class InferenceSubscriber < ActionSubscriber::Base
+  publisher :kyle
+
+  def yo
+    $messages << payload
+  end
+
+  queue_for :hey, "some_other_queue.hey"
+  routing_key_for :hey, "other_routing_key.hey"
+  def hey
+    $messages << payload
+  end
+end
+
+describe "A Subscriber With Inferred Routes", :integration => true do
+  context "explicit routing with default_routes_for helper" do
+    let(:draw_routes) do
+      ::ActionSubscriber.draw_routes do
+        default_routes_for InferenceSubscriber
+      end
+    end
+
+    it "registers the routes and sets up the queues" do
+      ::ActionSubscriber.auto_subscribe!
+      ::ActionSubscriber::Publisher.publish("kyle.inference.yo", "YO", "events")
+      ::ActionSubscriber::Publisher.publish("other_routing_key.hey", "HEY", "events")
+
+      verify_expectation_within(2.0) do
+        expect($messages).to eq(Set.new(["YO","HEY"]))
+      end
+    end
+  end
+
+  # This is the deprecated behavior we want to keep until version 2.0
+  context "no explicit routes" do
+    it "registers the routes and sets up the queues" do
+      ::ActionSubscriber.auto_subscribe!
+      ::ActionSubscriber::Publisher.publish("kyle.inference.yo", "YO", "events")
+      ::ActionSubscriber::Publisher.publish("other_routing_key.hey", "HEY", "events")
+
+      verify_expectation_within(2.0) do
+        expect($messages).to eq(Set.new(["YO","HEY"]))
+      end
+    end
+  end
+end

data/spec/integration/manual_acknowledgement_spec.rb

@@ -13,13 +13,16 @@ end
 
 describe "Manual Message Acknowledgment", :integration => true do
   let(:connection) { subscriber.connection }
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for BaconSubscriber
+    end
+  end
   let(:subscriber) { BaconSubscriber }
 
   it "retries rejected messages and stops retrying acknowledged messages" do
     ::ActionSubscriber.auto_subscribe!
-    channel = connection.create_channel
-    exchange = channel.topic("events")
-    exchange.publish("BACON!", :routing_key => "bacon.served")
+    ::ActionSubscriber::Publisher.publish("bacon.served", "BACON!", "events")
 
     verify_expectation_within(2.0) do
       expect($messages).to eq(Set.new(["BACON!::0", "BACON!::1", "BACON!::2"]))

data/spec/integration/multiple_threadpools_spec.rb

@@ -0,0 +1,29 @@
+class DifferentThreadpoolsSubscriber < ActionSubscriber::Base
+  def one
+    $messages << payload
+  end
+
+  def two
+    $messages << payload
+  end
+end
+
+describe "Separate Threadpools for Different Message", :integration => true do
+  let(:draw_routes) do
+    low_priority_threadpool = ::ActionSubscriber::Threadpool.new_pool(:low_priority, 1)
+    ::ActionSubscriber.draw_routes do
+      route DifferentThreadpoolsSubscriber, :one
+      route DifferentThreadpoolsSubscriber, :two, :threadpool => low_priority_threadpool
+    end
+  end
+
+  it "processes messages in separate threadpools based on the routes" do
+    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber::Publisher.publish("different_threadpools.one", "ONE", "events")
+    ::ActionSubscriber::Publisher.publish("different_threadpools.two", "TWO", "events")
+
+    verify_expectation_within(2.0) do
+      expect($messages).to eq(Set.new(["ONE","TWO"]))
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ RSpec.configure do |config|
 
   config.before(:each, :integration => true) do
     $messages = Set.new
+    draw_routes if respond_to?(:draw_routes)
     ::ActionSubscriber::RabbitConnection.subscriber_connection
     ::ActionSubscriber.setup_queues!
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0.pre0
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,6 +202,7 @@ files:
 - lib/action_subscriber/configuration.rb
 - lib/action_subscriber/default_routing.rb
 - lib/action_subscriber/dsl.rb
+- lib/action_subscriber/logging.rb
 - lib/action_subscriber/march_hare/subscriber.rb
 - lib/action_subscriber/message_retry.rb
 - lib/action_subscriber/middleware.rb
@@ -230,7 +231,9 @@ files:
 - spec/integration/basic_subscriber_spec.rb
 - spec/integration/custom_headers_spec.rb
 - spec/integration/decoding_payloads_spec.rb
+- spec/integration/inferred_routes_spec.rb
 - spec/integration/manual_acknowledgement_spec.rb
+- spec/integration/multiple_threadpools_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
 - spec/lib/action_subscriber/configuration_spec.rb
 - spec/lib/action_subscriber/dsl_spec.rb
@@ -262,12 +265,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from
@@ -280,7 +283,9 @@ test_files:
 - spec/integration/basic_subscriber_spec.rb
 - spec/integration/custom_headers_spec.rb
 - spec/integration/decoding_payloads_spec.rb
+- spec/integration/inferred_routes_spec.rb
 - spec/integration/manual_acknowledgement_spec.rb
+- spec/integration/multiple_threadpools_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
 - spec/lib/action_subscriber/configuration_spec.rb
 - spec/lib/action_subscriber/dsl_spec.rb