Use always behaviour_definition instead just behaviour

Author: pitr-ch

lib/concurrent/actor/behaviour.rb

@@ -31,12 +31,12 @@ module Behaviour
       require 'concurrent/actor/behaviour/termination'
       require 'concurrent/actor/behaviour/terminates_children'
 
-      def self.basic_behaviour
+      def self.basic_behaviour_definition
         [*base,
          *user_messages(:terminate)]
       end
 
-      def self.restarting_behaviour
+      def self.restarting_behaviour_definition
         [*base,
          *supervising,
          *user_messages(:pause)]

lib/concurrent/actor/context.rb

@@ -122,7 +122,7 @@ def self.spawn_optionify(name_or_opts, *args)
     #   Ping.spawn(:ping1).ask(:m).value #=> :m
     class Context < AbstractContext
       def behaviour_definition
-        Behaviour.basic_behaviour
+        Behaviour.basic_behaviour_definition
       end
     end
 
@@ -136,7 +136,7 @@ def behaviour_definition
     # TODO usage
     class RestartingContext < AbstractContext
       def behaviour_definition
-        Behaviour.restarting_behaviour
+        Behaviour.restarting_behaviour_definition
       end
     end
   end

lib/concurrent/actor/core.rb

@@ -35,7 +35,7 @@ class Core
       # @option opts [Executor] executor, default is `Concurrent.configuration.global_task_pool`
       # @option opts [true, false] link, atomically link the actor to its parent
       # @option opts [true, false] supervise, atomically supervise the actor by its parent
-      # @option opts [[Array<Array(Behavior::Abstract, Array<Object>)>]] behaviour, array of pairs
+      # @option opts [Array<Array(Behavior::Abstract, Array<Object>)>] behaviour_definition, array of pairs
       #   where each pair is behaviour class and its args, see {Behaviour.basic_behaviour}
       # @option opts [IVar, nil] initialized, if present it'll be set or failed after {Context} initialization
       # @option opts [Proc, nil] logger a proc accepting (level, progname, message = nil, &block) params,
@@ -210,7 +210,7 @@ def handle_envelope(envelope)
       end
 
       def initialize_behaviours(opts)
-        @behaviour_definition = (Type! opts[:behaviour] || @context.behaviour_definition, Array).each do |v|
+        @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

spec/concurrent/actor_spec.rb

@@ -279,7 +279,8 @@ def on_message(message)
         it 'pauses on error' do
           queue = Queue.new
           test  = AdHoc.spawn :tester do
-            actor = AdHoc.spawn name: :pausing, behaviour: Behaviour.restarting_behaviour do
+            actor = AdHoc.spawn name:                 :pausing,
+                                behaviour_definition: Behaviour.restarting_behaviour_definition do
               queue << :init
               -> m { m == :add ? 1 : pass }
             end
@@ -306,7 +307,9 @@ def on_message(message)
           terminate_actors test
 
           test = AdHoc.spawn :tester do
-            actor = AdHoc.spawn name: :pausing, supervise: true, behaviour: Behaviour.restarting_behaviour do
+            actor = AdHoc.spawn name:                 :pausing,
+                                supervise:            true,
+                                behaviour_definition: Behaviour.restarting_behaviour_definition do
               queue << :init
               -> m { m == :add ? 1 : pass }
             end