use_cases 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f810a00826d0e18fb1defbddb6a54055f4b77b43141a943d48d8a56273b7bf9
-  data.tar.gz: b6f1724c28186e1e8f4ca3b0b79807d4db534903b5f0ee5ace23363b180b8fc2
+  metadata.gz: 7bcffb088175f9ee545ae73905c1f3238839e7d3242501296b90349c821db0ed
+  data.tar.gz: 91cec0de97c7a2f92738f8121cf502621f046742526972b1ae091df168dd4b07
 SHA512:
-  metadata.gz: 8973b6cc8d4b89d16af39f010af3a8bf8cd9aea88f9c5c3679356955fc566ee1596711eed422beb9bd928364645640689ec03efd4e8cde11ec7b9d5c3e5c1357
-  data.tar.gz: b7c595a0645bf0b8938aa09f99d9fe8167b34c0ca6d9c6e9dfa4ed652a9c8341dfcf216fe70c222ad2321fb094f4667417a6bf1efb7cc1c8c2f2b79b8fe5c0a4
+  metadata.gz: d59c2125f78aea4cf498715b921628ad0c652488840ac6e79cc7b9b2fe33f804b2330eff0b5e9931c910c21f9de4393d055f3fd2fe45d61d6a484935ff7a2482
+  data.tar.gz: 20576bb2c209513f5e169b7723bdbe445648ba0121ed36bae8a86a846b408a7a205b7f65f41a376ddcea0b44a163431a3a6e9aeef53a64fff94a848ec3a03114

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## [1.0.1] - 2021-12-19
 
-- Async published events are now suffixed by `".aync"`
+- Async published events are now suffixed by `".async"`
 
 ## [1.0.0] - 2021-12-19
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    use_cases (1.0.10)
+    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.25
+   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.register_and_publish_event(publish_key, payload)
+        UseCases.publisher.publish(publish_key, payload)
       end
     end
   end

data/lib/use_cases/events/publisher.rb

@@ -5,45 +5,18 @@ 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
-
-        return unless defined? UseCases::Events::PublishJob
-
-        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
-      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.subscribed_to?(event_name)
+      # 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 available_subscribers
-        UseCases::Events::Subscriber.descendants.map(&:new) + UseCases.subscribers
+      def publish(event_name, payload)
+        super
+        PublishJob.perform_later(event_name, payload) if defined?(PublishJob)
       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,15 @@ module UseCases
     module Publishing
       def self.included(base)
         super
-        StepAdapters::Abstract.prepend StepCallPatch
+        StepAdapters::Abstract.prepend StepPatch
       end
 
-      module StepCallPatch
+      module StepPatch
+        def initialize(*)
+          super
+          finalize_subscriptions!
+        end
+
         def call(*args)
           super(*args).tap do |result|
             publish_step_result(result, args)
@@ -25,7 +30,27 @@ module UseCases
           key = extract_event_key(step_result)
           payload = extract_payload(step_result, args)
 
-          UseCases.publisher.register_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/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.11"
+  VERSION = "1.1.0"
 end

data/lib/use_cases.rb

@@ -15,6 +15,6 @@ module UseCases
   extend Dry::Configurable
 
   setting :container, reader: true
-  setting :publisher, ::UseCases::Events::Publisher, reader: true
-  setting :subscribers, [], reader: true
+  setting :publisher, default: ::UseCases::Events::Publisher.new, reader: true
+  setting :subscribers, default: [], reader: true
 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.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Ring Twice
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-29 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
@@ -178,7 +192,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
@@ -193,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Use Cases
 test_files: []