evt-messaging 2.6.0.0 → 2.7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc052cd505024a0dc1c9ee66b8c7bf9233f1deb8efb4cc07f8bc67ac37dc1ca
-  data.tar.gz: 25087356a05e7d159345ef0f268d2fcb671dcac86f931236c7be25a49dd003d7
+  metadata.gz: d22a40f19386098d8d266f77e69a6c794324d30f018e96a4993eab0c5cfc20e1
+  data.tar.gz: 8d523d0b69b432eed9e06e8e24731a77f14809fd86df46aed900feb90b2d4e9c
 SHA512:
-  metadata.gz: cdf114d68c3a8102adf5a675eb2b784e36e51882b08b66e9ffeffeaf5cc0597741ae70a2326b6d14db69c3ab2ed5c9a41566f98eadaae3fec653617fa88ce067
-  data.tar.gz: 9438c70a8643db857dd6102f2ae22c5f4ca71e4dde416096a303e267a89c8ed0b6c71730fde5f9c1a5c1ab66db65c9eaad19f2128a6cab2c2e6a8584cf8a3a7c
+  metadata.gz: ea96206a951ad33ef9b7e7d52db38e9f9584adaa66d898cf77579608e16ebff7b597017d770bf143048809b964d3dd5d90da4bef7ab262516506ab0cfc53881c
+  data.tar.gz: 8655511a3ae29570de973f79b5cfd535be9f701fdd6c2a7625fb4e9f746315bcb377b35c560c18563e482af2f53096b2215dcca79956361c48e868f65d6e98c0

data/lib/messaging/controls/handler.rb

@@ -60,63 +60,6 @@ module Messaging
           end
         end
       end
-
-      module SessionArgument
-        class Example
-          include Messaging::Handle
-
-          attr_accessor :session
-
-          def configure(session: nil)
-            self.session = session
-          end
-        end
-
-        module Anomaly
-          module Required
-            class Example
-              include Messaging::Handle
-
-              def configure(session:)
-              end
-            end
-          end
-
-          module Positional
-            class Example
-              include Messaging::Handle
-
-              def configure(session)
-              end
-            end
-
-            module Optional
-              class Example
-                include Messaging::Handle
-
-                def configure(session=nil)
-                end
-              end
-            end
-          end
-        end
-      end
-
-      module Settings
-        Error = Class.new(RuntimeError)
-
-        class Example
-          include Messaging::Handle
-
-          setting :some_setting
-
-          attr_accessor :some_other_setting
-
-          def handle(message_data)
-            raise Settings::Error if some_setting.nil?
-          end
-        end
-      end
     end
   end
 end

data/lib/messaging/handle.rb

@@ -6,7 +6,6 @@ module Messaging
       cls.class_exec do
         include Dependency
         include Virtual
-        include Settings::Setting
 
         def handler_logger
           @handler_logger ||= Log.get(self)
@@ -26,37 +25,49 @@ module Messaging
     end
 
     module Build
+      Error = Class.new(RuntimeError)
+
       def build(strict: nil, session: nil, settings: nil)
         instance = new
         instance.strict = strict
 
-        if not settings.nil?
-          settings.set(instance)
+        arguments = {}
+
+        if Build.send_session?(session, instance)
+          arguments[:session] = session
         end
 
-        if Build.configure_session?(instance)
-          instance.configure(session: session)
-        else
-          instance.configure
+        if Build.send_settings?(settings, instance)
+          arguments[:settings] = settings
         end
 
+        instance.configure(**arguments)
+
         instance
       end
 
-      def self.configure_session?(instance)
+      def self.send_session?(session, instance)
+        configure?(instance, :session) && !session.nil?
+      end
+
+      def self.send_settings?(settings, instance)
+        configure?(instance, :settings) && !settings.nil?
+      end
+
+      def self.configure?(instance, parameter_name)
         configure_method = instance.method(:configure)
 
         parameter_type, _ = configure_method.parameters.find do |type, name|
-          name == :session
+          name == parameter_name
         end
 
         return false if parameter_type.nil?
 
-        return true if parameter_type == :key
+        return true if [:key, :keyreq].include?(parameter_type)
 
-        error_message = "Optional session parameter of configure is not a keyword argument (Type: #{parameter_type.inspect})"
+        error_message = "Incorrect definition of handler's configure method. The #{parameter_name} parameter must be a keyword argument (Handler: #{instance.class}, Parameter Type: #{parameter_type.inspect})"
         handler_logger.error(tag: :handle) { error_message }
-        raise ArgumentError, error_message
+        raise Error, error_message
       end
 
       def self.handler_logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-messaging
 version: !ruby/object:Gem::Version
-  version: 2.6.0.0
+  version: 2.7.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store