libuv 0.10.0 → 0.10.2

data/lib/libuv/tcp.rb

@@ -1,194 +1,205 @@
-require 'ipaddr'
-
-
-module Libuv
-    class TCP < Handle
-        include Stream, Net
-
-
-        KEEPALIVE_ARGUMENT_ERROR = "delay must be an Integer".freeze
-
-
-        def initialize(loop, acceptor = nil)
-            @loop = loop
-
-            tcp_ptr = ::Libuv::Ext.create_handle(:uv_tcp)
-            error = check_result(::Libuv::Ext.tcp_init(loop.handle, tcp_ptr))
-            error = check_result(::Libuv::Ext.accept(acceptor, tcp_ptr)) if acceptor && error.nil?
-            
-            super(tcp_ptr, error)
-        end
-
-        def bind(ip, port, callback = nil, &blk)
-            @on_listen = callback || blk
-            assert_type(String, ip, IP_ARGUMENT_ERROR)
-            assert_type(Integer, port, PORT_ARGUMENT_ERROR)
-
-            begin
-                @tcp_socket = create_socket(IPAddr.new(ip), port)
-                @tcp_socket.bind
-            rescue Exception => e
-                reject(e)
-            end
-        end
-
-        def accept(callback = nil, &blk)
-            tcp = nil
-            begin
-                tcp = TCP.new(loop, handle)
-            rescue Exception => e
-                @loop.log :info, :tcp_accept_failed, e
-            end
-            if tcp
-                begin
-                    (callback || blk).call(tcp)
-                rescue Exception => e
-                    @loop.log :error, :tcp_accept_cb, e
-                end
-            end
-            nil
-        end
-
-        def connect(ip, port, callback = nil, &blk)
-            @callback = callback || blk
-            assert_type(String, ip, IP_ARGUMENT_ERROR)
-            assert_type(Integer, port, PORT_ARGUMENT_ERROR)
-            
-            begin
-                @tcp_socket = create_socket(IPAddr.new(ip), port)
-                @tcp_socket.connect(callback(:on_connect))
-            rescue Exception => e
-                reject(e)
-            end
-        end
-
-        def sockname
-            sockaddr, len = get_sockaddr_and_len
-            check_result! ::Libuv::Ext.tcp_getsockname(handle, sockaddr, len)
-            get_ip_and_port(::Libuv::Sockaddr.new(sockaddr), len.get_int(0))
-        end
-
-        def peername
-            sockaddr, len = get_sockaddr_and_len
-            check_result! ::Libuv::Ext.tcp_getpeername(handle, sockaddr, len)
-            get_ip_and_port(::Libuv::Sockaddr.new(sockaddr), len.get_int(0))
-        end
-
-        def enable_nodelay
-            check_result ::Libuv::Ext.tcp_nodelay(handle, 1)
-        end
-
-        def disable_nodelay
-            check_result ::Libuv::Ext.tcp_nodelay(handle, 0)
-        end
-
-        def enable_keepalive(delay)
-            assert_type(Integer, delay, KEEPALIVE_ARGUMENT_ERROR)
-            check_result ::Libuv::Ext.tcp_keepalive(handle, 1, delay)
-        end
-
-        def disable_keepalive
-            check_result ::Libuv::Ext.tcp_keepalive(handle, 0, 0)
-        end
-
-        def enable_simultaneous_accepts
-            check_result ::Libuv::Ext.tcp_simultaneous_accepts(handle, 1)
-        end
-
-        def disable_simultaneous_accepts
-            check_result ::Libuv::Ext.tcp_simultaneous_accepts(handle, 0)
-        end
-
-
-        private
-
-
-        def create_socket(ip, port)
-            if ip.ipv4?
-                Socket4.new(loop, handle, ip.to_s, port)
-            else
-                Socket6.new(loop, handle, ip.to_s, port)
-            end
-        end
-
-        def on_connect(req, status)
-            ::Libuv::Ext.free(req)
-            @callback.call(self)
-        end
-
-
-        class SocketBase
-            include Resource
-
-            def initialize(loop, tcp, ip, port)
-                @tcp, @sockaddr = tcp, ip_addr(ip, port)
-            end
-
-            def bind
-                check_result!(tcp_bind)
-            end
-
-            def connect(callback)
-                check_result!(tcp_connect(callback))
-            end
-
-
-            private
-
-
-            def connect_req
-                ::Libuv::Ext.create_request(:uv_connect)
-            end
-        end
-
-
-        class Socket4 < SocketBase
-
-
-            private
-
-
-            def ip_addr(ip, port)
-                ::Libuv::Ext.ip4_addr(ip, port)
-            end
-
-            def tcp_bind
-                ::Libuv::Ext.tcp_bind(@tcp, @sockaddr)
-            end
-
-            def tcp_connect(callback)
-                ::Libuv::Ext.tcp_connect(
-                  connect_req,
-                  @tcp,
-                  @sockaddr,
-                  callback
-                )
-            end
-        end
-
-
-        class Socket6 < SocketBase
-
-
-            private
-
-
-            def ip_addr(ip, port)
-                ::Libuv::Ext.ip6_addr(ip, port)
-            end
-
-            def tcp_bind
-                ::Libuv::Ext.tcp_bind6(@tcp, @sockaddr)
-            end
-
-            def tcp_connect(callback)
-                ::Libuv::Ext.tcp_connect6(
-                  connect_req,
-                  @tcp,
-                  @sockaddr,
-                  callback
-                )
-            end
-        end
-    end
+require 'ipaddr'
+
+
+module Libuv
+    class TCP < Handle
+        include Stream, Net
+
+
+        KEEPALIVE_ARGUMENT_ERROR = "delay must be an Integer".freeze
+
+
+        def initialize(loop, acceptor = nil)
+            @loop = loop
+
+            tcp_ptr = ::Libuv::Ext.create_handle(:uv_tcp)
+            error = check_result(::Libuv::Ext.tcp_init(loop.handle, tcp_ptr))
+            error = check_result(::Libuv::Ext.accept(acceptor, tcp_ptr)) if acceptor && error.nil?
+            
+            super(tcp_ptr, error)
+        end
+
+        def bind(ip, port, callback = nil, &blk)
+            return if @closed
+            @on_listen = callback || blk
+            assert_type(String, ip, IP_ARGUMENT_ERROR)
+            assert_type(Integer, port, PORT_ARGUMENT_ERROR)
+
+            begin
+                @tcp_socket = create_socket(IPAddr.new(ip), port)
+                @tcp_socket.bind
+            rescue Exception => e
+                reject(e)
+            end
+        end
+
+        def accept(callback = nil, &blk)
+            tcp = nil
+            begin
+                raise RuntimeError, CLOSED_HANDLE_ERROR if @closed
+                tcp = TCP.new(loop, handle)
+            rescue Exception => e
+                @loop.log :info, :tcp_accept_failed, e
+            end
+            if tcp
+                begin
+                    (callback || blk).call(tcp)
+                rescue Exception => e
+                    @loop.log :error, :tcp_accept_cb, e
+                end
+            end
+            nil
+        end
+
+        def connect(ip, port, callback = nil, &blk)
+            return if @closed
+            @callback = callback || blk
+            assert_type(String, ip, IP_ARGUMENT_ERROR)
+            assert_type(Integer, port, PORT_ARGUMENT_ERROR)
+            
+            begin
+                @tcp_socket = create_socket(IPAddr.new(ip), port)
+                @tcp_socket.connect(callback(:on_connect))
+            rescue Exception => e
+                reject(e)
+            end
+        end
+
+        def sockname
+            return [] if @closed
+            sockaddr, len = get_sockaddr_and_len
+            check_result! ::Libuv::Ext.tcp_getsockname(handle, sockaddr, len)
+            get_ip_and_port(::Libuv::Sockaddr.new(sockaddr), len.get_int(0))
+        end
+
+        def peername
+            return [] if @closed
+            sockaddr, len = get_sockaddr_and_len
+            check_result! ::Libuv::Ext.tcp_getpeername(handle, sockaddr, len)
+            get_ip_and_port(::Libuv::Sockaddr.new(sockaddr), len.get_int(0))
+        end
+
+        def enable_nodelay
+            return if @closed
+            check_result ::Libuv::Ext.tcp_nodelay(handle, 1)
+        end
+
+        def disable_nodelay
+            return if @closed
+            check_result ::Libuv::Ext.tcp_nodelay(handle, 0)
+        end
+
+        def enable_keepalive(delay)
+            return if @closed
+            assert_type(Integer, delay, KEEPALIVE_ARGUMENT_ERROR)
+            check_result ::Libuv::Ext.tcp_keepalive(handle, 1, delay)
+        end
+
+        def disable_keepalive
+            return if @closed
+            check_result ::Libuv::Ext.tcp_keepalive(handle, 0, 0)
+        end
+
+        def enable_simultaneous_accepts
+            return if @closed
+            check_result ::Libuv::Ext.tcp_simultaneous_accepts(handle, 1)
+        end
+
+        def disable_simultaneous_accepts
+            return if @closed
+            check_result ::Libuv::Ext.tcp_simultaneous_accepts(handle, 0)
+        end
+
+
+        private
+
+
+        def create_socket(ip, port)
+            if ip.ipv4?
+                Socket4.new(loop, handle, ip.to_s, port)
+            else
+                Socket6.new(loop, handle, ip.to_s, port)
+            end
+        end
+
+        def on_connect(req, status)
+            ::Libuv::Ext.free(req)
+            @callback.call(self)
+        end
+
+
+        class SocketBase
+            include Resource
+
+            def initialize(loop, tcp, ip, port)
+                @tcp, @sockaddr = tcp, ip_addr(ip, port)
+            end
+
+            def bind
+                check_result!(tcp_bind)
+            end
+
+            def connect(callback)
+                check_result!(tcp_connect(callback))
+            end
+
+
+            private
+
+
+            def connect_req
+                ::Libuv::Ext.create_request(:uv_connect)
+            end
+        end
+
+
+        class Socket4 < SocketBase
+
+
+            private
+
+
+            def ip_addr(ip, port)
+                ::Libuv::Ext.ip4_addr(ip, port)
+            end
+
+            def tcp_bind
+                ::Libuv::Ext.tcp_bind(@tcp, @sockaddr)
+            end
+
+            def tcp_connect(callback)
+                ::Libuv::Ext.tcp_connect(
+                  connect_req,
+                  @tcp,
+                  @sockaddr,
+                  callback
+                )
+            end
+        end
+
+
+        class Socket6 < SocketBase
+
+
+            private
+
+
+            def ip_addr(ip, port)
+                ::Libuv::Ext.ip6_addr(ip, port)
+            end
+
+            def tcp_bind
+                ::Libuv::Ext.tcp_bind6(@tcp, @sockaddr)
+            end
+
+            def tcp_connect(callback)
+                ::Libuv::Ext.tcp_connect6(
+                  connect_req,
+                  @tcp,
+                  @sockaddr,
+                  callback
+                )
+            end
+        end
+    end
 end

data/lib/libuv/timer.rb

@@ -1,75 +1,88 @@
-module Libuv
-    class Timer < Handle
-        include Assertions
-
-
-        TIMEOUT_ERROR = "timeout must be an Integer".freeze
-        REPEAT_ERROR = "repeat must be an Integer".freeze
-
-
-        def initialize(loop, callback = nil)
-            @loop, @callback = loop, callback
-            
-            timer_ptr = ::Libuv::Ext.create_handle(:uv_timer)
-            error = check_result(::Libuv::Ext.timer_init(loop.handle, timer_ptr))
-
-            super(timer_ptr, error)
-        end
-
-        def start(timeout, repeat = 0)
-            return if @closed
-            
-            assert_type(Integer, timeout, TIMEOUT_ERROR)
-            assert_type(Integer, repeat, REPEAT_ERROR)
-
-            error = check_result ::Libuv::Ext.timer_start(handle, callback(:on_timer), timeout, repeat)
-            reject(error) if error
-        end
-
-        def stop
-            return if @closed
-            error = check_result ::Libuv::Ext.timer_stop(handle)
-            reject(error) if error
-        end
-
-        def again
-            return if @closed
-            error = check_result ::Libuv::Ext.timer_again(handle)
-            reject(error) if error
-        end
-
-        def repeat=(repeat)
-            return if @closed
-            assert_type(Integer, repeat, REPEAT_ERROR)
-            check_result ::Libuv::Ext.timer_set_repeat(handle, repeat)
-            reject(error) if error
-        end
-
-        def repeat
-            return if @closed
-            ::Libuv::Ext.timer_get_repeat(handle)
-        end
-
-        def progress(callback = nil, &blk)
-            @callback = callback || blk
-        end
-
-
-        private
-
-
-        def on_timer(handle, status)
-            e = check_result(status)
-
-            if e
-                reject(e)
-            else
-                begin
-                    @callback.call
-                rescue Exception => e
-                    @loop.log :error, :timer_cb, e
-                end
-            end
-        end
-    end
-end
+module Libuv
+    class Timer < Handle
+        include Assertions
+
+
+        TIMEOUT_ERROR = "timeout must be an Integer".freeze
+        REPEAT_ERROR = "repeat must be an Integer".freeze
+
+
+        # @param loop [::Libuv::Loop] loop this timer will be associated
+        # @param callback [Proc] callback to be called when the timer is triggered
+        def initialize(loop, callback = nil)
+            @loop, @callback = loop, callback
+            
+            timer_ptr = ::Libuv::Ext.create_handle(:uv_timer)
+            error = check_result(::Libuv::Ext.timer_init(loop.handle, timer_ptr))
+
+            super(timer_ptr, error)
+        end
+
+        # Enables the timer. A repeat of 0 means no repeat
+        #
+        # @param timeout [Fixnum] time in milliseconds before the timer callback is triggered the first time
+        # @param repeat [Fixnum] time in milliseconds between repeated callbacks after the first
+        def start(timeout, repeat = 0)
+            return if @closed
+            
+            assert_type(Integer, timeout, TIMEOUT_ERROR)
+            assert_type(Integer, repeat, REPEAT_ERROR)
+
+            error = check_result ::Libuv::Ext.timer_start(handle, callback(:on_timer), timeout, repeat)
+            reject(error) if error
+        end
+
+        # Disables the timer.
+        def stop
+            return if @closed
+            error = check_result ::Libuv::Ext.timer_stop(handle)
+            reject(error) if error
+        end
+
+        # Resets the current repeat
+        def again
+            return if @closed
+            error = check_result ::Libuv::Ext.timer_again(handle)
+            reject(error) if error
+        end
+
+        # Updates the repeat timeout
+        def repeat=(repeat)
+            return if @closed
+            assert_type(Integer, repeat, REPEAT_ERROR)
+            check_result ::Libuv::Ext.timer_set_repeat(handle, repeat)
+            reject(error) if error
+        end
+
+        # Returns the current repeat timeout
+        def repeat
+            return if @closed
+            ::Libuv::Ext.timer_get_repeat(handle)
+        end
+
+        # Used to update the callback to be triggered by the timer
+        #
+        # @param callback [Proc] the callback to be called by the timer
+        def progress(callback = nil, &blk)
+            @callback = callback || blk
+        end
+
+
+        private
+
+
+        def on_timer(handle, status)
+            e = check_result(status)
+
+            if e
+                reject(e)
+            else
+                begin
+                    @callback.call
+                rescue Exception => e
+                    @loop.log :error, :timer_cb, e
+                end
+            end
+        end
+    end
+end