use_cases 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61b0fc85c1ed9ffdee1bc0f03b6991a7fcd9b64bb502e5b6859e5e124865068
-  data.tar.gz: b99383f71920f2c376e2bb197e4a7be3140630b36dcd33b3169bc15582adc5ac
+  metadata.gz: 34892c434db7409635d2628aee340dc76f71f2386c3b28c591b958d3fd7b9581
+  data.tar.gz: 922c959f22bbf32c82de1913a6384d46058eec701274dcaaee8dd5cb63fc09df
 SHA512:
-  metadata.gz: 93f9d4b5b4f7492ac49d142b51336b6837c3ad8ff54706a1fa363bd851bd6f7d366e6131bb5e8399ef32de8e38608c07f33c8794ab7cb5fd571e6450b8f866f6
-  data.tar.gz: ea72716e2909d65ec10904df231262ba6104cab8e564eb99129f1ba2adfaf2a43b1e93b5ab7c1285aa3e72f76d52b9440e65ce2c7a5a903ae191685f4bee3a39
+  metadata.gz: 8d2da877b7f1e0ad6e9cc01a560126110b8e53e9e1364b1cea07943318380c766499890b0bec5b67d8c3687742489f902cade0f76761cf6da693942cf01cc9c7
+  data.tar.gz: db808f18bb859f6f9faa2ac6aac8c6f5dcee9e820235e35b74bf5074fe262f7b477e2aa344c9d14d815b6739c2b47f7b530f3fdb8c84bf61c8f6407e41c6e237

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'bundler'
+    directory: '/'
+    schedule:
+      interval: 'monthly'

data/Gemfile.lock

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

data/README.md

@@ -68,7 +68,7 @@ end
 |---|---|
 | `:authorized` | Adds an extra `authorize` step macro, used to check user permissions. |
 | `:prepared` | Adds an extra `prepare` step macro, used to run some code before the use case runs. |
-| `:publishing` | Adds extra extra `publish` option to all steps, which allows a step to broadcast an event after executing | 
+| `:publishing` | Adds extra extra `publish`, `event_data` and `event_metadata` options to all steps, which allows a step to broadcast an event after executing | 
 | `:transactional` | Calls `#transaction` on a given `transaction_handler` object around the use case execution |
 | `:validated` | Adds all methods of `dry-transaction` to the use case DSL, which run validations on the received `params` object. | 
 
@@ -122,7 +122,7 @@ class Users::DeleteAccount
 
   authorize :user_owns_account?, failure_message: 'Cannot delete account'
   try :load_account, catch: ActiveRecord::RecordNotFound, failure: :account_not_found, failure_message: 'Account not found'
-  map :delete_account, publish: :account_deleted
+  map :delete_account, publish: :account_deleted, event_data: proc { |account| { account_id: account.id } }, event_metadata: proc { { published_by: 'users.delete_account' } }
   enqueue :send_farewell_email
 
   private 

data/lib/use_cases/module_optins/publishing.rb

@@ -16,6 +16,8 @@ module UseCases
       module StepPatch
         def initialize(*)
           super
+          return unless options[:publish]
+
           %w[success failure].map do |event_type|
             event_id = [options[:publish], event_type].join(".")
             Events::EventRegistry.register(event_id)
@@ -40,10 +42,10 @@ module UseCases
         private
 
         def extract_payload(step_result, args)
+          value = step_result.value!
           {
-            return_value: step_result.value!,
-            params: args[-2],
-            current_user: args[-1]
+            data: options[:event_data]&.call(value, args) || {},
+            metadata: options[:event_metadata]&.call(value, args) || {}
           }
         end
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UseCases
-  VERSION = "1.1.1"
+  VERSION = "1.1.4"
 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.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Ring Twice
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"