action_subscriber 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4e53b712b617695c3fd68102e7990d72af09ff
-  data.tar.gz: 7cf9d5f4916f076cfdc864ec9598b147c22d91f9
+  metadata.gz: fa7ffc8e113cf3414e95bd9ff2f4271716316da3
+  data.tar.gz: bb9f4b158454c734e75484f8d3fb722ea9817b3d
 SHA512:
-  metadata.gz: d087f075d3a1f55742535dc39fd835f342593356858899720403518f39e601095f61aabbbcb3c560c479a60d2d9a20b9979452a0bf63c4cd543cdac672cc6ffb
-  data.tar.gz: 83310fb4e0d30815ed28dbacc75adab0e4660e446149e0009d806b1df63d0c2088c248f47c523a6727c6e34414b60b08d70ead61711324637f0db4a328e30e8d
+  metadata.gz: e3495e8deb06c7ec7540a3cfb0f8080badcbfaa6565e9f1839bdf515c6c557997727e60802f95bca40683db7b5b98d2338eff316575f609c3d2b8616e3503bee
+  data.tar.gz: 2a34bf987ad18fa9b5d8fd852c8148173dbcc5b0bbf94329cd89ccbead8d66c152df1d3a766b9badfbf5baf5ce988a3c99e5c857cb82dc5f152fe8b2e075e661

data/lib/action_subscriber/babou.rb

@@ -96,8 +96,7 @@ module ActionSubscriber
       wait_loops = 0
       ::ActionSubscriber::Babou.stop_receving_messages!
 
-      # Going to wait until the thread pool drains or we wait for 1000 seconds
-      while ::ActionSubscriber::Threadpool.pool.busy_size > 0 && wait_loops < 1000
+      while ::ActionSubscriber::Threadpool.pool.busy_size > 0 && wait_loops < ::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown
         puts "waiting for threadpool to empty (#{::ActionSubscriber::Threadpool.pool.busy_size})"
         Thread.pass
         wait_loops = wait_loops + 1

data/lib/action_subscriber/bunny/subscriber.rb

@@ -21,6 +21,7 @@ module ActionSubscriber
             next unless encoded_payload # empty queue
             ::ActiveSupport::Notifications.instrument "popped_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
+              :action => route.action,
               :channel => queue.channel,
               :content_type => properties[:content_type],
               :delivery_tag => delivery_info.delivery_tag,
@@ -44,6 +45,7 @@ module ActionSubscriber
           consumer.on_delivery do |delivery_info, properties, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
+              :action => route.action,
               :channel => queue.channel,
               :content_type => properties.content_type,
               :delivery_tag => delivery_info.delivery_tag,

data/lib/action_subscriber/configuration.rb

@@ -12,6 +12,7 @@ module ActionSubscriber
                   :port,
                   :prefetch,
                   :publisher_confirms,
+                  :seconds_to_wait_for_graceful_shutdown,
                   :threadpool_size,
                   :timeout,
                   :times_to_pop
@@ -25,8 +26,9 @@ module ActionSubscriber
       :mode => 'subscribe',
       :pop_interval => 100, # in milliseconds
       :port => 5672,
-      :prefetch => 200,
+      :prefetch => 5,
       :publisher_confirms => false,
+      :seconds_to_wait_for_graceful_shutdown => 30,
       :threadpool_size => 8,
       :timeout => 1,
       :times_to_pop => 8

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -17,6 +17,7 @@ module ActionSubscriber
             next unless encoded_payload
             ::ActiveSupport::Notifications.instrument "popped_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
+              :action => route.action,
               :channel => queue.channel,
               :content_type => metadata.content_type,
               :delivery_tag => metadata.delivery_tag,
@@ -41,6 +42,7 @@ module ActionSubscriber
           consumer = queue.subscribe(route.queue_subscription_options) do |metadata, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
+              :action => route.action,
               :channel => queue.channel,
               :content_type => metadata.content_type,
               :delivery_tag => metadata.delivery_tag,

data/lib/action_subscriber/middleware/env.rb

@@ -5,7 +5,8 @@ module ActionSubscriber
     class Env
       attr_accessor :payload
 
-      attr_reader :content_type,
+      attr_reader :action,
+                  :content_type,
                   :encoded_payload,
                   :exchange,
                   :headers,
@@ -26,6 +27,7 @@ module ActionSubscriber
       #         :message_id => String
       #         :routing_key => String
       def initialize(subscriber, encoded_payload, properties)
+        @action = properties.fetch(:action)
         @channel = properties.fetch(:channel)
         @content_type = properties.fetch(:content_type)
         @delivery_tag = properties.fetch(:delivery_tag)
@@ -43,13 +45,6 @@ module ActionSubscriber
         @channel.ack(@delivery_tag, acknowledge_multiple_messages)
       end
 
-      # Return the last element of the routing key to indicate which action
-      # to route the payload to
-      #
-      def action
-        routing_key.split('.').last.to_s
-      end
-
       def reject
         requeue_message = true
         @channel.reject(@delivery_tag, requeue_message)

data/lib/action_subscriber/rspec.rb

@@ -13,6 +13,7 @@ module ActionSubscriber
     end
 
     PROPERTIES_DEFAULTS = {
+      :action => :created,
       :channel => FakeChannel.new,
       :content_type => "text/plain",
       :delivery_tag => "XYZ",
@@ -71,6 +72,7 @@ end
     let(:app) { Proc.new { |inner_env| inner_env } }
     let(:env) { ActionSubscriber::Middleware::Env.new(UserSubscriber, 'encoded payload', message_properties) }
     let(:message_properties) {{
+      :action => :created,
       :channel => ::ActionSubscriber::RSpec::FakeChannel.new,
       :content_type => "text/plain",
       :delivery_tag => "XYZ",

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/integration/custom_actions_spec.rb

@@ -0,0 +1,24 @@
+class CustomActionSubscriber < ActionSubscriber::Base
+  def wat
+    $messages << payload
+  end
+end
+
+describe "A subscriber with a custom action", :integration => true do
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      route ::CustomActionSubscriber, :wat,
+        :queue => "unrelated_to_the_action",
+        :routing_key => "*.javascript_framework"
+    end
+  end
+
+  it "routes the message to the selected action" do
+    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber::Publisher.publish("react.javascript_framework", "Another?!?!", "events")
+
+    verify_expectation_within(2.0) do
+      expect($messages).to eq(Set.new(["Another?!?!"]))
+    end
+  end
+end

data/spec/lib/action_subscriber/configuration_spec.rb

@@ -7,7 +7,8 @@ describe ::ActionSubscriber::Configuration do
     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(200) }
+    specify { expect(subject.prefetch).to eq(5) }
+    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) }
     specify { expect(subject.times_to_pop).to eq(8) }

data/spec/lib/action_subscriber/middleware/env_spec.rb

@@ -2,6 +2,7 @@ describe ActionSubscriber::Middleware::Env do
   let(:channel) { double("channel") }
   let(:encoded_payload) { 'encoded_payload' }
   let(:properties){ {
+    :action => :created,
     :channel => channel,
     :content_type => "application/json",
     :delivery_tag => "XYZ",
@@ -16,7 +17,7 @@ describe ActionSubscriber::Middleware::Env do
 
   subject { described_class.new(subscriber, encoded_payload, properties) }
 
-  specify { expect(subject.action).to eq("created") }
+  specify { expect(subject.action).to eq(:created) }
   specify { expect(subject.content_type).to eq(properties[:content_type]) }
   specify { expect(subject.exchange).to eq(properties[:exchange]) }
   specify { expect(subject.headers).to eq(properties[:headers]) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -229,6 +229,7 @@ files:
 - spec/integration/at_most_once_spec.rb
 - spec/integration/automatic_reconnect_spec.rb
 - spec/integration/basic_subscriber_spec.rb
+- spec/integration/custom_actions_spec.rb
 - spec/integration/custom_headers_spec.rb
 - spec/integration/decoding_payloads_spec.rb
 - spec/integration/inferred_routes_spec.rb
@@ -281,6 +282,7 @@ test_files:
 - spec/integration/at_most_once_spec.rb
 - spec/integration/automatic_reconnect_spec.rb
 - spec/integration/basic_subscriber_spec.rb
+- spec/integration/custom_actions_spec.rb
 - spec/integration/custom_headers_spec.rb
 - spec/integration/decoding_payloads_spec.rb
 - spec/integration/inferred_routes_spec.rb