plux 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c413ca368b438a31cc35c74e711937a80ccabad0c55520c73fdc41dd02f4db0
-  data.tar.gz: 20093ac7f6e387e77142896c28888dffcc947af9e9cc827117b0c015ad0d2b2d
+  metadata.gz: fe3a01341377759b20ec857779769a121787a2caa79d1f06c33871e779a4a2db
+  data.tar.gz: bdd9a7988dd40776d31b62989b59191b3474436f6a0a847869eb1b568de59303
 SHA512:
-  metadata.gz: 1684f9c33a9fab2dc02e2b957448e99d310c0ecf6e71f9e49a605d303b54bd12980654ca5f5c1e9566edf49b09fc5dcb7ead06b1ed5547e94f9fe9572b0308c1
-  data.tar.gz: 61ace71f940f837f41454a10262849cb090144c8402f29e79176fdd22917df41d8f87a6337aec8dcfe4fc876019363d7ad6078239271e20a5214e0c46e0f352d
+  metadata.gz: 1dda3d9c1d45d6acd3af4f8cdba9e3ba954b5d3c8ac0c35cada18ffcf89c08bfe7aabdf31ecb46de30c304a57a78c8762d1b66694244f0b7252974c12337fac5
+  data.tar.gz: 142cff4debc8825f8911d2c542d2f03e13a04d49d9a81a8cf414f313073d5be9eb67b608d58c8d03be0ec0a069d4db2c95b1c957769860bb7a841edb6abe05a6

data/README.md

@@ -26,12 +26,12 @@ Or install it yourself as:
 server = Plux.worker(:abc, thread: 2) do
 
   # prepare thread-safe resources like mq/db, to handle requests
-  def initialize
+  def prepare
     # @db = ...
   end
 
   # threads call this method to deal with clients' message
-  def work(msg)
+  def process(msg)
     # @db << parse(msg)
   end
 end

data/lib/plux.rb

@@ -34,7 +34,8 @@ module Plux
     end
 
     def worker(name, thread: 1, &block)
-      Server.new(name, thread: thread).boot(block)
+      worker = Class.new(&block).new
+      Server.new(name, thread: thread).boot(worker)
     end
   end
 

data/lib/plux/engine.rb

@@ -2,20 +2,7 @@ module Plux
   class Engine
 
     def initialize(name, thread: 1)
-      engine = self
-
-      @server = ::Plux.worker(name, thread: thread) do
-        instance_variable_set(:@engine, engine)
-
-        def initialize
-          @engine = self.class.instance_variable_get(:@engine)
-          @engine.prepare
-        end
-
-        def work(msg)
-          @engine.process(msg)
-        end
-      end
+      @server = Server.new(name, thread: thread).boot(self)
     end
 
     def connect

data/lib/plux/reactor.rb

@@ -42,7 +42,7 @@ module Plux
     def process
       @count.times.each do
         Thread.new do
-          loop{ @worker.work(@msg_q.deq) }
+          loop{ @worker.process(@msg_q.deq) }
         end
       end
     end

data/lib/plux/server.rb

@@ -14,9 +14,9 @@ module Plux
       @thread = thread
     end
 
-    def boot(block)
+    def boot(worker)
       Plux.lock_pid_file(name) do |file|
-        start_server_if_not_pid(file, block)
+        start_server_if_not_pid(file, worker)
       end
       self
     end
@@ -31,7 +31,7 @@ module Plux
 
     private
 
-    def start_server_if_not_pid(file, block)
+    def start_server_if_not_pid(file, worker)
       @pid = file.read.to_i
       return unless pid == 0
 
@@ -43,7 +43,7 @@ module Plux
         child.close
         UNIXServer.open(Plux.server_file(name)) do |serv|
           parent.close
-          worker = Proc === block ? Class.new(&block).new : block
+          worker.prepare
           reactor = Reactor.new(@thread, worker)
           loop{ reactor.register(serv.accept) }
         end

data/lib/plux/version.rb

@@ -1,3 +1,3 @@
 module Plux
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plux
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler