use_cases 1.0.12 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e41f6c5b8670e047cafdd85d068a66aa0efac27700f2c179d5d893ee1593c466
-  data.tar.gz: 629cef02e18325528d6155a34356b80e48acaf31520ef45fddb4937e058c3ad2
+  metadata.gz: c61b0fc85c1ed9ffdee1bc0f03b6991a7fcd9b64bb502e5b6859e5e124865068
+  data.tar.gz: b99383f71920f2c376e2bb197e4a7be3140630b36dcd33b3169bc15582adc5ac
 SHA512:
-  metadata.gz: 2b5fdb9fd7bd52211b9194abd49fa2247b9b814e26f763f25f0c9f3ee995dff527977a19e7192576565a563af19dbf3cfeccae833fbd74f4fba74fa4589f46a3
-  data.tar.gz: 7d51d14db15b08764a1bbf3dc6ccede0806085e532e42273e436f1c91029f911282c3da31495b978a7dc87d5ba569fa33bc077b1b15673d7df795c9bf53ed781
+  metadata.gz: 93f9d4b5b4f7492ac49d142b51336b6837c3ad8ff54706a1fa363bd851bd6f7d366e6131bb5e8399ef32de8e38608c07f33c8794ab7cb5fd571e6450b8f866f6
+  data.tar.gz: ea72716e2909d65ec10904df231262ba6104cab8e564eb99129f1ba2adfaf2a43b1e93b5ab7c1285aa3e72f76d52b9440e65ce2c7a5a903ae191685f4bee3a39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    use_cases (1.0.12)
+    use_cases (1.1.1)
       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/event_registry.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module UseCases
+  module Events
+    class EventRegistry
+      def self.register(event_id)
+        event_ids << 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
+
+      def self.event_ids
+        @event_ids ||= []
+      end
+    end
+  end
+end

data/lib/use_cases/events/publish_job.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
 
 return unless defined? ActiveJob
 
 module UseCases
   module Events
     class PublishJob < ActiveJob::Base
-      def perform(publish_key, payload)
-        publish_key += ".async"
-        UseCases.publisher.register_and_publish_event(publish_key, payload)
+      def perform(event_id, payload)
+        event_id += ".async"
+        Events::EventRegistry.register(event_id)
+        UseCases.publisher.publish(event_id, payload)
       end
     end
   end

data/lib/use_cases/events/publisher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dry/events/publisher"
 
 module UseCases
@@ -5,45 +7,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) && !event_name.to_s.end_with?(".async")
       end
     end
   end

data/lib/use_cases/events/subscriber.rb

@@ -1,12 +1,16 @@
-require "active_support/core_ext/class/subclasses"
+# frozen_string_literal: true
 
 module UseCases
   module Events
-    class Subscriber
-      def subscribed_to?(event_name)
-        event_handler_name = "on_#{event_name.gsub('.', '_')}"   
-        
-        respond_to?(event_handler_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.to_sym)
       end
     end
   end

data/lib/use_cases/module_optins/authorized.rb

@@ -17,10 +17,10 @@ module UseCases
           failure: :unauthorized,
           failure_message: "Not Authorized",
           merge_input_as: :resource
-        }
+        }.freeze
 
         def authorize(name, options = {})
-          options = DEFAULT_OPTIONS.merge(options)       
+          options = DEFAULT_OPTIONS.merge(options)
 
           check name, options
         end

data/lib/use_cases/module_optins/publishing.rb

@@ -3,16 +3,25 @@
 require "use_cases/events/publisher"
 require "use_cases/events/subscriber"
 require "use_cases/events/publish_job"
+require "use_cases/events/event_registry"
 
 module UseCases
   module ModuleOptins
     module Publishing
       def self.included(base)
         super
-        StepAdapters::Abstract.prepend StepCallPatch
+        StepAdapters::Abstract.prepend StepPatch
       end
 
-      module StepCallPatch
+      module StepPatch
+        def initialize(*)
+          super
+          %w[success failure].map do |event_type|
+            event_id = [options[:publish], event_type].join(".")
+            Events::EventRegistry.register(event_id)
+          end
+        end
+
         def call(*args)
           super(*args).tap do |result|
             publish_step_result(result, args)
@@ -25,7 +34,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.publish(key, payload)
         end
 
         private

data/lib/use_cases/module_optins.rb

@@ -16,7 +16,7 @@ module UseCases
       validated: Validated,
       prepared: Prepared,
       publishing: Publishing
-    }
+    }.freeze
 
     def [](*options)
       modules = [self]

data/lib/use_cases/rspec/matchers.rb

@@ -29,7 +29,7 @@ RSpec::Matchers.define(:be_failure_with_payload) do |expected_result|
     else
       "the use case was expected to fail but it succeeded with #{test_subject.success.inspect}"
     end
-  end  
+  end
 end
 
 RSpec::Matchers.define(:be_failure_with) do |*expected_failure|

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.1.1"
 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

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.12
+  version: 1.1.1
 platform: ruby
 authors:
 - Ring Twice
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-31 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
@@ -146,6 +160,7 @@ files:
 - lib/use_case.rb
 - lib/use_cases.rb
 - lib/use_cases/dsl.rb
+- lib/use_cases/events/event_registry.rb
 - lib/use_cases/events/publish_job.rb
 - lib/use_cases/events/publisher.rb
 - lib/use_cases/events/subscriber.rb
@@ -178,7 +193,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 +209,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: []