dry-events 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df0a07c20aa79e2b47d1f8eda583936b6109e09e5307826593e1e8f792c7675
-  data.tar.gz: c99dfee0bf7614b62fc70d8ea809d419fcf8fb01400149f83610fd9a9e586019
+  metadata.gz: f18471031f2c5dcd9d2ea488ab48f5d42d9bd44de9158241dbb43324dd6fc0b4
+  data.tar.gz: '01160358743e52191c19bfc8b3a0550b4a201967f5fe96a8c60dfe50b560b2e1'
 SHA512:
-  metadata.gz: 3060f0fe13e7cb9199e81e82c82be67bca90a547a0750b094f0afcdcb193aba0866c3c3a7af2e81923dec194bc1828d9fc4ae7fa099c0c87952cba68f77afff2
-  data.tar.gz: 33845156cc553098260f562001b3fa0d2aa711c95ee8d056c0f1362eccda69e8b8954040bf0b542b47826a81b813d1a338ced05712e10e36a8770fad4eef867f
+  metadata.gz: d5d2e2a9920e5fe2241d5ae0cf42337169f4836353475aeb1bf4d8e621eac86b33143440a160ba5addf0b3cae548772f02c1b42bd86d88283e466835714f42bd
+  data.tar.gz: 6b4b8cdc169c69523dc8ba29362113d4fd7b127d3532f80572bf687c44b07c02fbe95788d2356a1316b363e54fab1ad8db3cd4801823aecce0f59926f9ec5e9b

data/.travis.yml

@@ -10,6 +10,10 @@ rvm:
   - 2.4.3
   - 2.3.6
   - jruby-9.1.9.0
+  - truffleruby
+matrix:
+  allow_failures:
+    - rvm: truffleruby
 env:
   global:
     - COVERAGE='true'

data/CHANGELOG.md

@@ -1,3 +1,33 @@
-# v0.1.0 to-be-released
+# v0.1.1 2019-03-22
+
+## Added
+
+- Subscription filters can be more complex: nested hash inclusion, array inclusion, and proc checks were added (flash-gordon)
+  ```ruby
+  # nested hash check
+  subscribe(:event, logger: { level: :info })
+  # pass
+  trigger(:event, logger: { level: :info, output: :stdin })
+  # filtered out
+  trigger(:event, logger: { level: :debug })
+  trigger(:event, something: :else)
+
+  # array inclusion
+  subscribe(:event, logger: { level: %i(info warn error) })
+  # pass
+  trigger(:event, logger: { level: :info })
+  trigger(:event, logger: { level: :error })
+  trigger(:event, logger: { level: :info, output: :stdin })
+  # filtered out
+  trigger(:event, logger: { level: :debug })
+
+  # proc checks
+  # here acts as array inclusion example
+  subscribe(:event, logger: { level: -> level { %i(info warn error).include?(level) })
+  ```
+
+[Compare v0.1.0...v0.1.1](https://github.com/dry-rb/dry-events/compare/v0.1.0...v0.1.1)
+
+# v0.1.0 2018-01-02
 
 First public release

data/Gemfile

@@ -9,5 +9,6 @@ group :test do
 end
 
 group :tools do
-  gem 'byebug', platform: :mri
+  gem 'pry'
+  gem 'pry-byebug', platform: :mri
 end

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/dry-events
 [travis]: https://travis-ci.org/dry-rb/dry-events
-[gemnasium]: https://gemnasium.com/dry-rb/dry-events
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-events
 [coveralls]: https://coveralls.io/r/dry-rb/dry-events
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-events
@@ -9,18 +8,17 @@
 
 [![Gem Version](https://badge.fury.io/rb/dry-events.svg)][gem]
 [![Build Status](https://travis-ci.org/dry-rb/dry-events.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-events.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-events/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-events/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-events.svg?branch=master)][inchpages]
 
 Standalone pub/sub system.
 
-## Synopsis
+## Links
 
-``` ruby
-```
+* [User docs](http://dry-rb.org/gems/dry-events)
+* [API docs](http://rubydoc.info/gems/dry-events)
 
-## License
+## LICENSE
 
 See `LICENSE` file.

data/lib/dry/events/bus.rb

@@ -18,7 +18,6 @@ module Dry
 
       # Initialize a new event bus
       #
-      # @param [Symbol] id The bus identifier
       # @param [Hash] events A hash with events
       # @param [Hash] listeners A hash with listeners
       #
@@ -29,11 +28,11 @@ module Dry
       end
 
       # @api private
-      def process(event_id, payload, &block)
-        listeners[event_id].each do |(listener, query)|
+      def process(event_id, payload)
+        listeners[event_id].each do |listener, filter|
           event = events[event_id].payload(payload)
 
-          if event.trigger?(query)
+          if filter.(payload)
             yield(event, listener)
           end
         end
@@ -47,12 +46,12 @@ module Dry
       end
 
       # @api private
-      def attach(listener, query)
+      def attach(listener, filter)
         events.each do |id, event|
           meth = event.listener_method
 
           if listener.respond_to?(meth)
-            listeners[id] << [listener.method(meth), query]
+            listeners[id] << [listener.method(meth), filter]
           end
         end
       end
@@ -68,14 +67,14 @@ module Dry
       end
 
       # @api private
-      def subscribe(event_id, query, &block)
-        listeners[event_id] << [block, query]
+      def subscribe(event_id, filter, &block)
+        listeners[event_id] << [block, filter]
         self
       end
 
       # @api private
       def subscribed?(listener)
-        listeners.values.any? { |value| value.any? { |(block, _)| block.equal?(listener) } }
+        listeners.values.any? { |value| value.any? { |block, _| block.equal?(listener) } }
       end
     end
   end

data/lib/dry/events/event.rb

@@ -66,11 +66,6 @@ module Dry
         end
       end
 
-      # @api private
-      def trigger?(query)
-        query.empty? || query.all? { |key, value| payload[key] == value }
-      end
-
       # @api private
       def listener_method
         @listener_method ||= :"on_#{id.to_s.gsub(DOT, UNDERSCORE)}"

data/lib/dry/events/filter.rb

@@ -0,0 +1,72 @@
+require 'set'
+
+module Dry
+  module Events
+    # Event filter
+    #
+    # A filter cherry-picks probes payload of events.
+    # Events not matching the predicates don't fire callbacks.
+    #
+    # @api private
+    class Filter
+      NO_MATCH = Object.new.freeze
+
+      # @!attribute [r] events
+      #   @return [Array] A list of lambdas checking payloads
+      attr_reader :checks
+
+      # Create a new filter
+      #
+      # @param [Hash] filter Source filter
+      #
+      # @api private
+      def initialize(filter)
+        @checks = build_checks(filter)
+      end
+
+      # Test event payload against the checks
+      #
+      # @param [Hash] payload Event payload
+      #
+      # @api private
+      def call(payload = EMPTY_HASH)
+        checks.all? { |check| check.(payload) }
+      end
+
+      # Recursively build checks
+      #
+      # @api private
+      def build_checks(filter, checks = EMPTY_ARRAY, keys = EMPTY_ARRAY)
+        if filter.is_a?(Hash)
+          filter.reduce(checks) do |cs, (key, value)|
+            build_checks(value, cs, [*keys, key])
+          end
+        else
+          [*checks, method(:compare).curry.(keys, predicate(filter))]
+        end
+      end
+
+      # @api private
+      def compare(path, predicate, payload)
+        value = path.reduce(payload) do |acc, key|
+          if acc.is_a?(Hash) && acc.key?(key)
+            acc[key]
+          else
+            break NO_MATCH
+          end
+        end
+
+        predicate.(value)
+      end
+
+      # @api private
+      def predicate(value)
+        case value
+        when Proc then value
+        when Array then value.method(:include?)
+        else value.method(:==)
+        end
+      end
+    end
+  end
+end

data/lib/dry/events/listener.rb

@@ -11,7 +11,7 @@ module Dry
     #
     #     register_event("users.created")
     #   end
-
+    #
     #   class MyListener
     #     include Dry::Events::Listener[:app]
     #

data/lib/dry/events/publisher.rb

@@ -5,6 +5,7 @@ require 'dry/core/class_attributes'
 require 'dry/events/constants'
 require 'dry/events/event'
 require 'dry/events/bus'
+require 'dry/events/filter'
 
 module Dry
   module Events
@@ -116,13 +117,13 @@ module Dry
         # Subscribe to an event
         #
         # @param [Symbol,String] event_id The event identifier
-        # @param [Hash] query An optional query for conditional listeners
+        # @param [Hash] filter_hash An optional filter for conditional listeners
         #
         # @return [Class] publisher class
         #
         # @api public
-        def subscribe(event_id, query = EMPTY_HASH, &block)
-          listeners[event_id] << [block, query]
+        def subscribe(event_id, filter_hash = EMPTY_HASH, &block)
+          listeners[event_id] << [block, Filter.new(filter_hash)]
           self
         end
 
@@ -180,19 +181,21 @@ module Dry
 
         # Subscribe to events.
         #
-        # If the query parameter is provided, filters events by payload.
+        # If the filter parameter is provided, filters events by payload.
         #
         # @param [Symbol,String,Object] object_or_event_id The event identifier or a listener object
-        # @param [Hash] query An optional event filter
+        # @param [Hash] filter_hash An optional event filter
         #
         # @return [Object] self
         #
         # @api public
-        def subscribe(object_or_event_id, query = EMPTY_HASH, &block)
+        def subscribe(object_or_event_id, filter_hash = EMPTY_HASH, &block)
+          filter = Filter.new(filter_hash)
+
           if block
-            __bus__.subscribe(object_or_event_id, query, &block)
+            __bus__.subscribe(object_or_event_id, filter, &block)
           else
-            __bus__.attach(object_or_event_id, query)
+            __bus__.attach(object_or_event_id, filter)
           end
           self
         end
@@ -217,7 +220,7 @@ module Dry
 
         # Utility method which yields event with each of its listeners
         #
-        # Listeners are already filtered out when query was provided during
+        # Listeners are already filtered out when filter was provided during
         # subscription
         #
         # @param [Symbol,String] event_id The event identifier

data/lib/dry/events/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Events
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,8 @@ if RUBY_ENGINE == 'ruby' && ENV['COVERAGE'] == 'true'
 end
 
 begin
-  require 'byebug'
+  require 'pry'
+  require 'pry-byebug'
 rescue LoadError; end
 
 require 'dry-events'
@@ -17,7 +18,9 @@ Dir[SPEC_ROOT.join('shared/**/*.rb')].each(&method(:require))
 Dir[SPEC_ROOT.join('support/**/*.rb')].each(&method(:require))
 
 RSpec.configure do |config|
+  config.warnings = true
   config.disable_monkey_patching!
+  config.filter_run_when_matching :focus
 
   config.after(:example) do
     Dry::Events::Publisher.instance_variable_set(:@__registry__, Concurrent::Map.new)

data/spec/unit/dry/events/filter_spec.rb

@@ -0,0 +1,74 @@
+RSpec.describe Dry::Events::Filter do
+  subject(:filter) { described_class.new(query) }
+
+  context 'nested hash' do
+    let(:query) do
+      { logger: { level: :info } }
+    end
+
+    specify do
+      expect(filter.()).to be false
+      expect(filter.(logger: { level: :info, output: :stdin })).to be true
+      expect(filter.(logger: { level: :debug })).to be false
+      expect(filter.(logger: :debug)).to be false
+    end
+  end
+
+  context 'multi-value check' do
+    let(:query) do
+      { logger: { level: :info, output: :stdin } }
+    end
+
+    specify do
+      expect(filter.()).to be false
+      expect(filter.(logger: { level: :info, output: :stdin })).to be true
+      expect(filter.(logger: { level: :info })).to be false
+    end
+  end
+
+  context 'top-level array' do
+    let(:query) { %i(error fatal) }
+
+    specify do
+      expect(filter.()).to be false
+      expect(filter.(random: :hash)).to be false
+      expect(filter.(:error)).to be true
+    end
+  end
+
+  context 'nested array' do
+    let(:query) do
+      { logger: { level: %i(info warn error fatal) } }
+    end
+
+    specify do
+      expect(filter.()).to be false
+      expect(filter.(logger: { level: :info, output: :stdin })).to be true
+      expect(filter.(logger: { level: :fatal })).to be true
+      expect(filter.(logger: { level: :debug })).to be false
+      expect(filter.(level: :debug)).to be false
+    end
+  end
+
+  context 'nested proc' do
+    let(:query) do
+      { logger: { level: -> level { %i(error fatal).include?(level) } } }
+    end
+
+    specify do
+      expect(filter.()).to be false
+      expect(filter.(logger: { level: :error, output: :stdin })).to be true
+    end
+  end
+
+  context 'top-level proc' do
+    let(:query) do
+      -> level: :debug, ** { %i(error fatal).include?(level) }
+    end
+
+    specify do
+      expect(filter.()).to be false
+      expect(filter.(level: :error, output: :stdin)).to be true
+    end
+  end
+end

data/spec/unit/dry/events/listener_spec.rb

@@ -16,16 +16,30 @@ RSpec.describe Dry::Events::Listener do
   end
 
   describe '.subscribe' do
-    it 'subscribes a listener at class level' do
-      result = []
+    let(:captured) { [] }
 
+    it 'subscribes a listener at class level' do
       listener.subscribe(:test_event) do |event|
-        result << event.id
+        captured << event.id
       end
 
       publisher.publish(:test_event)
 
-      expect(result).to eql([:test_event])
+      expect(captured).to eql([:test_event])
+    end
+
+    describe 'filters' do
+      it 'filters events' do
+        listener.subscribe(:test_event, level: :info) do |event|
+          captured << event.payload
+        end
+
+        publisher.publish(:test_event)
+        publisher.publish(:test_event, level: :debug)
+        publisher.publish(:test_event, level: :info)
+
+        expect(captured).to eql([level: :info])
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-events
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -116,10 +116,12 @@ files:
 - lib/dry/events/bus.rb
 - lib/dry/events/constants.rb
 - lib/dry/events/event.rb
+- lib/dry/events/filter.rb
 - lib/dry/events/listener.rb
 - lib/dry/events/publisher.rb
 - lib/dry/events/version.rb
 - spec/spec_helper.rb
+- spec/unit/dry/events/filter_spec.rb
 - spec/unit/dry/events/listener_spec.rb
 - spec/unit/dry/events/publisher_spec.rb
 homepage: https://github.com/dry-rb/dry-events
@@ -141,12 +143,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Pub/sub system
 test_files:
 - spec/spec_helper.rb
+- spec/unit/dry/events/filter_spec.rb
 - spec/unit/dry/events/listener_spec.rb
 - spec/unit/dry/events/publisher_spec.rb