use_cases 1.0.14 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84488a184d56b5fe1b8004f2e6d25d8f154e8b80ed53f8760f4e11e5982941e
-  data.tar.gz: 50dda6b47dab05b90411716a7a9e4c711fd4d576a536052aadbc7e754fd7236b
+  metadata.gz: 7bcffb088175f9ee545ae73905c1f3238839e7d3242501296b90349c821db0ed
+  data.tar.gz: 91cec0de97c7a2f92738f8121cf502621f046742526972b1ae091df168dd4b07
 SHA512:
-  metadata.gz: 578d00c24ac18937195f5b202f7bb1e7d3b1973f6fdcc6468043ea514d84b404883dfaa6ed5156617d8aed104cd8554cca7f6b30b48528f454c0fe8f82730e80
-  data.tar.gz: 3df0f08a78ba070b85a7e68eb6a91b51d0bc3da69490d9601b0fc3ad3532fbdf17c9a817384b63eafd7d117667bc75e7fa558d2920e79120059324fa76765688
+  metadata.gz: d59c2125f78aea4cf498715b921628ad0c652488840ac6e79cc7b9b2fe33f804b2330eff0b5e9931c910c21f9de4393d055f3fd2fe45d61d6a484935ff7a2482
+  data.tar.gz: 20576bb2c209513f5e169b7723bdbe445648ba0121ed36bae8a86a846b408a7a205b7f65f41a376ddcea0b44a163431a3a6e9aeef53a64fff94a848ec3a03114

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    use_cases (1.0.12)
+    use_cases (1.1.0)
       activesupport
       dry-events
       dry-matcher
@@ -110,6 +110,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -126,4 +127,4 @@ DEPENDENCIES
   use_cases!
 
 BUNDLED WITH
-   2.2.28
+   2.2.32

data/lib/use_cases/events/publish_job.rb

@@ -6,7 +6,7 @@ module UseCases
     class PublishJob < ActiveJob::Base
       def perform(publish_key, payload)
         publish_key += ".async"
-        UseCases.publisher.subscribe_and_publish_event(publish_key, payload)
+        UseCases.publisher.publish(publish_key, payload)
       end
     end
   end

data/lib/use_cases/events/publisher.rb

@@ -5,46 +5,18 @@ module UseCases
     class Publisher
       include Dry::Events::Publisher[:use_cases]
 
-      def subscribe_and_publish_event(event_name, payload)
-        subscribe_to_event(event_name)
-        publish(event_name, payload)
-      end
-
-      private
-
-      def publish_async(event_name, payload)
-        UseCases::Events::PublishJob.perform_later(event_name, payload)
-      end
-
-      def event_should_be_published_asynchronously?(event_name)
-        defined? UseCases::Events::PublishJob && !event_name.end_with?(".async")
-      end
-
-      def subscribe_to_event(event_name)
-        subscribers_for(event_name).each(&method(:subscribe))
-      end
-
-      def subscribers_for(event_name)
-        available_subscribers.select do |subscriber|
-          subscriber.should_subscribe_to?(event_name) && !subscribed?(subscriber)
+      # This is a hack waiting for this https://github.com/dry-rb/dry-events/pull/15 to be merged
+      def subscribed?(listener)
+        __bus__.listeners.values.any? do |value|
+          value.any? do |block, _|
+            block.owner == listener.owner && block.name == listener.name
+          end
         end
       end
 
-      def subscribe(listener)
-        subcribers << listener
+      def publish(event_name, payload)
         super
-      end
-
-      def subscribed?(listener)
-        subcribers.include?(listener)
-      end
-
-      def subcribers
-        @subcribers ||= []
-      end
-
-      def available_subscribers
-        UseCases.subscribers
+        PublishJob.perform_later(event_name, payload) if defined?(PublishJob)
       end
     end
   end

data/lib/use_cases/module_optins/publishing.rb

@@ -13,27 +13,9 @@ module UseCases
       end
 
       module StepPatch
-        def initialize(*args)
+        def initialize(*)
           super
-          return unless options[:publish] && UseCases.publisher
-
-          register_events
-        end
-
-        def register_events
-          event_names.each do |event_name|
-            next if UseCases.publisher.class.events[event_name]
-
-            UseCases.publisher.class.register_event(event_name)
-          end
-        end
-
-        def event_names
-          event_name = options[:publish]
-          [
-            "#{event_name}.success", "#{event_name}.failure",
-            "#{event_name}.success.async", "#{event_name}.failure.async"
-          ]
+          finalize_subscriptions!
         end
 
         def call(*args)
@@ -48,7 +30,27 @@ module UseCases
           key = extract_event_key(step_result)
           payload = extract_payload(step_result, args)
 
-          UseCases.publisher.subscribe_and_publish_event(key, payload)
+          UseCases.publisher.publish(key, payload)
+        end
+
+
+        def finalize_subscriptions!
+          event_ids.each do |event_id|
+            listener_name = ['on', event_id].join('_').gsub('.', '_')
+            UseCases.publisher.register_event(event_id)
+
+            UseCases.subscribers.each do |subscriber|
+              next if !subscriber.respond_to?(listener_name) || UseCases.publisher.subscribed?(subscriber.method(listener_name))
+
+              UseCases.publisher.subscribe(subscriber)
+            end
+          end
+        end
+
+        def event_ids
+          %w[success failure success.async failure.async].map do |event_type|
+            [options[:publish], event_type].join('.')
+          end
         end
 
         private

data/lib/use_cases/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UseCases
-  VERSION = "1.0.14"
+  VERSION = "1.1.0"
 end

data/use_cases.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-monads"
   spec.add_dependency "dry-validation"
 
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_cases
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - Ring Twice
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement