use_cases 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e41f6c5b8670e047cafdd85d068a66aa0efac27700f2c179d5d893ee1593c466
-  data.tar.gz: 629cef02e18325528d6155a34356b80e48acaf31520ef45fddb4937e058c3ad2
+  metadata.gz: 3cec89e8a4f4ecdabae86c99156447d8b39ffd5de5e918130b21ccae18f045a7
+  data.tar.gz: e36cd9587aab933815775ee1181360ccea4a24e58e82c3a4a073a99bb565ff31
 SHA512:
-  metadata.gz: 2b5fdb9fd7bd52211b9194abd49fa2247b9b814e26f763f25f0c9f3ee995dff527977a19e7192576565a563af19dbf3cfeccae833fbd74f4fba74fa4589f46a3
-  data.tar.gz: 7d51d14db15b08764a1bbf3dc6ccede0806085e532e42273e436f1c91029f911282c3da31495b978a7dc87d5ba569fa33bc077b1b15673d7df795c9bf53ed781
+  metadata.gz: fdaa3ea0104e5bb38190c5c65f59e44569d38b08f0f4174e1c82f5f3b6f0698900a7001463dc3215007a2af2f4030616cc038ae2f2c78aba388b2cab90c520ad
+  data.tar.gz: 0c9663e589c521677529bb5b8a4cbe87c4c3591c82dfbc30ea9248b215c53f16c915f4a37dd3683f22b8dc7698f20e46e7cc8dfe20c5390ae9daaf418ee8e26d

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.register_and_publish_event(publish_key, payload)
+        UseCases.publisher.subscribe_and_publish_event(publish_key, payload)
       end
     end
   end

data/lib/use_cases/events/publisher.rb

@@ -5,31 +5,20 @@ module UseCases
     class Publisher
       include Dry::Events::Publisher[:use_cases]
 
-      def self.register_and_publish_event(event_name, payload)
-        register_events(event_name)
-
-        new.tap do |publisher|
-          publisher.subscribe_to_event(event_name)
-          publisher.publish(event_name, payload)
-        end
+      def subscribe_and_publish_event(event_name, payload)
+        subscribe_to_event(event_name)
+        publish(event_name, payload)
+        publish_async(event_name, payload) if event_should_be_published_asynchronously?(event_name)
+      end
 
-        return unless defined? UseCases::Events::PublishJob
+      private
 
+      def publish_async(event_name, payload)
         UseCases::Events::PublishJob.perform_later(event_name, payload)
       end
 
-      def self.extract_payload(use_case_args)
-        {
-          return_value: use_case_args[0],
-          params: use_case_args[1],
-          current_user: use_case_args[2]
-        }
-      end
-
-      def self.register_events(event_name)
-        [event_name, "#{event_name}.aync"].each do |key|
-          register_event(key) unless events[key]
-        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)
@@ -38,12 +27,25 @@ module UseCases
 
       def subscribers_for(event_name)
         available_subscribers.select do |subscriber|
-          subscriber.subscribed_to?(event_name)
+          subscriber.should_subscribe_to?(event_name) && !subscribed?(subscriber)
         end
       end
 
+      def subscribe(listener)
+        subcribers << listener
+        super
+      end
+
+      def subscribed?(listener)
+        subcribers.include?(listener)
+      end
+
+      def subcribers
+        @subcribers ||= []
+      end
+
       def available_subscribers
-        UseCases::Events::Subscriber.descendants.map(&:new) + UseCases.subscribers
+        UseCases.subscribers
       end
     end
   end

data/lib/use_cases/events/subscriber.rb

@@ -1,12 +1,14 @@
-require "active_support/core_ext/class/subclasses"
-
 module UseCases
   module Events
-    class Subscriber
-      def subscribed_to?(event_name)
+    module Subscriber
+      def self.included(base)
+        UseCases.subscribers << base.new
+      end
+
+      def should_subscribe_to?(event_name)
         event_handler_name = "on_#{event_name.gsub('.', '_')}"   
         
-        respond_to?(event_handler_name)
+        respond_to?(event_handler_name.to_sym)
       end
     end
   end

data/lib/use_cases/module_optins/publishing.rb

@@ -9,10 +9,33 @@ module UseCases
     module Publishing
       def self.included(base)
         super
-        StepAdapters::Abstract.prepend StepCallPatch
+        StepAdapters::Abstract.prepend StepPatch
       end
 
-      module StepCallPatch
+      module StepPatch
+        def initialize(*args)
+          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"
+          ]
+        end
+
         def call(*args)
           super(*args).tap do |result|
             publish_step_result(result, args)
@@ -25,7 +48,7 @@ module UseCases
           key = extract_event_key(step_result)
           payload = extract_payload(step_result, args)
 
-          UseCases.publisher.register_and_publish_event(key, payload)
+          UseCases.publisher.subscribe_and_publish_event(key, payload)
         end
 
         private

data/lib/use_cases/step_adapters/abstract.rb

@@ -85,11 +85,11 @@ module UseCases
       end
 
       def external?
-        with_option.present?
+        !with_option.nil?
       end
 
       def selects_external_args?
-        pass_option.present?
+        !pass_option.nil?
       end
 
       def callable_args_count

data/lib/use_cases/version.rb

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

data/lib/use_cases.rb

@@ -15,6 +15,6 @@ module UseCases
   extend Dry::Configurable
 
   setting :container, reader: true
-  setting :publisher, default: ::UseCases::Events::Publisher, reader: true
+  setting :publisher, default: ::UseCases::Events::Publisher.new, reader: true
   setting :subscribers, default: [], reader: true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_cases
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ring Twice
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,7 +178,7 @@ metadata:
   homepage_uri: https://github.com/listminut/use_cases
   source_code_uri: https://github.com/listminut/use_cases
   changelog_uri: https://github.com/listminut/use_cases/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Use Cases
 test_files: []