cool.io 1.0.0 → 1.1.0

data/ext/libev/ev_wrap.h

@@ -40,6 +40,9 @@
 #define pollidxmax ((loop)->pollidxmax)
 #define epoll_events ((loop)->epoll_events)
 #define epoll_eventmax ((loop)->epoll_eventmax)
+#define epoll_eperms ((loop)->epoll_eperms)
+#define epoll_epermcnt ((loop)->epoll_epermcnt)
+#define epoll_epermmax ((loop)->epoll_epermmax)
 #define kqueue_changes ((loop)->kqueue_changes)
 #define kqueue_changemax ((loop)->kqueue_changemax)
 #define kqueue_changecnt ((loop)->kqueue_changecnt)
@@ -82,9 +85,11 @@
 #define fs_2625 ((loop)->fs_2625)
 #define fs_hash ((loop)->fs_hash)
 #define sig_pending ((loop)->sig_pending)
+#define nosigmask ((loop)->nosigmask)
 #define sigfd ((loop)->sigfd)
 #define sigfd_w ((loop)->sigfd_w)
 #define sigfd_set ((loop)->sigfd_set)
+#define origflags ((loop)->origflags)
 #define loop_count ((loop)->loop_count)
 #define loop_depth ((loop)->loop_depth)
 #define userdata ((loop)->userdata)
@@ -132,6 +137,9 @@
 #undef pollidxmax
 #undef epoll_events
 #undef epoll_eventmax
+#undef epoll_eperms
+#undef epoll_epermcnt
+#undef epoll_epermmax
 #undef kqueue_changes
 #undef kqueue_changemax
 #undef kqueue_changecnt
@@ -174,9 +182,11 @@
 #undef fs_2625
 #undef fs_hash
 #undef sig_pending
+#undef nosigmask
 #undef sigfd
 #undef sigfd_w
 #undef sigfd_set
+#undef origflags
 #undef loop_count
 #undef loop_depth
 #undef userdata

data/lib/cool.io.rb

@@ -1,12 +1,14 @@
 #--
-# Copyright (C)2007-10 Tony Arcieri
+# Copyright (C)2011 Tony Arcieri
 # You can redistribute this under the terms of the Ruby license
 # See file LICENSE for details
 #++
 
 require 'iobuffer'
 
+require "cool.io/version"
 require "cool.io_ext"
+
 require "cool.io/loop"
 require "cool.io/meta"
 require "cool.io/io"
@@ -21,8 +23,6 @@ require "cool.io/http_client"
 require "cool.io/dsl"
 
 module Coolio
-  VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
-  def self.version; VERSION; end
   def self.inspect; "Cool.io"; end
 end
 

data/lib/cool.io/async_watcher.rb

@@ -19,7 +19,7 @@ module Coolio
       # merely signals an event has occurred for each byte written.
       @writer.write "\0"
     end
-    
+
     # Called whenever a signal is received
     def on_signal; end
     event_callback :on_signal

data/lib/cool.io/dns_resolver.rb

@@ -9,7 +9,7 @@
 # as best I could with extremely limited knowledge of the DNS format.  There's
 # obviously a ton of stuff it doesn't support (like IPv6 and TCP).
 #
-# If you do know what you're doing with DNS, feel free to improve this! 
+# If you do know what you're doing with DNS, feel free to improve this!
 # A good starting point my be this EventMachine Net::DNS-based asynchronous
 # resolver:
 #
@@ -44,10 +44,12 @@ module Coolio
     # Query /etc/hosts (or the specified hostfile) for the given host
     def self.hosts(host, hostfile = HOSTS)
       hosts = {}
-      File.open(hostfile).each_line do |host_entry|
-        entries = host_entry.gsub(/#.*$/, '').gsub(/\s+/, ' ').split(' ')
-        addr = entries.shift
-        entries.each { |e| hosts[e] ||= addr }
+      File.open(hostfile) do |f|
+        f.each_line do |host_entry|
+          entries = host_entry.gsub(/#.*$/, '').gsub(/\s+/, ' ').split(' ')
+          addr = entries.shift
+          entries.each { |e| hosts[e] ||= addr }
+        end
       end
 
       hosts[host]
@@ -65,10 +67,10 @@ module Coolio
 
       @nameservers = nameservers
       @question = request_question hostname
-      
+
       @socket = UDPSocket.new
       @timer = Timeout.new(self)
-      
+
       super(@socket)
     end
 
@@ -110,7 +112,7 @@ module Coolio
       begin
         @socket.send request_message, 0
       rescue Errno::EHOSTUNREACH # TODO figure out why it has to be wrapper here, when the other wrapper should be wrapping this one!
-      end   
+      end
     end
 
     # Called by the subclass when the DNS response is available
@@ -120,7 +122,7 @@ module Coolio
         datagram = @socket.recvfrom_nonblock(DATAGRAM_SIZE).first
       rescue Errno::ECONNREFUSED
       end
-      
+
       address = response_address datagram rescue nil
       address ? on_success(address) : on_failure
       detach
@@ -128,7 +130,7 @@ module Coolio
 
     def request_question(hostname)
       raise ArgumentError, "hostname cannot be nil" if hostname.nil?
-      
+
       # Query name
       message = hostname.split('.').map { |s| [s.size].pack('C') << s }.join + "\0"
 
@@ -149,7 +151,7 @@ module Coolio
       qdcount = 1
 
       # No answer, authority, or additional records
-      ancount = nscount = arcount = 0 
+      ancount = nscount = arcount = 0
 
       message << [qdcount, ancount, nscount, arcount].pack('nnnn')
       message << @question
@@ -210,7 +212,7 @@ module Coolio
             return @resolver.__send__(:send_request)
           rescue Errno::EHOSTUNREACH # if the DNS is toast try again after the timeout occurs again
             return nil
-          end 
+          end
         end
         @resolver.__send__(:on_timeout)
         @resolver.detach

data/lib/cool.io/dsl.rb

@@ -7,112 +7,112 @@
 module Coolio
   # A module we stash all the connections defined by the DSL under
   module Connections; end
-  
+
   # A DSL for defining Cool.io connection types and servers
   module DSL
     # Define all methods on the metaclass
     module_function
-    
+
     # Run the default Cool.io event loop
     def run
       Cool.io::Loop.default.run
     end
-    
+
     # Connect to the given host and port using the given connection class
     def connect(host, port, connection_name = nil, *initializer_args, &block)
       if block_given?
         initializer_args.unshift connection_name if connection_name
-        
+
         klass = Class.new Cool.io::TCPSocket
         connection_builder = ConnectionBuilder.new klass
-        connection_builder.instance_eval &block
+        connection_builder.instance_eval(&block)
       else
         raise ArgumentError, "no connection name or block given" unless connection_name
         klass = self[connection_name]
       end
-      
+
       client = klass.connect host, port, *initializer_args
       client.attach Cool.io::Loop.default
       client
     end
-    
+
     # Create a new Cool.io::TCPServer
     def server(host, port, connection_name = nil, *initializer_args, &block)
       if block_given?
         initializer_args.unshift connection_name if connection_name
-        
+
         klass = Class.new Cool.io::TCPSocket
         connection_builder = ConnectionBuilder.new klass
-        connection_builder.instance_eval &block
+        connection_builder.instance_eval(&block)
       else
         raise ArgumentError, "no connection name or block given" unless connection_name
         klass = self[connection_name]
       end
-      
+
       server = Cool.io::TCPServer.new host, port, klass, *initializer_args
       server.attach Cool.io::Loop.default
       server
     end
-    
+
     # Create a new Cool.io::TCPSocket class
     def connection(name, &block)
       # Camelize class name
       class_name = name.to_s.split('_').map { |s| s.capitalize }.join
-      
+
       connection = Class.new Cool.io::TCPSocket
       connection_builder = ConnectionBuilder.new connection
-      connection_builder.instance_eval &block
-      
+      connection_builder.instance_eval(&block)
+
       Coolio::Connections.const_set class_name, connection
     end
-    
+
     # Look up a connection class by its name
     def [](connection_name)
       class_name = connection_name.to_s.split('_').map { |s| s.capitalize }.join
-    
+
       begin
         Coolio::Connections.const_get class_name
       rescue NameError
         raise NameError, "No connection type registered for #{connection_name.inspect}"
       end
     end
-    
+
     # Builder for Cool.io::TCPSocket classes
     class ConnectionBuilder
       def initialize(klass)
         @klass = klass
       end
-      
+
       # Declare an initialize function
       def initializer(&action)
         @klass.send :define_method, :initialize, &action
       end
-      
+
       # Declare the on_connect callback
       def on_connect(&action)
         @klass.send :define_method, :on_connect, &action
       end
-      
+
       # Declare a callback fired if we failed to connect
       def on_connect_failed(&action)
         @klass.send :define_method, :on_connect_failed, &action
       end
-      
+
       # Declare a callback fired if DNS resolution failed
       def on_resolve_failed(&action)
         @klass.send :define_method, :on_resolve_failed, &action
       end
-      
+
       # Declare the on_close callback
       def on_close(&action)
         @klass.send :define_method, :on_close, &action
       end
-      
+
       # Declare the on_read callback
       def on_read(&action)
         @klass.send :define_method, :on_read, &action
       end
-      
+
       # Declare the on_write_complete callback
       def on_write_complete(&action)
         @klass.send :define_method, :on_write_complete, &action
@@ -126,10 +126,10 @@ module Cool
   module Coolness
     def cool; Cool::IOThunk; end
   end
-  
+
   module IOThunk
     def self.io; Coolio::DSL; end
   end
 end
 
-extend Cool::Coolness
+extend Cool::Coolness

data/lib/cool.io/eventmachine.rb

@@ -43,8 +43,8 @@ module EventMachine
     def add_timer(interval, proc = nil, &block)
       block ||= proc
       t = OneShotEMTimer.new(interval, false) # non repeating
-      t.setup(block) 
-      
+      t.setup(block)
+
       # fire 'er off ltodo: do we keep track of these timers in memory?
       t.attach(Coolio::Loop.default)
       t
@@ -53,7 +53,7 @@ module EventMachine
     def cancel_timer(t)
       # guess there's a case where EM you can say 'cancel' but it's already fired?
       # kind of odd but it happens
-     t.detach if t.attached? 
+     t.detach if t.attached?
     end
 
     def set_comm_inactivity_timeout(*args); end # TODO
@@ -76,7 +76,7 @@ module EventMachine
       wrapped_child.call_back_to_this(conn) # calls post_init for us
       yield conn if block_given?
     end
-    
+
     # Start a TCP server on the given address and port
     def start_server(addr, port, handler = Connection, *args, &block)
       # make sure we're a 'real' class here
@@ -85,11 +85,11 @@ module EventMachine
       else
         Class.new( Connection ) {handler and include handler}
       end
-      
-      server = Coolio::TCPServer.new(addr, port, CallsBackToEM, *args) do |wrapped_child| 
+
+      server = Coolio::TCPServer.new(addr, port, CallsBackToEM, *args) do |wrapped_child|
         conn = klass.new(wrapped_child)
         conn.heres_your_socket(wrapped_child) # ideally NOT have this :)
-        wrapped_child.call_back_to_this(conn) 
+        wrapped_child.call_back_to_this(conn)
         block.call(conn) if block
       end
 
@@ -126,9 +126,9 @@ module EventMachine
     end
 
     def on_connect
-      # @connection_timer.detach if @connection_timer 
+      # @connection_timer.detach if @connection_timer
       # won't need that anymore :) -- with server connecteds we don't have it, anyway
-      
+
       # TODO should server accepted's call this? They don't currently
       # [and can't, since on_connect gets called basically in the initializer--needs some code love for that to happen :)
       @call_back_to_this.connection_completed if @call_back_to_this
@@ -136,10 +136,10 @@ module EventMachine
 
     def connection_has_timed_out
       return if closed?
-      
+
       # wonder if this works when you're within a half-connected phase.
       # I think it does.  What about TCP state?
-      close unless closed? 
+      close unless closed?
       @call_back_to_this.unbind
     end
 
@@ -188,18 +188,18 @@ module EventMachine
       #  initialize *args
       #end
     end
-    
+
     # we will need to call 'their functions' appropriately -- the commented out ones, here
-    # 
+    #
     # Callback fired when connection is created
     def post_init
-      # I thought we were 'overriding' EM's existing methods, here.  
+      # I thought we were 'overriding' EM's existing methods, here.
       # Huh? Why do we have to define these then?
     end
 
     # Callback fired when connection is closed
     def unbind; end
-    
+
     # Callback fired when data is received
     # def receive_data(data); end
     def heres_your_socket(instantiated_coolio_socket)
@@ -211,13 +211,13 @@ module EventMachine
     def send_data(data)
       @wrapped_coolio.write data
     end
-    
+
     # Close the connection, optionally after writing
     def close_connection(after_writing = false)
       return close_connection_after_writing if after_writing
       @wrapped_coolio.close
     end
-    
+
     # Close the connection after all data has been written
     def close_connection_after_writing
       @wrapped_coolio.output_buffer_size.zero? ? @wrapped_coolio.close : @wrapped_coolio.should_close_after_writing
@@ -231,4 +231,4 @@ module EventMachine
 end
 
 # Shortcut constant
-EM = EventMachine
+EM = EventMachine

data/lib/cool.io/http_client.rb

@@ -29,12 +29,12 @@ module Coolio
     def content_length
       Integer(self[HttpClient::CONTENT_LENGTH]) rescue nil
     end
- 
+
     # Is the transfer encoding chunked?
     def chunked_encoding?
       /chunked/i === self[HttpClient::TRANSFER_ENCODING]
     end
- end
+  end
 
   class HttpChunkHeader < Hash
     # When parsing chunked encodings this is set
@@ -56,14 +56,14 @@ module Coolio
     def escape(s)
       s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
         '%'+$1.unpack('H2'*$1.size).join('%').upcase
-      }.tr(' ', '+') 
+      }.tr(' ', '+')
     end
 
     # Unescapes a URI escaped string.
     def unescape(s)
       s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
         [$1.delete('%')].pack('H*')
-      } 
+      }
     end
 
     # Map all header keys to a downcased string version
@@ -151,11 +151,11 @@ module Coolio
       @chunk_header = HttpChunkHeader.new
     end
 
-    # Send an HTTP request and consume the response.  
+    # Send an HTTP request and consume the response.
     # Supports the following options:
     #
     #   head: {Key: Value}
-    #     Specify an HTTP header, e.g. {'Connection': 'close'} 
+    #     Specify an HTTP header, e.g. {'Connection': 'close'}
     #
     #   query: {Key: Value}
     #     Specify query string parameters (auto-escaped)
@@ -176,7 +176,7 @@ module Coolio
       return unless @connected
       send_request
     end
-    
+
     # Enable the HttpClient if it has been disabled
     def enable
       super
@@ -195,7 +195,14 @@ module Coolio
 
     # Called when the request has completed
     def on_request_complete
-      close
+      @state == :finished ? close : @state = :finished
+    end
+
+    # called by close
+    def on_close
+      if @state != :finished and @state == :body
+        on_request_complete
+      end
     end
 
     # Called when an error occurs dispatching the request
@@ -211,7 +218,7 @@ module Coolio
     #
     # Coolio callbacks
     #
-        
+
     def on_connect
       @connected = true
       send_request if @method and @path
@@ -260,8 +267,8 @@ module Coolio
 
     def send_request_body
       write @options[:body] if @options[:body]
-    end  
- 
+    end
+
     #
     # Response processing
     #
@@ -289,21 +296,21 @@ module Coolio
 
     def parse_header(header)
       return false if @data.empty?
-      
+
       begin
         @parser_nbytes = @parser.execute(header, @data.to_str, @parser_nbytes)
       rescue Coolio::HttpClientParserError
         on_error "invalid HTTP format, parsing fails"
         @state = :invalid
       end
-      
+
       return false unless @parser.finished?
 
       # Clear parsed data from the buffer
       @data.read(@parser_nbytes)
       @parser.reset
       @parser_nbytes = 0
-      
+
       true
     end
 
@@ -324,7 +331,7 @@ module Coolio
         @state = :body
         @bytes_remaining = @response_header.content_length
       end
-      
+
       true
     end
 
@@ -334,7 +341,7 @@ module Coolio
       @bytes_remaining = @chunk_header.chunk_size
       @chunk_header = HttpChunkHeader.new
 
-      @state = @bytes_remaining > 0 ? :chunk_body : :response_footer      
+      @state = @bytes_remaining > 0 ? :chunk_body : :response_footer
       true
     end
 
@@ -347,8 +354,8 @@ module Coolio
 
       on_body_data @data.read(@bytes_remaining)
       @bytes_remaining = 0
-      
-      @state = :chunk_footer      
+
+      @state = :chunk_footer
       true
     end
 
@@ -361,13 +368,13 @@ module Coolio
         on_error "non-CRLF chunk footer"
         @state = :invalid
       end
-      
+
       true
     end
 
     def process_response_footer
       return false if @data.size < 2
-      
+
       if @data.read(2) == CRLF
         if @data.empty?
           on_request_complete
@@ -380,7 +387,7 @@ module Coolio
         on_error "non-CRLF response footer"
         @state = :invalid
       end
-      
+
       false
     end
 
@@ -389,7 +396,7 @@ module Coolio
         on_body_data @data.read
         return false
       end
-      
+
       if @bytes_remaining.zero?
         on_request_complete
         @state = :finished