use_cases 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcffb088175f9ee545ae73905c1f3238839e7d3242501296b90349c821db0ed
-  data.tar.gz: 91cec0de97c7a2f92738f8121cf502621f046742526972b1ae091df168dd4b07
+  metadata.gz: '040658ce42b3542dc655d8102ebbaae334243a3e56a3854810c29b55e24e442d'
+  data.tar.gz: 9e9087416c8d4805dbb55d0fcff1f59628d8ec18b564099004bde75dbaa80142
 SHA512:
-  metadata.gz: d59c2125f78aea4cf498715b921628ad0c652488840ac6e79cc7b9b2fe33f804b2330eff0b5e9931c910c21f9de4393d055f3fd2fe45d61d6a484935ff7a2482
-  data.tar.gz: 20576bb2c209513f5e169b7723bdbe445648ba0121ed36bae8a86a846b408a7a205b7f65f41a376ddcea0b44a163431a3a6e9aeef53a64fff94a848ec3a03114
+  metadata.gz: 7f841052453fd910636c9a3c3fb073349cba385dc6faebc8af42b5c7dfce6ecf2202d29491b714590ce6d2f03a90b6940ca348ce1648b69c67db5ad92fc1a5c5
+  data.tar.gz: fb9e3a7b3b6e91e76121281519fade25f2e7cee12801696b5197e98b14630c1fe7ffac8c240a0de1aba5e290668631587cfa57e2297369454f5e0a4333e755e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    use_cases (1.1.0)
+    use_cases (1.1.3)
       activesupport
       dry-events
       dry-matcher

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.publish(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
@@ -16,7 +18,7 @@ module UseCases
 
       def publish(event_name, payload)
         super
-        PublishJob.perform_later(event_name, payload) if defined?(PublishJob)
+        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
@@ -15,7 +16,12 @@ module UseCases
       module StepPatch
         def initialize(*)
           super
-          finalize_subscriptions!
+          return unless options[:publish]
+
+          %w[success failure].map do |event_type|
+            event_id = [options[:publish], event_type].join(".")
+            Events::EventRegistry.register(event_id)
+          end
         end
 
         def call(*args)
@@ -33,26 +39,6 @@ module UseCases
           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
 
         def extract_payload(step_result, args)

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
 
@@ -69,12 +76,14 @@ module UseCases
           params.merge!(validation.to_h)
           Success(validation.to_h)
         else
-          Failure([:validation_error, validation.errors.to_h])
+          Failure([:validation_error, UseCases.transform_validation_errors.(validation.errors)])
         end
       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.1.0"
+  VERSION = "1.1.3"
 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,14 @@ 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) {}
+  setting :transform_validation_errors, default: ->(errors) { errors.to_h }, reader: true
+
+  def self.dry_validation
+    config_proc = config.dry_validation
+
+    Proc.new do 
+      config_proc.call(config)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_cases
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Ring Twice
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,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