ione 1.2.0.pre1 → 1.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48f64612b814b95e3c12619aad2ad8da60d00f7b
-  data.tar.gz: 6094996f6fedbe6449c0033cae40ccc19cafe46c
+  metadata.gz: 571332add4f394d8de9adbe6b371de13c84e3a09
+  data.tar.gz: 006892c0ffe2f9fdb489ba5848d28be6e45ad27c
 SHA512:
-  metadata.gz: 00e1194cf9716e8f5030b634f21740d622c96862682a0427266dd76fa453290ed60460b2fdae08f9165d28df12bbfa3ca24de2d03043935c3407335a5e85afd5
-  data.tar.gz: 9dda73caa92ee3a8f5853f3edf81496082e9c748663295b2f6f5c1f6c5a21f324d54d8e921a3afb4ec580e8253b0d1c5e24ecf2985a7684a10a962b926f25612
+  metadata.gz: f41e94213226b72a09487b4ff615ab01b3be84ffe351f5dcd78ef2e350a0bcc17b117395fdcf35944d8ab78f4ae9383821140fa43cfb15866f9e78af9cc970ec
+  data.tar.gz: 91778d76c5ef9fdf87ec0d51a29abb495056d0e3843badaec6ca6eeb86683f4aa82948a6e0a68d93ddf0dc012e54eafe4d84ba91d4d38224de3eb658297f1c2e

data/lib/ione/future.rb

@@ -44,7 +44,7 @@ module Ione
     #
     # @param [Ione::Future] future the future to observe
     def observe(future)
-      future.on_complete do |_, v, e|
+      future.on_complete do |v, e|
         if e
           fail(e)
         else
@@ -215,7 +215,7 @@ module Ione
     # @return [Ione::Future] a new future representing the transformed value
     def map(value=nil, &block)
       f = CompletableFuture.new
-      on_complete do |_, v, e|
+      on_complete do |v, e|
         if e
           f.fail(e)
         else
@@ -242,13 +242,13 @@ module Ione
     # @return [Ione::Future] a new future representing the transformed value
     def flat_map(&block)
       f = CompletableFuture.new
-      on_complete do |_, v, e|
+      on_complete do |v, e|
         if e
           f.fail(e)
         else
           begin
             ff = block.call(v)
-            ff.on_complete do |_, vv, ee|
+            ff.on_complete do |vv, ee|
               if ee
                 f.fail(ee)
               else
@@ -288,14 +288,14 @@ module Ione
     # @return [Ione::Future] a new future representing the transformed value
     def then(&block)
       f = CompletableFuture.new
-      on_complete do |_, v, e|
+      on_complete do |v, e|
         if e
           f.fail(e)
         else
           begin
             fv = block.call(v)
             if fv.respond_to?(:on_complete)
-              fv.on_complete do |_, vv, ee|
+              fv.on_complete do |vv, ee|
                 if ee
                   f.fail(ee)
                 else
@@ -334,7 +334,7 @@ module Ione
     # @return [Ione::Future] a new future representing a value recovered from the error
     def recover(value=nil, &block)
       f = CompletableFuture.new
-      on_complete do |_, v, e|
+      on_complete do |v, e|
         if e
           begin
             f.resolve(block ? block.call(e) : value)
@@ -372,11 +372,11 @@ module Ione
     #   error
     def fallback(&block)
       f = CompletableFuture.new
-      on_complete do |_, v, e|
+      on_complete do |v, e|
         if e
           begin
             ff = block.call(e)
-            ff.on_complete do |_, vv, ee|
+            ff.on_complete do |vv, ee|
               if ee
                 f.fail(ee)
               else
@@ -401,8 +401,8 @@ module Ione
     #
     # @yieldparam [Object] value the value of the resolved future
     def on_value(&listener)
-      on_complete do |f, value|
-        listener.call(value) if f.resolved?
+      on_complete do |value, error|
+        listener.call(value) unless error
       end
       nil
     end
@@ -413,8 +413,8 @@ module Ione
     #
     # @yieldparam [Error] error the error that failed the future
     def on_failure(&listener)
-      on_complete do |f, _, error|
-        listener.call(error) if f.failed?
+      on_complete do |_, error|
+        listener.call(error) if error
       end
       nil
     end
@@ -456,7 +456,7 @@ module Ione
         end
       end
       if run_immediately
-        listener.call(self, @value, @error) rescue nil
+        call_listener(listener)
       end
       nil
     end
@@ -493,6 +493,7 @@ module Ione
         semaphore.pop
       end
     end
+    alias_method :get, :value
 
     # Returns true if this future is resolved or failed
     def completed?
@@ -526,6 +527,25 @@ module Ione
         @lock.unlock
       end
     end
+
+    private
+
+    def call_listener(listener)
+      begin
+        n = listener.arity
+        if n == 1
+          listener.call(self)
+        elsif n == 2 || n == -3
+          listener.call(@value, @error)
+        elsif n == 0
+          listener.call
+        else
+          listener.call(@value, @error, self)
+        end
+      rescue
+        # swallowed
+      end
+    end
   end
 
   # @private
@@ -543,7 +563,7 @@ module Ione
         @lock.unlock
       end
       listeners.each do |listener|
-        listener.call(self, v, nil) rescue nil
+        call_listener(listener)
       end
       nil
     end
@@ -561,7 +581,7 @@ module Ione
         @lock.unlock
       end
       listeners.each do |listener|
-        listener.call(self, nil, error) rescue nil
+        call_listener(listener)
       end
       nil
     end
@@ -574,7 +594,7 @@ module Ione
       remaining = futures.count
       values = Array.new(remaining)
       futures.each_with_index do |f, i|
-        f.on_complete do |_, v, e|
+        f.on_complete do |v, e|
           unless failed?
             if e
               fail(e)
@@ -651,7 +671,7 @@ module Ione
     private
 
     def reduce_next(i)
-      @futures[i].on_complete do |_, v, e|
+      @futures[i].on_complete do |v, e|
         unless failed?
           if e
             fail(e)
@@ -669,7 +689,7 @@ module Ione
       super
       if @remaining > 0
         futures.each do |f|
-          f.on_complete do |_, v, e|
+          f.on_complete do |v, e|
             unless failed?
               if e
                 fail(e)
@@ -690,7 +710,7 @@ module Ione
     def initialize(futures)
       super()
       futures.each do |f|
-        f.on_complete do |_, v, e|
+        f.on_complete do |v, e|
           unless completed?
             if e
               if futures.all?(&:failed?)
@@ -721,7 +741,7 @@ module Ione
       true
     end
 
-    def resolved?
+    def resolvesd?
       true
     end
 
@@ -730,7 +750,7 @@ module Ione
     end
 
     def on_complete(&listener)
-      listener.call(self, @value, nil) rescue nil
+      call_listener(listener)
     end
 
     def on_value(&listener)
@@ -768,7 +788,7 @@ module Ione
     end
 
     def on_complete(&listener)
-      listener.call(self, nil, @error) rescue nil
+      call_listener(listener)
     end
 
     def on_value
@@ -778,4 +798,4 @@ module Ione
       listener.call(@error) rescue nil
     end
   end
-end
+end

data/lib/ione/io.rb

@@ -19,3 +19,6 @@ require 'ione/io/base_connection'
 require 'ione/io/connection'
 require 'ione/io/server_connection'
 require 'ione/io/acceptor'
+require 'ione/io/ssl_connection'
+require 'ione/io/ssl_server_connection'
+require 'ione/io/ssl_acceptor'

data/lib/ione/io/acceptor.rb

@@ -6,6 +6,8 @@ module Ione
     class Acceptor
       ServerSocket = RUBY_ENGINE == 'jruby' ? ::ServerSocket : Socket
 
+      attr_reader :backlog
+
       def initialize(host, port, backlog, unblocker, reactor, socket_impl=nil)
         @host = host
         @port = port
@@ -27,8 +29,8 @@ module Ione
         addrinfos = @socket_impl.getaddrinfo(@host, @port, nil, Socket::SOCK_STREAM)
         begin
           _, port, _, ip, address_family, socket_type = addrinfos.shift
-          @socket = @socket_impl.new(address_family, socket_type, 0)
-          bind_socket(@socket, @socket_impl.sockaddr_in(port, ip), @backlog)
+          @io = @socket_impl.new(address_family, socket_type, 0)
+          bind_socket(@io, @socket_impl.sockaddr_in(port, ip), @backlog)
         rescue Errno::EADDRNOTAVAIL => e
           if addrinfos.empty?
             raise
@@ -38,26 +40,27 @@ module Ione
         end
         Future.resolved(self)
       rescue => e
+        close
         Future.failed(e)
       end
 
       def close
-        return false unless @socket
+        return false unless @io
         begin
-          @socket.close
+          @io.close
         rescue SystemCallError, IOError
           # nothing to do, the socket was most likely already closed
         end
-        @socket = nil
+        @io = nil
         true
       end
 
       def to_io
-        @socket
+        @io
       end
 
       def closed?
-        @socket.nil?
+        @io.nil?
       end
 
       def connected?
@@ -73,12 +76,10 @@ module Ione
       end
 
       def read
-        client_socket, client_sockaddr = @socket.accept_nonblock
-        port, host = @socket_impl.unpack_sockaddr_in(client_sockaddr)
+        client_socket, host, port = accept
         connection = ServerConnection.new(client_socket, host, port, @unblocker)
         @reactor.accept(connection)
-        listeners = @lock.synchronize { @accept_listeners }
-        listeners.each { |l| l.call(connection) rescue nil }
+        notify_accept_listeners(connection)
       end
 
       if RUBY_ENGINE == 'jruby'
@@ -91,6 +92,19 @@ module Ione
           socket.listen(backlog)
         end
       end
+
+      private
+
+      def accept
+        client_socket, client_sockaddr = @io.accept_nonblock
+        port, host = @socket_impl.unpack_sockaddr_in(client_sockaddr)
+        return client_socket, host, port
+      end
+
+      def notify_accept_listeners(connection)
+        listeners = @lock.synchronize { @accept_listeners }
+        listeners.each { |l| l.call(connection) rescue nil }
+      end
     end
   end
 end

data/lib/ione/io/base_connection.rb

@@ -5,10 +5,13 @@ module Ione
     class BaseConnection
       attr_reader :host, :port
 
-      def initialize(host, port)
+      def initialize(host, port, unblocker)
         @host = host
         @port = port
+        @unblocker = unblocker
         @state = :connecting
+        @lock = Mutex.new
+        @write_buffer = ByteBuffer.new
         @closed_promise = Promise.new
       end
 

data/lib/ione/io/connection.rb

@@ -9,13 +9,10 @@ module Ione
 
       # @private
       def initialize(host, port, connection_timeout, unblocker, clock, socket_impl=Socket)
-        super(host, port)
+        super(host, port, unblocker)
         @connection_timeout = connection_timeout
-        @unblocker = unblocker
         @clock = clock
         @socket_impl = socket_impl
-        @lock = Mutex.new
-        @write_buffer = ByteBuffer.new
         @connected_promise = Promise.new
         on_closed(&method(:cleanup_on_close))
       end

data/lib/ione/io/io_reactor.rb

@@ -156,23 +156,57 @@ module Ione
       #
       # @param host [String] the host to connect to
       # @param port [Integer] the port to connect to
-      # @param timeout [Numeric] the number of seconds to wait for a connection
-      #   before failing
+      # @param options_or_timeout [Hash, Numeric] a hash of options (see below)
+      #   or the connection timeout (equivalent to using the `:timeout` option).
+      # @option options_or_timeout [Numeric] :timeout (5) the number of seconds
+      #   to wait for a connection before failing
+      # @option options_or_timeout [Boolean, OpenSSL::SSL::SSLContext] :ssl (false)
+      #   pass an `OpenSSL::SSL::SSLContext` to upgrade the connection to SSL,
+      #   or true to upgrade the connection and create a new context.
       # @yieldparam [Ione::Io::Connection] connection the newly opened connection
       # @return [Ione::Future] a future that will resolve when the connection is
       #   open. The value will be the connection, or when a block is given to
       #   what the block returns
-      def connect(host, port, timeout, &block)
+      def connect(host, port, options=nil, &block)
+        if options.is_a?(Numeric) || options.nil?
+          timeout = options || 5
+          ssl = false
+        elsif options
+          timeout = options[:timeout] || 5
+          ssl = options[:ssl]
+        end
         connection = Connection.new(host, port, timeout, @unblocker, @clock)
         f = connection.connect
         @io_loop.add_socket(connection)
         @unblocker.unblock!
+        if ssl
+          f = f.flat_map do
+            ssl_context = ssl == true ? nil : ssl
+            upgraded_connection = SslConnection.new(host, port, connection.to_io, @unblocker, ssl_context)
+            ff = upgraded_connection.connect
+            @io_loop.remove_socket(connection)
+            @io_loop.add_socket(upgraded_connection)
+            @unblocker.unblock!
+            ff
+          end
+        end
         f = f.map(&block) if block_given?
         f
       end
 
-      def bind(host, port, backlog, &block)
-        server = Acceptor.new(host, port, backlog, @unblocker, self)
+      def bind(host, port, options=nil, &block)
+        if options.is_a?(Integer) || options.nil?
+          backlog = options || 5
+          ssl_context = nil
+        elsif options
+          backlog = options[:backlog] || 5
+          ssl_context = options[:ssl]
+        end
+        if ssl_context
+          server = SslAcceptor.new(host, port, backlog, @unblocker, self, ssl_context)
+        else
+          server = Acceptor.new(host, port, backlog, @unblocker, self)
+        end
         f = server.bind
         @io_loop.add_socket(server)
         @unblocker.unblock!
@@ -261,6 +295,7 @@ module Ione
       private
 
       PING_BYTE = "\0".freeze
+      DEFAULT_CONNECT_OPTIONS = {:timeout => 5}.freeze
     end
 
     # @private
@@ -282,6 +317,12 @@ module Ione
         @lock.unlock
       end
 
+      def remove_socket(socket)
+        @lock.synchronize do
+          @sockets = @sockets.reject { |s| s == socket || s.closed? }
+        end
+      end
+
       def schedule_timer(timeout, promise=Promise.new)
         @lock.lock
         timers = @timers.reject { |pair| pair[1].nil? }

data/lib/ione/io/server_connection.rb

@@ -5,11 +5,8 @@ module Ione
     class ServerConnection < BaseConnection
       # @private
       def initialize(socket, host, port, unblocker)
-        super(host, port)
+        super(host, port, unblocker)
         @io = socket
-        @unblocker = unblocker
-        @lock = Mutex.new
-        @write_buffer = ByteBuffer.new
         @state = :connected
       end
     end