lightio 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743e461666313c581ce9bea53674e037a237d3a9
-  data.tar.gz: 381120d60e506278cb77c80ad8d2384fed8f51a0
+  metadata.gz: 9cba17ec9773ba60846027a6cff7134fe1d39c61
+  data.tar.gz: 5d0f6c807416b005ae82720145b226201035f1b4
 SHA512:
-  metadata.gz: 68d02d089da02ecf3a7aaeb2562c48a6e8c64d14b7c56ec88859fb7d0c8e926054bdc92af26057ffdad0da3fedf6697b26d6c8da59931b05c532cd2aa8aa1864
-  data.tar.gz: 230877f84e6c54a89f7afbeaa47cc8328e52b6b8d51936bd91c11f86954c061ee8772f5d65cae014bc2c82fcae5c8f826fbbf089e31f4688697efb6300bab4aa
+  metadata.gz: fe88bd0666ea6e80af7730ed55050b797209d71e36779cd188305ab0782ee39a54853b40c34f36b9c10a159d78b0553504d54236b4a212e320d6568af9209569
+  data.tar.gz: 63874db77eef6d3b89a96ef1bce0ce2ff2304bad349b21338e57910aead782521a48d14af2db8bd2c134d089291b9e68985a0d7b695593076db4d2f7cd053217

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lightio (0.2.0)
+    lightio (0.2.1)
       nio4r (~> 2.1)
 
 GEM

data/README.md

@@ -43,7 +43,7 @@ The following documentations is also usable:
 
 ## Discussion
 
-[Discussion on Gitter](https://gitter.im/lightio-dev/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
+https://groups.google.com/group/lightio
 
 ## Development
 

data/lib/lightio/library/io.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 module LightIO::Library
   class IO
-    include LightIO::Wrap::Wrapper
+    include LightIO::Wrap::IOWrapper
     wrap ::IO
 
     extend Forwardable
@@ -33,6 +33,16 @@ module LightIO::Library
       outbuf
     end
 
+    def close(*args)
+      # close watcher before io closed
+      @io_watcher&.close
+      @io.close(*args)
+    end
+
+    def to_io
+      self
+    end
+
     class << self
       def open(*args)
         io = self.new(*args)

data/lib/lightio/library/socket.rb

@@ -1,22 +1,89 @@
 require 'socket'
+
 module LightIO::Library
 
-  class BasicSocket < IO
+  class Addrinfo
     include LightIO::Wrap::Wrapper
+    wrap ::Addrinfo
+
+    module WrapperHelper
+      protected
+      def wrap_socket_method(method)
+        define_method method do |*args|
+          socket = Socket._wrap(@io.send(method, *args))
+          if block_given?
+            begin
+              yield socket
+            ensure
+              socket.close
+            end
+          else
+            socket
+          end
+        end
+      end
+
+      def wrap_socket_methods(*methods)
+        methods.each {|m| wrap_socket_method(m)}
+      end
+
+      def wrap_addrinfo_return_method(method)
+        define_method method do |*args|
+          result = (@io || raw_class).send(method, *args)
+          if result.is_a?(raw_class)
+            _wrap(result)
+          elsif result.respond_to?(:map)
+            result.map {|r| _wrap(r)}
+          else
+            result
+          end
+        end
+      end
+
+      def wrap_addrinfo_return_methods(*methods)
+        methods.each {|m| wrap_addrinfo_return_method(m)}
+      end
+    end
+
+    extend WrapperHelper
+
+    wrap_socket_methods :bind, :connect, :connect_from, :connect_to, :listen
+
+    wrap_addrinfo_return_methods :family_addrinfo, :ipv6_to_ipv4
+
+    class << self
+      extend WrapperHelper
+
+      def foreach(*args, &block)
+        Addrinfo.getaddrinfo(*args).each(&block)
+      end
+
+      wrap_addrinfo_return_methods :getaddrinfo, :ip, :udp, :tcp, :unix
+    end
+  end
+
+  class BasicSocket < IO
+    include LightIO::Wrap::IOWrapper
     wrap ::BasicSocket
 
     wrap_blocking_methods :recv, :recvmsg, :sendmsg
 
+    def shutdown(*args)
+      # close watcher before io shutdown
+      @io_watcher.close
+      @io.shutdown(*args)
+    end
+
     class << self
       def for_fd(fd)
-        Socket._wrap(raw_class.for_fd(fd))
+        self._wrap(raw_class.for_fd(fd))
       end
     end
   end
 
   class Socket < BasicSocket
     include ::Socket::Constants
-    include LightIO::Wrap::Wrapper
+    include LightIO::Wrap::IOWrapper
     wrap ::Socket
 
     wrap_blocking_methods :connect, :recvfrom
@@ -24,7 +91,7 @@ module LightIO::Library
     ## implement ::Socket instance methods
     def accept
       socket, addrinfo = wait_nonblock(:accept_nonblock)
-      [Socket._wrap(socket), LightIO::Library::Addrinfo._wrap(addrinfo)]
+      [self.class._wrap(socket), Addrinfo._wrap(addrinfo)]
     end
 
     def sys_accept
@@ -61,7 +128,7 @@ module LightIO::Library
 
 
   class IPSocket < BasicSocket
-    include LightIO::Wrap::Wrapper
+    include LightIO::Wrap::IOWrapper
     wrap ::IPSocket
 
     class << self
@@ -70,19 +137,19 @@ module LightIO::Library
   end
 
   class TCPSocket < IPSocket
-    include LightIO::Wrap::Wrapper
+    include LightIO::Wrap::IOWrapper
     wrap ::TCPSocket
     wrap_methods_run_in_threads_pool :gethostbyname
   end
 
   class TCPServer < TCPSocket
-    include LightIO::Wrap::Wrapper
+    include LightIO::Wrap::IOWrapper
     wrap ::TCPServer
 
     ## implement ::Socket instance methods
     def accept
       socket = wait_nonblock(:accept_nonblock)
-      Socket._wrap(socket)
+      TCPSocket._wrap(socket)
     end
 
     def sys_accept

data/lib/lightio/version.rb

@@ -1,3 +1,3 @@
 module LightIO
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/lightio/wrap.rb

@@ -1,36 +1,86 @@
 module LightIO::Wrap
   WRAPPERS = {}
+  RAW_IO = ::IO
+
+  # wrapper for normal ruby objects
   module Wrapper
-    # wrap raw ruby io objects
+    # wrap raw ruby objects
     #
-    # @param [IO, Socket]  io raw ruby io object
+    # @param [Object] io raw ruby object, param name is 'io' just for consistent
     def initialize(io=nil)
       @io ||= io
-      @io_watcher ||= LightIO::Watchers::IO.new(@io)
     end
 
     def method_missing(method, *args)
       @io.public_send(method, *args)
     end
 
-    def close(*args)
-      # close watcher before io closed
-      @io_watcher.close
-      @io.close(*args)
+    # both works in class scope and singleton class scope
+    module SingletonClassCommonMethods
+      protected
+      # run method in thread pool for performance
+      def wrap_methods_run_in_threads_pool(*args)
+        #TODO
+      end
     end
 
-    def shutdown(*args)
-      # close watcher before io shutdown
-      @io_watcher.close
-      @io.shutdown(*args)
+    module ClassMethods
+      # Wrap raw io objects
+      def _wrap(io)
+        # In case ruby stdlib return already patched Sockets, just do nothing
+        if io.is_a? self
+          io
+        else
+          # old new
+          obj = allocate
+          obj.send(:initialize, io)
+          obj
+        end
+      end
+
+      # override new method, return wrapped class
+      def new(*args)
+        io = raw_class.new(*args)
+        _wrap(io)
+      end
+
+      include SingletonClassCommonMethods
+
+      protected
+
+      attr_reader :raw_class
+
+      # Set wrapped class
+      def wrap(raw_class)
+        @raw_class=raw_class
+        WRAPPERS[raw_class] = self
+      end
+
+      def method_missing(method, *args)
+        raw_class.public_send(method, *args)
+      end
     end
 
-    protected
-    def _wrap(io=nil)
-      @io ||= io
+    class << self
+      def included(base)
+        base.send :extend, ClassMethods
+        base.singleton_class.send :extend, SingletonClassCommonMethods
+      end
+    end
+  end
+
+  # wrapper for ruby io objects
+  module IOWrapper
+    include Wrapper
+    # wrap raw ruby io objects
+    #
+    # @param [IO, Socket]  io raw ruby io object
+    def initialize(io=nil)
+      super
       @io_watcher ||= LightIO::Watchers::IO.new(@io)
     end
 
+    protected
     # wait io nonblock method
     #
     # @param [Symbol]  method method name, example: wait_nonblock
@@ -51,45 +101,16 @@ module LightIO::Wrap
             else
               return result
           end
-        rescue IO::WaitReadable
+        rescue RAW_IO::WaitReadable
           @io_watcher.wait_readable
-        rescue IO::WaitWritable
+        rescue RAW_IO::WaitWritable
           @io_watcher.wait_writable
         end
       end
     end
 
-    # both works in class scope and singleton class scope
-    module SingletonClassCommonMethods
-      protected
-      # run method in thread pool for performance
-      def wrap_methods_run_in_threads_pool(*args)
-        #TODO
-      end
-    end
-
     module ClassMethods
-      # Wrap raw io objects
-      def _wrap(io)
-        # In case ruby stdlib return already patched Sockets, just do nothing
-        if io.is_a? self
-          io
-        else
-          # old new
-          obj = allocate
-          obj.send(:initialize, io)
-          obj
-        end
-      end
-
-      # override new method, return wrapped class
-      def new(*args)
-        io = raw_class.new(*args)
-        _wrap(io)
-      end
-
-      include SingletonClassCommonMethods
-
+      include Wrapper::ClassMethods
       protected
       # wrap blocking method with "#{method}_nonblock"
       #
@@ -103,29 +124,12 @@ module LightIO::Wrap
       def wrap_blocking_methods(*methods, exception_symbol: true)
         methods.each {|m| wrap_blocking_method(m, exception_symbol: exception_symbol)}
       end
-
-      attr_reader :raw_class
-
-      # Set wrapped class
-      def wrap(raw_class)
-        @raw_class=raw_class
-        WRAPPERS[raw_class] = self
-      end
-
-      def method_missing(method, *args)
-        raw_class.public_send(method, *args)
-      end
     end
 
     class << self
-      def new_and_wrap(*args)
-        io = raw_class.new(*args)
-        _wrap(io)
-      end
-
       def included(base)
+        Wrapper.included(base)
         base.send :extend, ClassMethods
-        base.singleton_class.send :extend, SingletonClassCommonMethods
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jiang Jinyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r