ntl-actor 0.4.0.pre1 → 0.4.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8390670d6cdb63d966590bc7456a583e424b21aa
-  data.tar.gz: 71bc7ef3d159c05ada78869eff267f6e683ff7a9
+  metadata.gz: dbe44cb51a0d65ba55a27567bf83be3730356148
+  data.tar.gz: a8b2ce1e78a1e2ed0ceaf03033143724708c985d
 SHA512:
-  metadata.gz: d9bc1d1dd129fa2d4275a3bb57a051826c7808f6d426c68cde2a3e336f1d70301ac2456729516dc7203e6a30a7ac8c17523e27d453270fd3f87867fca4acbcbf
-  data.tar.gz: 7164e075114eec599f0233c386f6bf77335e03edd140e51d28159d379e8b5280fc5181ffdce386f80ce6b6a37cb89076bbecedeee081a9fd4b84f72d1be879da
+  metadata.gz: 5e3bfa5de54e9b4100477c9ec769547aa10b075e527cef2f0a1af5a921e99d25ed13e286e5eb8ba981ea237c4132fd1478432f3cfe265ff672627c69b9405121
+  data.tar.gz: 93cfaa302f392e08de33928dbde3fb32713889e5b855f17e6e59fd1581c595c4d5acc39a85485059d95fe38b2cf3a52fd026d6503e9f5f8e1d5b7343775bf970

data/lib/actor.rb

@@ -21,6 +21,7 @@ require 'actor/messages'
 
 require 'actor/module/build'
 require 'actor/module/handle_macro'
+require 'actor/module/observers'
 require 'actor/module/start'
 require 'actor/module'
 
@@ -28,5 +29,6 @@ require 'actor/start'
 
 require 'actor/actor'
 
+require 'actor/future'
 require 'actor/router'
 require 'actor/supervisor'

data/lib/actor/address.rb

@@ -13,6 +13,6 @@ module Actor
   class Address
     NoneClass = Class.new Address
 
-    None = NoneClass.build Stream::Null
+    None = NoneClass.new Stream::Null, 'no-stream'
   end
 end

data/lib/actor/controls/actor.rb

@@ -32,6 +32,9 @@ module Actor
             Message.example
           end
         end
+
+        handle Message::Example do
+        end
       end
 
       class Stops

data/lib/actor/future.rb

@@ -0,0 +1,38 @@
+module Actor
+  class Future
+    attr_reader :reader
+    attr_accessor :message
+
+    def initialize reader
+      @reader = reader
+    end
+
+    def self.build &block
+      address = Address.build
+      reader = Messaging::Read.build address
+
+      instance = new reader
+
+      block.(address)
+
+      instance
+    end
+
+    def self.get wait: nil, &block
+      instance = build &block
+      instance.get wait: wait
+    end
+
+    def get wait: nil
+      return message unless message.nil?
+
+      self.message = reader.(wait: wait)
+    end
+
+    def ready?
+      get
+
+      message ? true : false
+    end
+  end
+end

data/lib/actor/messaging/read.rb

@@ -45,6 +45,10 @@ module Actor
           end
         end
       end
+
+      def messages_available?
+        not queue.empty?
+      end
     end
   end
 end

data/lib/actor/messaging/read/substitute.rb

@@ -12,6 +12,10 @@ module Actor
           message
         end
 
+        def messages_available?
+          messages.any?
+        end
+
         def add_message message
           messages << message
         end

data/lib/actor/module.rb

@@ -5,9 +5,12 @@ module Actor
         extend Build
         extend HandleMacro
         extend Start
+
+        include Observers
       end
     end
 
+    attr_writer :address
     attr_writer :reader
     attr_writer :writer
 
@@ -24,10 +27,14 @@ module Actor
       return if method.nil?
 
       if method.arity == 0
-        method.()
+        return_value = method.()
       else
-        method.(message)
+        return_value = method.(message)
       end
+
+      notify_observers message
+
+      return_value
     end
 
     def handle_stop
@@ -52,16 +59,23 @@ module Actor
 
       continuation_message = handle message
 
-      if continuation_message.is_a? Messaging::Message
+      if handle? continuation_message
         continuations << continuation_message
       end
     end
 
     def run_loop
-      loop do self.next end
+      loop do
+        self.next
+        Thread.pass
+      end
     end
     alias_method :start, :run_loop
 
+    def address
+      @address ||= Address::None
+    end
+
     def reader
       @reader ||= Messaging::Read::Substitute.new
     end

data/lib/actor/module/build.rb

@@ -8,6 +8,7 @@ module Actor
           instance = new *positional_arguments, **keyword_arguments, &block
         end
 
+        instance.address = address
         instance.reader = Messaging::Read.build address
         instance.writer = Messaging::Write.new
 

data/lib/actor/module/observers.rb

@@ -0,0 +1,47 @@
+module Actor
+  module Module
+    module Observers
+      def observe message_pattern, &callback
+        handler_method = HandleMacro::MethodName.get message_pattern
+
+        observer_id = callback.object_id
+
+        record = Observer.new observer_id, handler_method, callback
+
+        add_observer record
+      end
+
+      def add_observer record
+        observers = observer_registry[record.handler_method]
+
+        observers[record.observer_id] = record
+      end
+
+      def notify_observers message
+        handler_method = HandleMacro::MethodName.get message
+
+        observers = observer_registry[handler_method]
+
+        observers.each_value.map do |record|
+          callback = record.callback
+
+          callback.(message)
+        end
+      end
+
+      def remove_observer record
+        observers = observer_registry[record.handler_method]
+
+        observers.delete record.observer_id
+      end
+
+      def observer_registry
+        @observer_registry ||= Hash.new do |hash, handler_method|
+          hash[handler_method] = {}
+        end
+      end
+
+      Observer = Struct.new :observer_id, :handler_method, :callback
+    end
+  end
+end

data/lib/actor/router.rb

@@ -16,19 +16,7 @@ module Actor
     end
 
     handle :continue do
-      routed_messages = false
-
-      routes.each do |input_reader, outputs|
-        msg = input_reader.(wait: false)
-
-        next unless msg
-
-        routed_messages = true
-
-        outputs.each do |output|
-          writer.(msg, output)
-        end
-      end
+      routed_messages = route_messages
 
       unless routed_messages
         kernel.sleep Duration.millisecond
@@ -51,6 +39,15 @@ module Actor
       remove reader, output_address
     end
 
+    handle :stop do
+      if routes.any? { |reader, _| reader.messages_available? }
+        route_messages
+        :stop
+      else
+        super()
+      end
+    end
+
     def add reader, output_address
       routes[reader] << output_address
     end
@@ -59,6 +56,24 @@ module Actor
       routes[reader].delete output_address
     end
 
+    def route_messages
+      routed_messages = false
+
+      routes.each do |input_reader, outputs|
+        msg = input_reader.(wait: false)
+
+        next unless msg
+
+        routed_messages = true
+
+        outputs.each do |output|
+          writer.(msg, output)
+        end
+      end
+
+      routed_messages
+    end
+
     def configure
       self.kernel = Kernel
     end

data/lib/actor/start.rb

@@ -1,13 +1,15 @@
 module Actor
   class Start
     attr_writer :supervisor_address
-    attr_writer :thread
+    attr_writer :thread_class
     attr_writer :writer
 
     def self.build supervisor_address: nil
+      supervisor_address ||= Supervisor.address
+
       instance = new
       instance.supervisor_address = supervisor_address
-      instance.thread = Thread
+      instance.thread_class = Thread
       Messaging::Write.configure instance
       instance
     end
@@ -26,17 +28,21 @@ module Actor
       actor_started = Messages::ActorStarted.new address
       writer.(actor_started, supervisor_address)
 
-      self.thread.new do
+      thread = thread_class.new do
         actor.start
       end
+
+      thread.name = actor.class.name
+
+      thread
     end
 
     def supervisor_address
       @supervisor_address ||= Address::None
     end
 
-    def thread
-      @thread ||= Substitutes::Thread
+    def thread_class
+      @thread_class ||= Substitutes::Thread
     end
 
     def writer

data/lib/actor/supervisor.rb

@@ -2,20 +2,44 @@ module Actor
   class Supervisor
     include Actor
 
+    attr_reader :assembly
     attr_writer :broadcast_address
     attr_accessor :error
     attr_writer :thread_group
     attr_writer :router_address
 
+    def initialize &assembly
+      @assembly = assembly
+    end
+
+    def self.run &block
+      self.address, thread = start include: %i(thread), &block
+
+      thread.join
+    end
+
+    def self.address
+      @address ||= Address::None
+    end
+
+    def self.address= address
+      @address = address
+    end
+
     handle :start do
+      thread_group.add Thread.current
+      thread_group.enclose
+
+      assembly.(self) if assembly
+
       :continue
     end
 
-    handle :continue do |message|
+    handle :continue do
       if actor_threads.empty?
         :stop
       else
-        message
+        :continue
       end
     end
 
@@ -50,12 +74,9 @@ module Actor
     end
 
     def configure
-      thread_group = ThreadGroup.new
-      thread_group.add Thread.current
-
       self.broadcast_address = Address.build
       self.router_address = Router.start
-      self.thread_group = thread_group
+      self.thread_group = ThreadGroup.new
     end
 
     def broadcast_address

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntl-actor
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
+  version: 0.4.0.pre3
 platform: ruby
 authors:
 - Nathan Ladd
@@ -30,6 +30,7 @@ files:
 - lib/actor/controls/uuid.rb
 - lib/actor/destructure.rb
 - lib/actor/duration.rb
+- lib/actor/future.rb
 - lib/actor/messages.rb
 - lib/actor/messaging/message.rb
 - lib/actor/messaging/read.rb
@@ -39,6 +40,7 @@ files:
 - lib/actor/module.rb
 - lib/actor/module/build.rb
 - lib/actor/module/handle_macro.rb
+- lib/actor/module/observers.rb
 - lib/actor/module/start.rb
 - lib/actor/router.rb
 - lib/actor/start.rb