dry-events 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9092f7b60a8ad71e376a074367328c96be1ca31c278dfee8a7f8e8a6c11d02d
-  data.tar.gz: fb9e14c0df38ac76a64fd9811367322bccee5465d259a28537de902b292a6c72
+  metadata.gz: 9f63e13681ddc16b48063d8ccbbf9b134fed50d351ac7bef19fe6e31b17d2df8
+  data.tar.gz: e1a22779ae49b59a04bc65ffb9ff1d53d49b066a9f06a4b9b487cea36f4b7c22
 SHA512:
-  metadata.gz: 995a2c14a459edd0e0fcb05f19629829581fce7e14e7edbbb8c9fe2e555769b3cd15a89b55d75826da0d49a70b7a818de802b7f92d496f0012bf675c61d3bcc1
-  data.tar.gz: db26c95473237a3f783f06ffc71bad0351ab24a4922a544d227c586f9028d49655f300c038f63697d8fbe297e774b77692e52752167b12ae88660f69d6a8d344
+  metadata.gz: 3d42a5f782d005c813929877e729f607cb1089164607a4a496806c265159b1746bf3aa6554c769bddfde3fd40eb019dad3744eb60b670a58bcf3598dd480041e
+  data.tar.gz: 824f3bc90447b278138a1421988ec8cb6fb92f7851c0c9021f56309e895600233b222e79ffc223a25b46ed2e22a0a47f245653d917ae9ffbc7686f78151fb25c

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## unreleased 
+
+
+### Fixed
+
+- `subscribed?` now detects instance method blocks too (via #15) (@guilherme-andrade)
+
+
+[Compare v0.3.0...master](https://github.com/dry-rb/dry-events/compare/v0.3.0...master)
+
 ## 0.3.0 2021-04-11
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-events
 [actions]: https://github.com/dry-rb/dry-events/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-events
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-events/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3170162485134ea3b778c7e20e180b26)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/3170162485134ea3b778c7e20e180b26)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-events.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-events.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-events)
+* [User documentation](https://dry-rb.org/gems/dry-events)
 * [API documentation](http://rubydoc.info/gems/dry-events)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-events.gemspec

@@ -1,35 +1,36 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/events/version'
+require "dry/events/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-events'
+  spec.name          = "dry-events"
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica+oss@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Events::VERSION.dup
 
   spec.summary       = "Pub/sub system"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-events'
+  spec.homepage      = "https://dry-rb.org/gems/dry-events"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-events.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-events/blob/master/CHANGELOG.md'
-  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-events'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-events/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-events/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-events"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-events/issues"
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/events/bus.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/events/constants'
+require "dry/events/constants"
 
 module Dry
   module Events
@@ -76,7 +76,14 @@ module Dry
 
       # @api private
       def subscribed?(listener)
-        listeners.values.any? { |value| value.any? { |block, _| block.equal?(listener) } }
+        listeners.values.any? do |value|
+          value.any? do |block, _|
+            case listener
+            when Proc   then block.equal?(listener)
+            when Method then listener.owner == block.owner && listener.name == block.name
+            end
+          end
+        end
       end
 
       # @api private

data/lib/dry/events/constants.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'dry/core/constants'
+require "concurrent/map"
 
 module Dry
   module Events

data/lib/dry/events/event.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/equalizer'
-require 'dry/events/constants'
+require "dry/events/constants"
 
 module Dry
   module Events
@@ -14,12 +13,12 @@ module Dry
       InvalidEventNameError = Class.new(StandardError) do
         # @api private
         def initialize
-          super('please provide a valid event name, it could be either String or Symbol')
+          super("please provide a valid event name, it could be either String or Symbol")
         end
       end
 
-      DOT = '.'.freeze
-      UNDERSCORE = '_'.freeze
+      DOT = "."
+      UNDERSCORE = "_"
 
       # @!attribute [r] id
       #   @return [Symbol, String] The event identifier
@@ -29,7 +28,7 @@ module Dry
       def self.new(id, payload = EMPTY_HASH)
         return super(id, payload) if (id.is_a?(String) || id.is_a?(Symbol)) && !id.empty?
 
-        raise InvalidEventNameError.new
+        raise InvalidEventNameError
       end
 
       # Initialize a new event

data/lib/dry/events/filter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module Dry
   module Events

data/lib/dry/events/listener.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/equalizer'
-require 'dry/events/publisher'
+require "dry/events/publisher"
 
 module Dry
   module Events
@@ -23,7 +22,7 @@ module Dry
     #   end
     #
     # @api public
-    class Listener < Module
+    class Listener < ::Module
       include Dry::Equalizer(:id)
 
       # @!attribute [r] :id
@@ -42,6 +41,7 @@ module Dry
 
       # @api private
       def initialize(id)
+        super()
         @id = id
 
         define_method(:subscribe) do |event_id, query = EMPTY_HASH, &block|

data/lib/dry/events/publisher.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-
-require 'dry/core/class_attributes'
-
-require 'dry/events/constants'
-require 'dry/events/event'
-require 'dry/events/bus'
-require 'dry/events/filter'
+require "dry/core"
+require "dry/events/constants"
+require "dry/events/event"
+require "dry/events/bus"
+require "dry/events/filter"
 
 module Dry
   module Events
@@ -27,9 +24,12 @@ module Dry
       def initialize(object_or_event_id)
         case object_or_event_id
         when String, Symbol
-          super("you are trying to subscribe to an event: `#{object_or_event_id}` that has not been registered")
+          super(
+            "you are trying to subscribe to an event: `#{object_or_event_id}` "\
+            "that has not been registered"
+          )
         else
-          super('you try use subscriber object that will never be executed')
+          super("you try use subscriber object that will never be executed")
         end
       end
     end
@@ -74,7 +74,7 @@ module Dry
     #   create_user.call(name: "Jane")
     #
     # @api public
-    class Publisher < Module
+    class Publisher < ::Module
       include Dry::Equalizer(:id)
 
       # Internal publisher registry, which is used to identify them globally
@@ -102,13 +102,14 @@ module Dry
       #
       # @api public
       def self.[](id)
-        raise PublisherAlreadyRegisteredError.new(id) if registry.key?(id)
+        raise PublisherAlreadyRegisteredError, id if registry.key?(id)
 
         new(id)
       end
 
       # @api private
       def initialize(id)
+        super()
         @id = id
       end
 

data/lib/dry/events/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Events
-    VERSION = '0.3.0'
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-events
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-11 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-events/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-events/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-events
   bug_tracker_uri: https://github.com/dry-rb/dry-events/issues
 post_install_message: 
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="