action_subscriber 2.5.0.pre2 → 3.0.0.pre1

data/spec/integration/basic_subscriber_spec.rb

@@ -13,7 +13,7 @@ describe "A Basic Subscriber", :integration => true do
 
   context "ActionSubscriber.auto_pop!" do
     it "routes messages to the right place" do
-      ::ActionSubscriber::Publisher.publish("basic_push.booked", "Ohai Booked", "events")
+      ::ActivePublisher.publish("basic_push.booked", "Ohai Booked", "events")
 
       verify_expectation_within(2.0) do
         ::ActionSubscriber.auto_pop!
@@ -25,7 +25,7 @@ describe "A Basic Subscriber", :integration => true do
   context "ActionSubscriber.auto_subscribe!" do
     it "routes messages to the right place" do
       ::ActionSubscriber.auto_subscribe!
-      ::ActionSubscriber::Publisher.publish("basic_push.booked", "Ohai Booked", "events")
+      ::ActivePublisher.publish("basic_push.booked", "Ohai Booked", "events")
 
       verify_expectation_within(2.0) do
         expect($messages).to eq(Set.new(["Ohai Booked"]))

data/spec/integration/custom_actions_spec.rb

@@ -15,7 +15,7 @@ describe "A subscriber with a custom action", :integration => true do
 
   it "routes the message to the selected action" do
     ::ActionSubscriber.auto_subscribe!
-    ::ActionSubscriber::Publisher.publish("react.javascript_framework", "Another?!?!", "events")
+    ::ActivePublisher.publish("react.javascript_framework", "Another?!?!", "events")
 
     verify_expectation_within(2.0) do
       expect($messages).to eq(Set.new(["Another?!?!"]))

data/spec/integration/custom_headers_spec.rb

@@ -15,7 +15,7 @@ describe "Custom Headers Are Published and Received", :integration => true do
   let(:headers) { { "Custom" => "content/header" } }
 
   it "works for auto_pop!" do
-    ::ActionSubscriber::Publisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
+    ::ActivePublisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
     verify_expectation_within(2.0) do
       ::ActionSubscriber.auto_pop!
       expect($messages).to eq(Set.new([headers]))
@@ -24,7 +24,7 @@ describe "Custom Headers Are Published and Received", :integration => true do
 
   it "works for auto_subscriber!" do
     ::ActionSubscriber.auto_subscribe!
-    ::ActionSubscriber::Publisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
+    ::ActivePublisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
     verify_expectation_within(2.0) do
       expect($messages).to eq(Set.new([headers]))
     end

data/spec/integration/decoding_payloads_spec.rb

@@ -20,7 +20,7 @@ describe "Payload Decoding", :integration => true do
 
   it "decodes json by default" do
     ::ActionSubscriber.auto_subscribe!
-    ::ActionSubscriber::Publisher.publish("twitter.tweet", json_string, "events", :content_type => "application/json")
+    ::ActivePublisher.publish("twitter.tweet", json_string, "events", :content_type => "application/json")
 
     verify_expectation_within(2.0) do
       expect($messages).to eq Set.new([{
@@ -38,7 +38,7 @@ describe "Payload Decoding", :integration => true do
 
     it "it decodes the payload using the custom decoder" do
       ::ActionSubscriber.auto_subscribe!
-      ::ActionSubscriber::Publisher.publish("twitter.tweet", json_string, "events", :content_type => content_type)
+      ::ActivePublisher.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/manual_acknowledgement_spec.rb

@@ -22,7 +22,7 @@ describe "Manual Message Acknowledgment", :integration => true do
 
   it "retries rejected messages and stops retrying acknowledged messages" do
     ::ActionSubscriber.auto_subscribe!
-    ::ActionSubscriber::Publisher.publish("bacon.served", "BACON!", "events")
+    ::ActivePublisher.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_connections_spec.rb

@@ -0,0 +1,36 @@
+class MultipleConnectionsSubscriber < ::ActionSubscriber::Base
+  MUTEX = ::Mutex.new
+  at_least_once!
+
+  def burp
+    MUTEX.synchronize do
+      $messages << payload
+    end
+  end
+end
+
+describe "Separate connections to get multiple threadpools", :integration => true do
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      connection(:background_work, :thread_pool_size => 20) do
+        route MultipleConnectionsSubscriber, :burp,
+          :acknowledgements => true,
+          :concurrency => 20
+      end
+      route MultipleConnectionsSubscriber, :burp,
+          :acknowledgements => true,
+          :concurrency => 8 # match the default threadpool size
+    end
+  end
+
+  it "spreads the load across multiple threadpools and consumer" do
+    ::ActionSubscriber.auto_subscribe!
+    1.upto(10).each do |i|
+      ::ActivePublisher.publish("multiple_connections.burp", "belch#{i}", "events")
+    end
+
+    verify_expectation_within(5.0) do
+      expect($messages).to eq(Set.new(["belch1", "belch2", "belch3", "belch4", "belch5", "belch6", "belch7", "belch8", "belch9", "belch10"]))
+    end
+  end
+end

data/spec/integration/multiple_threadpools_spec.rb

@@ -18,11 +18,11 @@ describe "Separate Threadpools for Different Message", :integration => true do
   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")
+    ::ActivePublisher.publish("different_threadpools.one", "ONE", "events")
+    ::ActivePublisher.publish("different_threadpools.two", "TWO", "events")
 
     verify_expectation_within(2.0) do
+      ::ActionSubscriber.auto_pop!
       expect($messages).to eq(Set.new(["ONE","TWO"]))
     end
   end

data/spec/lib/action_subscriber/configuration_spec.rb

@@ -1,17 +1,13 @@
 describe ::ActionSubscriber::Configuration do
   describe "default values" do
     specify { expect(subject.allow_low_priority_methods).to eq(false) }
-    specify { expect(subject.async_publisher).to eq("memory") }
-    specify { expect(subject.async_publisher_drop_messages_when_queue_full).to eq(false) }
-    specify { expect(subject.async_publisher_max_queue_size).to eq(1_000_000) }
-    specify { expect(subject.async_publisher_supervisor_interval).to eq(200) }
     specify { expect(subject.default_exchange).to eq("events") }
     specify { expect(subject.heartbeat).to eq(5) }
     specify { expect(subject.host).to eq("localhost") }
     specify { expect(subject.mode).to eq('subscribe') }
     specify { expect(subject.pop_interval).to eq(100) }
     specify { expect(subject.port).to eq(5672) }
-    specify { expect(subject.prefetch).to eq(5) }
+    specify { expect(subject.prefetch).to eq(2) }
     specify { expect(subject.seconds_to_wait_for_graceful_shutdown).to eq(30) }
     specify { expect(subject.threadpool_size).to eq(8) }
     specify { expect(subject.timeout).to eq(1) }

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ require 'action_subscriber/rspec'
 # Silence the Logger
 $TESTING = true
 ::ActionSubscriber::Logging.initialize_logger(nil)
+::ActionSubscriber.setup_default_connection!
 
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
@@ -23,14 +24,16 @@ 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!
+    draw_routes
+    ::ActionSubscriber.setup_subscriptions!
   end
   config.after(:each, :integration => true) do
     ::ActionSubscriber.stop_subscribers!
-    ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
     ::ActionSubscriber.instance_variable_set("@route_set", nil)
+    ::ActionSubscriber.instance_variable_set("@route_set_block", nil)
+  end
+  config.after(:suite) do
+    ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre2
+  version: 3.0.0.pre1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,6 +84,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_publisher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -214,9 +228,6 @@ files:
 - lib/action_subscriber/middleware/router.rb
 - lib/action_subscriber/middleware/runner.rb
 - lib/action_subscriber/preload.rb
-- lib/action_subscriber/publisher.rb
-- lib/action_subscriber/publisher/async.rb
-- lib/action_subscriber/publisher/async/in_memory_adapter.rb
 - lib/action_subscriber/rabbit_connection.rb
 - lib/action_subscriber/railtie.rb
 - lib/action_subscriber/route.rb
@@ -224,7 +235,6 @@ files:
 - lib/action_subscriber/router.rb
 - lib/action_subscriber/rspec.rb
 - lib/action_subscriber/subscribable.rb
-- lib/action_subscriber/synchronizer.rb
 - lib/action_subscriber/threadpool.rb
 - lib/action_subscriber/uri.rb
 - lib/action_subscriber/version.rb
@@ -237,8 +247,8 @@ files:
 - spec/integration/custom_actions_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_connections_spec.rb
 - spec/integration/multiple_threadpools_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
 - spec/lib/action_subscriber/configuration_spec.rb
@@ -250,9 +260,6 @@ files:
 - spec/lib/action_subscriber/middleware/error_handler_spec.rb
 - spec/lib/action_subscriber/middleware/router_spec.rb
 - spec/lib/action_subscriber/middleware/runner_spec.rb
-- spec/lib/action_subscriber/publisher/async/in_memory_adapter_spec.rb
-- spec/lib/action_subscriber/publisher/async_spec.rb
-- spec/lib/action_subscriber/publisher_spec.rb
 - spec/lib/action_subscriber/router_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
 - spec/lib/action_subscriber/threadpool_spec.rb
@@ -292,8 +299,8 @@ test_files:
 - spec/integration/custom_actions_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_connections_spec.rb
 - spec/integration/multiple_threadpools_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
 - spec/lib/action_subscriber/configuration_spec.rb
@@ -305,9 +312,6 @@ test_files:
 - spec/lib/action_subscriber/middleware/error_handler_spec.rb
 - spec/lib/action_subscriber/middleware/router_spec.rb
 - spec/lib/action_subscriber/middleware/runner_spec.rb
-- spec/lib/action_subscriber/publisher/async/in_memory_adapter_spec.rb
-- spec/lib/action_subscriber/publisher/async_spec.rb
-- spec/lib/action_subscriber/publisher_spec.rb
 - spec/lib/action_subscriber/router_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
 - spec/lib/action_subscriber/threadpool_spec.rb

data/lib/action_subscriber/publisher/async/in_memory_adapter.rb

@@ -1,153 +0,0 @@
-require "thread"
-
-module ActionSubscriber
-  module Publisher
-    module Async
-      class InMemoryAdapter
-        include ::ActionSubscriber::Logging
-
-        attr_reader :async_queue
-
-        def initialize
-          logger.info "Starting in-memory publisher adapter."
-
-          @async_queue = AsyncQueue.new
-        end
-
-        def publish(route, payload, exchange_name, options = {})
-          message = Message.new(route, payload, exchange_name, options)
-          async_queue.push(message)
-          nil
-        end
-
-        def shutdown!
-          max_wait_time = ::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown
-          started_shutting_down_at = ::Time.now
-
-          logger.info "Draining async publisher in-memory adapter queue before shutdown. Current queue size: #{async_queue.size}."
-          while async_queue.size > 0
-            if (::Time.now - started_shutting_down_at) > max_wait_time
-              logger.info "Forcing async publisher adapter shutdown because graceful shutdown period of #{max_wait_time} seconds was exceeded. Current queue size: #{async_queue.size}."
-              break
-            end
-
-            sleep 0.1
-          end
-        end
-
-        class Message
-          attr_reader :route, :payload, :exchange_name, :options
-
-          def initialize(route, payload, exchange_name, options)
-            @route = route
-            @payload = payload
-            @exchange_name = exchange_name
-            @options = options
-          end
-        end
-
-        class UnableToPersistMessageError < ::StandardError
-        end
-
-        class AsyncQueue
-          include ::ActionSubscriber::Logging
-
-          attr_reader :consumer, :queue, :supervisor
-
-          if ::RUBY_PLATFORM == "java"
-            NETWORK_ERRORS = [::MarchHare::Exception, ::Java::ComRabbitmqClient::AlreadyClosedException, ::Java::JavaIo::IOException].freeze
-          else
-            NETWORK_ERRORS = [::Bunny::Exception, ::Timeout::Error, ::IOError].freeze
-          end
-
-          def initialize
-            @queue = ::Queue.new
-            create_and_supervise_consumer!
-          end
-
-          def push(message)
-            # Default of 1_000_000 messages.
-            if queue.size > ::ActionSubscriber.configuration.async_publisher_max_queue_size
-              # Drop Messages if the queue is full and we were configured to do so.
-              return if ::ActionSubscriber.configuration.async_publisher_drop_messages_when_queue_full
-
-              # By default we will raise an error to push the responsibility onto the caller.
-              fail UnableToPersistMessageError, "Queue is full, messages will be dropped."
-            end
-
-            queue.push(message)
-          end
-
-          def size
-            queue.size
-          end
-
-        private
-
-          def await_network_reconnect
-            sleep ::ActionSubscriber::RabbitConnection::NETWORK_RECOVERY_INTERVAL
-          end
-
-          def create_and_supervise_consumer!
-            @consumer = create_consumer
-            @supervisor = ::Thread.new do
-              loop do
-                unless consumer.alive?
-                  # Why might need to requeue the last message.
-                  queue.push(@current_message) if @current_message.present?
-                  consumer.kill
-                  @consumer = create_consumer
-                end
-
-                # Pause before checking the consumer again.
-                sleep supervisor_interval
-              end
-            end
-          end
-
-          def create_consumer
-            ::Thread.new do
-              loop do
-                # Write "current_message" so we can requeue should something happen to the consumer. I don't love this, but it's
-                # better than writing my own `#peek' method.
-                @current_message = message = queue.pop
-
-                begin
-                  ::ActionSubscriber::Publisher.publish(message.route, message.payload, message.exchange_name, message.options)
-
-                  # Reset
-                  @current_message = nil
-                rescue *NETWORK_ERRORS
-                  # Sleep because the connection is down.
-                  await_network_reconnect
-
-                  # Requeue and try again.
-                  queue.push(message)
-                rescue => unknown_error
-                  # Do not requeue the message because something else horrible happened.
-                  @current_message = nil
-
-                  # Log the error.
-                  logger.info unknown_error.class
-                  logger.info unknown_error.message
-                  logger.info unknown_error.backtrace.join("\n")
-
-                  # TODO: Find a way to bubble this out of the thread for logging purposes.
-                  # Reraise the error out of the publisher loop. The Supervisor will restart the consumer.
-                  raise unknown_error
-                end
-              end
-            end
-          end
-
-          def supervisor_interval
-            @supervisor_interval ||= begin
-              interval_in_milliseconds = ::ActionSubscriber.configuration.async_publisher_supervisor_interval
-              interval_in_milliseconds / 1000.0
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/action_subscriber/publisher/async.rb

@@ -1,31 +0,0 @@
-module ActionSubscriber
-  module Publisher
-    # Publish a message asynchronously to RabbitMQ.
-    #
-    # Asynchronous is designed to do two things:
-    # 1. Introduce the idea of a durable retry should the RabbitMQ connection disconnect.
-    # 2. Provide a higher-level pattern for fire-and-forget publishing.
-    #
-    # @param [String] route The routing key to use for this message.
-    # @param [String] payload The message you are sending. Should already be encoded as a string.
-    # @param [String] exchange The exchange you want to publish to.
-    # @param [Hash] options hash to set message parameters (e.g. headers).
-    def self.publish_async(route, payload, exchange_name, options = {})
-      Async.publisher_adapter.publish(route, payload, exchange_name, options)
-    end
-
-    module Async
-      def self.publisher_adapter
-        @publisher_adapter ||= case ::ActionSubscriber.configuration.async_publisher
-                               when /memory/i then
-                                 require "action_subscriber/publisher/async/in_memory_adapter"
-                                 InMemoryAdapter.new
-                               when /redis/i then
-                                 fail "Not yet implemented"
-                               else
-                                 fail "Unknown adapter '#{::ActionSubscriber.configuration.async_publisher}' provided"
-                               end
-      end
-    end
-  end
-end

data/lib/action_subscriber/publisher.rb

@@ -1,46 +0,0 @@
-module ActionSubscriber
-  module Publisher
-    # Publish a message to RabbitMQ
-    #
-    # @param [String] route The routing key to use for this message.
-    # @param [String] payload The message you are sending. Should already be encoded as a string.
-    # @param [String] exchange The exchange you want to publish to.
-    # @param [Hash] options hash to set message parameters (e.g. headers)
-    def self.publish(route, payload, exchange_name, options = {})
-      with_exchange(exchange_name) do |exchange|
-        exchange.publish(payload, publishing_options(route, options))
-      end
-    end
-
-    def self.with_exchange(exchange_name)
-      connection = RabbitConnection.publisher_connection
-      channel = connection.create_channel
-      begin
-        channel.confirm_select if ActionSubscriber.configuration.publisher_confirms
-        exchange = channel.topic(exchange_name)
-        yield(exchange)
-        channel.wait_for_confirms if ActionSubscriber.configuration.publisher_confirms
-      ensure
-        channel.close rescue nil
-      end
-    end
-
-    def self.publishing_options(route, in_options = {})
-      options = {
-        :mandatory => false,
-        :persistent => false,
-        :routing_key => route,
-      }.merge(in_options)
-
-      if ::RUBY_PLATFORM == "java"
-        java_options = {}
-        java_options[:mandatory]   = options.delete(:mandatory)
-        java_options[:routing_key] = options.delete(:routing_key)
-        java_options[:properties]  = options
-        java_options
-      else
-        options
-      end
-    end
-  end
-end

data/lib/action_subscriber/synchronizer.rb

@@ -1,15 +0,0 @@
-require "thread"
-module ActionSubscriber
-  class Synchronizer
-    def initialize(delegate)
-      @delegate = delegate
-      @mutex = ::Mutex.new
-    end
-
-    def method_missing(name, *args, &block)
-      @mutex.synchronize do
-        @delegate.public_send(name, *args, &block)
-      end
-    end
-  end
-end

data/spec/integration/inferred_routes_spec.rb

@@ -1,53 +0,0 @@
-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
-    before do
-      # TEST HACK: Bust any memoized routes.
-      ::ActionSubscriber.instance_variable_set(:@route_set, nil)
-      ::ActionSubscriber.instance_variable_set(:@draw_routes_block, nil)
-      ::ActionSubscriber.setup_queues!
-    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
-end