Handler's configure session keyword parameter can be optional or requ…

…ired

lib/messaging/controls/handler.rb

@@ -61,47 +61,6 @@ class Example
         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)
 

lib/messaging/handle.rb

@@ -26,6 +26,8 @@ def handler_logger
     end
 
     module Build
+      Error = Class.new(RuntimeError)
+
       def build(strict: nil, session: nil, settings: nil)
         instance = new
         instance.strict = strict
@@ -34,7 +36,7 @@ def build(strict: nil, session: nil, settings: nil)
           settings.set(instance)
         end
 
-        if Build.configure_session?(instance)
+        if Build.send_session?(session, instance)
           instance.configure(session: session)
         else
           instance.configure
@@ -43,20 +45,24 @@ def build(strict: nil, session: nil, settings: nil)
         instance
       end
 
+      def self.send_session?(session, instance)
+        configure_session?(instance) && !session.nil?
+      end
+
       def self.configure_session?(instance)
         configure_method = instance.method(:configure)
 
-        parameter_type, _ = configure_method.parameters.find do |type, name|
+        parameter_type, _name = configure_method.parameters.find do |type, name|
           name == :session
         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. Session parameter must be a keyword argument (Handler: #{instance.class}, Session 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

test/automated/handle/session_configuration/configure_method_accepts_session.rb

@@ -2,16 +2,26 @@
 
 context "Handle" do
   context "Session Configuration" do
-    context "Configure Method Accepts Session Argument" do
-      handler_class = Controls::Handler::SessionArgument::Example
+    context "Session is an optional keyword argument" do
+      handler_class = Class.new do
+        include Messaging::Handle
+
+        attr_accessor :session
+
+        def configure(session: nil)
+          self.session = session
+        end
+      end
 
       context "Given" do
         session = Object.new
 
-        handler = handler_class.build(session: session)
+        context "Session is passed to configure method" do
+          handler = handler_class.build(session: session)
 
-        test "Session is passed to configure method" do
-          assert(handler.session.equal?(session))
+          test do
+            assert(handler.session.equal?(session))
+          end
         end
       end
 
@@ -23,5 +33,37 @@
         end
       end
     end
+
+    context "Session is a required keyword argument" do
+      handler_class = Class.new do
+        include Messaging::Handle
+
+        attr_accessor :session
+
+        def configure(session:)
+          self.session = session
+        end
+      end
+
+      context "Given" do
+        session = Object.new
+
+        context "Session is passed to configure method" do
+          handler = handler_class.build(session: session)
+
+          test do
+            assert(handler.session.equal?(session))
+          end
+        end
+      end
+
+      context "Not Given" do
+        test "Argument error is raised" do
+          assert_raises(ArgumentError) do
+            handler_class.build
+          end
+        end
+      end
+    end
   end
 end

test/automated/handle/session_configuration/invalid_session_parameter_definition.rb

@@ -0,0 +1,37 @@
+require_relative '../../automated_init'
+
+context "Handle" do
+  context "Session Configuration" do
+    context "Invalid Session Parameter Definition" do
+      context "Session is a Positional Argument" do
+        handler_class = Class.new do
+          include Messaging::Handle
+
+          def configure(session)
+          end
+        end
+
+        test "Is an error" do
+          assert_raises(Messaging::Handle::Build::Error) do
+            handler_class.build
+          end
+        end
+      end
+
+      context "Session Is an Optional Positional Argument" do
+        handler_class = Class.new do
+          include Messaging::Handle
+
+          def configure(session=nil)
+          end
+        end
+
+        test "Is an error" do
+          assert_raises(Messaging::Handle::Build::Error) do
+            handler_class.build
+          end
+        end
+      end
+    end
+  end
+end

test/automated/handle/session_configuration/bare_configure_method.rb → test/automated/handle/session_configuration/parameterless_configure_method.rb

@@ -2,7 +2,7 @@
 
 context "Handle" do
   context "Session Configuration" do
-    context "Bare Configure Method" do
+    context "Parameterless Configure Method" do
       handler_class = Controls::Handler::Example
 
       context "Given" do