action_subscriber 5.1.4.pre0-java → 5.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 593b4e50424f82a78fbeb6bf93c515c832cb32f3
-  data.tar.gz: ed56497413a4a7b29cc4bfbe30e08b4323b2f4e8
+SHA256:
+  metadata.gz: ca5face8fc684985f21cab2d0be98de2e2f6d8c56d08a403c62075291adbda8a
+  data.tar.gz: 3210c548ea05b9da02a358691434e22d875fcea6d11496959a849fee36223bfa
 SHA512:
-  metadata.gz: 71e5c70d323ec56d6fe4ad8383672c6ecdcf3dfe6b745b79719b02523405e44dc310212bcf75685a3f9da79720749c45700533fe3606a6f07d883e52adc5dc6f
-  data.tar.gz: bd8db80b1208d701df292dbc0eec9d98eb61892d245f4d5bdd12dbafc200b95c0980950e61038245c8c2cebaa1774b28597a90446db1ba2cae97c17a86beaf8e
+  metadata.gz: 2089e546d6494cf331f658b26d4ff57f35151ddf231e586082dd951e6f635f29d816fe0b3b2d7302f7fd25a5141e56dcc8f1e56909f3973a3b8ba86b908cb64a
+  data.tar.gz: 7f72c8204ed5bc09a61c1f3b62f6f5fb03bc21b66a6ca388f758c8bea776b93b6e275d99f0c77271652a0f0a3d7a3cb1692c237156d577aa47b67df5d36cbf69

data/.travis.yml

@@ -1,9 +1,14 @@
 language: ruby
+os:
+  linux
+dist:
+  trusty
 rvm:
  - 2.2.6
  - 2.3.3
  - jruby-9.0.5.0
  - jruby-9.1.7.0
+ - jruby-9.1.12.0
  - jruby-head
 services:
  - rabbitmq

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/middleware/env.rb

@@ -42,7 +42,7 @@ module ActionSubscriber
         @has_been_nacked = false
         @has_been_rejected = false
         @headers = properties.fetch(:headers, {})
-        @message_id = properties.fetch(:message_id, ::SecureRandom.hex(3))
+        @message_id = properties[:message_id].presence || ::SecureRandom.hex(3)
         @queue = properties.fetch(:queue)
         @routing_key = properties.fetch(:routing_key)
         @subscriber = subscriber

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.1.4.pre0"
+  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.pre0
+  version: 5.1.5
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -292,12 +292,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from