action_subscriber 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c37c6735aa71bb3a8f1085d401c2634869484a6269a5a40daaca3a40bf92a2
-  data.tar.gz: 34e673c42225b7c1771d7ca42eaf629e8b693e300c38c62ff43c21697171648a
+  metadata.gz: a596e1dcbba93eacacb9d650f0853ffdb1837a3dc36daf5255409d85a9dd52a4
+  data.tar.gz: f85747ecbb7868d6d0ec0ff01afe9dda45f4fb8ea0a1d8a5f7781cd482e04714
 SHA512:
-  metadata.gz: 4b4da055a37f1332a3eaaa509940907193cc3e6dbdd58d5cf321ff7e7328df3aacc50f2152f894b74f85291dc59d487c4bb04c1e397fc6652970be75e6b429ca
-  data.tar.gz: b171388946ad395f6c65128c06911440accd09c941dd048183b89c61c9868ab05ef23d794433709575219c98e81de34389ee0722a078ec4f00494a8ab2bcab21
+  metadata.gz: 86a8e02b695d8b9a9e8a0cf561b66f2ddcd1a4e8d8471f83143f833db1109b845f0fe42baa20b620628109721d9f1ad059e9ea3e1ac4abfe34548010fd7e3b7c
+  data.tar.gz: 334ca4005d7f67ddf6579b97488fd7220f8b695f7668098f303ae62ea0a68b188f41da60ea093c1c97a5da39cf7962ab74165a61058ff3e3df308151976e742a

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+os:
+  linux
+dist:
+  trusty
 rvm:
  - 2.2.6
  - 2.3.3

data/lib/action_subscriber/dsl.rb

@@ -1,5 +1,38 @@
 module ActionSubscriber
   module DSL
+    class Filter
+      attr_accessor :callback_method
+      attr_accessor :included_actions
+      attr_accessor :excluded_actions
+
+      def initialize(callback_method, options)
+        @callback_method = callback_method
+        @included_actions = @excluded_actions = []
+        parse_options(options)
+      end
+
+      def matches(action)
+        unless included_actions.empty?
+          return included_actions.include?(action)
+        end
+
+        unless excluded_actions.empty?
+          return false if excluded_actions.include?(action)
+        end
+
+        true
+      end
+
+    private
+
+      def parse_options(options)
+        return unless options
+
+        @included_actions  = options.fetch(:if, [])
+        @excluded_actions = options.fetch(:unless, [])
+      end
+    end
+
     def at_least_once!
       @_acknowledge_messages = true
       @_at_least_once = true
@@ -22,11 +55,16 @@ module ActionSubscriber
       !!@_acknowledge_messages
     end
 
-    def around_filter(filter_method)
-      around_filters << filter_method unless around_filters.include?(filter_method)
+    def around_filter(callback_method, options = nil)
+      filter = Filter.new(callback_method, options)
+      conditionally_add_filter!(filter)
       around_filters
     end
 
+    def conditionally_add_filter!(filter)
+      around_filters << filter unless around_filters.any? { |f| f.callback_method == filter.callback_method }
+    end
+
     def around_filters
       @_around_filters ||= []
     end
@@ -95,7 +133,11 @@ module ActionSubscriber
       final_block = Proc.new { subscriber_instance.public_send(action) }
 
       first_proc = around_filters.reverse.reduce(final_block) do |block, filter|
-        Proc.new { subscriber_instance.send(filter, &block) }
+        if filter.matches(action)
+          Proc.new { subscriber_instance.send(filter.callback_method, &block) }
+        else
+          block
+        end
       end
       first_proc.call
     end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.1.4"
+  VERSION = "5.1.5"
 end

data/spec/integration/around_filters_spec.rb

@@ -33,7 +33,7 @@ describe "subscriber filters", :integration => true do
   let(:subscriber) { InstaSubscriber }
 
   it "does not allow an around filter to be pushed on twice" do
-    expect(InstaSubscriber.around_filters).to eq([:whisper, :yell])
+    expect(InstaSubscriber.around_filters.map(&:callback_method)).to eq([:whisper, :yell])
   end
 
   it "runs multiple around filters" do
@@ -46,3 +46,89 @@ describe "subscriber filters", :integration => true do
     end
   end
 end
+
+class OptionsSubscriber < ActionSubscriber::Base
+  around_filter :whisper, :if => [:primero, :segundo]
+  around_filter :yell, :if => [:primero]
+  around_filter :gossip, :unless => [:private_action]
+  around_filter :everybody
+
+  def primero
+    $messages << payload
+  end
+
+  def private_action
+    $messages << payload
+  end
+
+  def segundo
+    $messages << payload
+  end
+
+  private
+
+  def everybody
+    $messages << :everybody_before
+    yield
+    $messages << :everybody_after
+  end
+
+  def gossip
+    $messages << :gossip_before
+    yield
+    $messages << :gossip_after
+  end
+
+  def whisper
+    $messages << :whisper_before
+    yield
+    $messages << :whisper_after
+  end
+
+  def yell
+    $messages << :yell_before
+    yield
+    $messages << :yell_after
+  end
+end
+
+describe "subscriber filters with conditions", :integration => true do
+  let(:draw_routes) do
+    ::ActionSubscriber.draw_routes do
+      default_routes_for OptionsSubscriber
+    end
+  end
+  let(:subscriber) { OptionsSubscriber }
+
+  context "honors conditions" do
+    it "runs yell" do
+      $messages = []
+      ::ActionSubscriber.start_subscribers!
+      ::ActivePublisher.publish("options.primero", "Howdy!", "events")
+
+      verify_expectation_within(1.0) do
+        expect($messages).to eq [:whisper_before, :yell_before, :gossip_before, :everybody_before, "Howdy!", :everybody_after, :gossip_after, :yell_after, :whisper_after]
+      end
+    end
+
+    it "doesn't yell" do
+      $messages = []
+      ::ActionSubscriber.start_subscribers!
+      ::ActivePublisher.publish("options.segundo", "Howdy!", "events")
+
+      verify_expectation_within(1.0) do
+        expect($messages).to eq [:whisper_before, :gossip_before, :everybody_before, "Howdy!", :everybody_after, :gossip_after, :whisper_after]
+      end
+    end
+
+    it "doesn't gossip" do
+      $messages = []
+      ::ActionSubscriber.start_subscribers!
+      ::ActivePublisher.publish("options.private_action", "Howdy!", "events")
+
+      verify_expectation_within(1.0) do
+        expect($messages).to eq [:everybody_before, "Howdy!", :everybody_after]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,8 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from