Simplify behavior definition

Author: pitr-ch

lib/concurrent/actor/behaviour.rb

@@ -70,14 +70,14 @@ module Behaviour
 
       # Array of behaviours and their construction parameters.
       #
-      #     [[Behaviour::SetResults, [:terminate!]],
-      #      [Behaviour::RemovesChild, []],
-      #      [Behaviour::Termination, []],
-      #      [Behaviour::TerminatesChildren, []],
-      #      [Behaviour::Linking, []],
-      #      [Behaviour::Awaits, []],
-      #      [Behaviour::ExecutesContext, []],
-      #      [Behaviour::ErrorsOnUnknownMessage, []]]
+      #     [[Behaviour::SetResults, :terminate!],
+      #      [Behaviour::RemovesChild],
+      #      [Behaviour::Termination],
+      #      [Behaviour::TerminatesChildren],
+      #      [Behaviour::Linking],
+      #      [Behaviour::Awaits],
+      #      [Behaviour::ExecutesContext],
+      #      [Behaviour::ErrorsOnUnknownMessage]]
       #
       # @see '' its source code
       def self.basic_behaviour_definition
@@ -88,17 +88,16 @@ def self.basic_behaviour_definition
 
       # Array of behaviours and their construction parameters.
       #
-      #     [[Behaviour::SetResults, [:pause!]],
-      #      [Behaviour::RemovesChild, []],
-      #      [Behaviour::Termination, []],
-      #      [Behaviour::TerminatesChildren, []],
-      #      [Behaviour::Linking, []],
-      #      [Behaviour::Supervised, []],
-      #      [Behaviour::Pausing, []],
-      #      [Behaviour::Supervising, [:reset!, :one_for_one]],
-      #      [Behaviour::Awaits, []],
-      #      [Behaviour::ExecutesContext, []],
-      #      [Behaviour::ErrorsOnUnknownMessage, []]]
+      #     [[Behaviour::SetResults, :pause!],
+      #      [Behaviour::RemovesChild],
+      #      [Behaviour::Termination],
+      #      [Behaviour::TerminatesChildren],
+      #      [Behaviour::Linking],
+      #      [Behaviour::Pausing],
+      #      [Behaviour::Supervising, :reset!, :one_for_one],
+      #      [Behaviour::Awaits],
+      #      [Behaviour::ExecutesContext],
+      #      [Behaviour::ErrorsOnUnknownMessage]]
       #
       # @see '' its source code
       def self.restarting_behaviour_definition(handle = :reset!, strategy = :one_for_one)
@@ -111,33 +110,33 @@ def self.restarting_behaviour_definition(handle = :reset!, strategy = :one_for_o
 
       # @see '' its source code
       def self.base(on_error)
-        [[SetResults, [on_error]],
+        [[SetResults, on_error],
          # has to be before Termination to be able to remove children form terminated actor
-         [RemovesChild, []],
-         [Termination, []],
-         [TerminatesChildren, []]]
+         RemovesChild,
+         Termination,
+         TerminatesChildren]
       end
 
       # @see '' its source code
       def self.linking
-        [[Linking, []]]
+        [Linking]
       end
 
       # @see '' its source code
       def self.supervised
-        [[Pausing, []]]
+        [Pausing]
       end
 
       # @see '' its source code
       def self.supervising(handle = :reset!, strategy = :one_for_one)
-        [[Behaviour::Supervising, [handle, strategy]]]
+        [[Behaviour::Supervising, handle, strategy]]
       end
 
       # @see '' its source code
       def self.user_messages
-        [[Awaits, []],
-         [ExecutesContext, []],
-         [ErrorsOnUnknownMessage, []]]
+        [Awaits,
+         ExecutesContext,
+         ErrorsOnUnknownMessage]
       end
     end
   end

lib/concurrent/actor/core.rb

@@ -202,15 +202,12 @@ def process_envelope(envelope)
       private
 
       def initialize_behaviours(opts)
-        @behaviour_definition = (Type! opts[:behaviour_definition] || @context.behaviour_definition, Array).each do |v|
-          Type! v, Array
-          Match! v.size, 2
-          Child! v[0], Behaviour::Abstract
-          Type! v[1], Array
+        @behaviour_definition = (Type! opts[:behaviour_definition] || @context.behaviour_definition, Array).each do |(behaviour, *args)|
+          Child! behaviour, Behaviour::Abstract
         end
         @behaviours           = {}
         @first_behaviour      = @behaviour_definition.reverse.
-            reduce(nil) { |last, (behaviour, args)| @behaviours[behaviour] = behaviour.new(self, last, opts, *args) }
+            reduce(nil) { |last, (behaviour, *args)| @behaviours[behaviour] = behaviour.new(self, last, opts, *args) }
       end
     end
   end

spec/concurrent/actor_spec.rb

@@ -338,11 +338,11 @@ def on_message(message)
 
         it 'pauses on error and restarts' do
           queue              = Queue.new
-          resuming_behaviour = Behaviour.restarting_behaviour_definition.map do |c, args|
+          resuming_behaviour = Behaviour.restarting_behaviour_definition.map do |c, *args|
             if Behaviour::Supervising == c
-              [c, [:restart!, :one_for_one]]
+              [c, *[:restart!, :one_for_one]]
             else
-              [c, args]
+              [c, *args]
             end
           end