use_cases 1.0.13 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cec89e8a4f4ecdabae86c99156447d8b39ffd5de5e918130b21ccae18f045a7
-  data.tar.gz: e36cd9587aab933815775ee1181360ccea4a24e58e82c3a4a073a99bb565ff31
+  metadata.gz: 1acf28555c44f6ddde193195d340f9ea4dc9d3ffce2ec9ad5302d626bc3fa07a
+  data.tar.gz: eebecd33d8f5f64e0fc73e1174e7e32b7252d88f1c2de8543297ec3fd78fbab4
 SHA512:
-  metadata.gz: fdaa3ea0104e5bb38190c5c65f59e44569d38b08f0f4174e1c82f5f3b6f0698900a7001463dc3215007a2af2f4030616cc038ae2f2c78aba388b2cab90c520ad
-  data.tar.gz: 0c9663e589c521677529bb5b8a4cbe87c4c3591c82dfbc30ea9248b215c53f16c915f4a37dd3683f22b8dc7698f20e46e7cc8dfe20c5390ae9daaf418ee8e26d
+  metadata.gz: 9e728db5f63082ce761579c57bf3b9ab22a2059d5720823bfda3c90105b60be10dc7e93ad7d0c87cef7b848bbc2ffd061a4cd806e386c030b34b39c04974ae12
+  data.tar.gz: 7f04086052168ba6af1933d2e196fbb4e5053188270b72f3ebf245007863be40695aa10d3dc98c7ea53845c3f88bebb68d35f5a316f39203b36e0906694623df

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.subscribe_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,47 +7,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)
-        publish_async(event_name, payload) if event_should_be_published_asynchronously?(event_name)
-      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) && !event_name.to_s.end_with?(".async")
       end
     end
   end

data/lib/use_cases/events/subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UseCases
   module Events
     module Subscriber
@@ -6,8 +8,8 @@ module UseCases
       end
 
       def should_subscribe_to?(event_name)
-        event_handler_name = "on_#{event_name.gsub('.', '_')}"   
-        
+        event_handler_name = "on_#{event_name.gsub(".", "_")}"
+
         respond_to?(event_handler_name.to_sym)
       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,6 +3,7 @@
 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
@@ -13,29 +14,16 @@ 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]
+          return unless options[:publish]
 
-            UseCases.publisher.class.register_event(event_name)
+          %w[success failure].map do |event_type|
+            event_id = [options[:publish], event_type].join(".")
+            Events::EventRegistry.register(event_id)
           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)
@@ -48,7 +36,7 @@ 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
 
         private

data/lib/use_cases/module_optins/validated.rb

@@ -32,29 +32,36 @@ module UseCases
         def params(*args, &blk)
           _setup_validation
 
-          _contract_class.params(*args, &blk)
+          _contract_class.params(*args, &block_with_config(&blk))
         end
 
         def schema(*args, &blk)
           _setup_validation
 
-          _contract_class.schema(*args, &blk)
+          _contract_class.schema(*args, &block_with_config(&blk))
         end
 
         def rule(*args, &blk)
           _setup_validation
 
-          _contract_class.rule(*args, &blk)
+          _contract_class.rule(*args, &block_with_config(&blk))
         end
 
         def json(*args, &blk)
           _setup_validation
 
-          _contract_class.json(*args, &blk)
+          _contract_class.json(*args, &block_with_config(&blk))
         end
 
         def option(*args, &blk)
-          _contract_class.option(*args, &blk)
+          _contract_class.option(*args, &block_with_config(&blk))
+        end
+
+        def block_with_config(&blk)
+          Proc.new do 
+            instance_exec(&UseCases.dry_validation)
+            instance_exec(&blk) 
+          end
         end
       end
 
@@ -74,7 +81,9 @@ module UseCases
       end
 
       def contract
-        return self.class._contract_class.new if self.class._contract_class_defined?
+        return unless self.class._contract_class_defined?
+
+        self.class._contract_class.new
       end
 
       module ClassMethods

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/version.rb

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

data/lib/use_cases.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/configurable"
+require "dry/types"
 
 require_relative "use_case"
 require_relative "use_cases/version"
@@ -17,4 +18,13 @@ module UseCases
   setting :container, reader: true
   setting :publisher, default: ::UseCases::Events::Publisher.new, reader: true
   setting :subscribers, default: [], reader: true
+  setting :dry_validation, default: ->(config) {}
+
+  def self.dry_validation
+    config_proc = config.dry_validation
+
+    Proc.new do 
+      config_proc.call(config)
+    end
+  end
 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.13
+  version: 1.1.2
 platform: ruby
 authors:
 - Ring Twice
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-02-17 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