eventmachine 0.12.8-java → 0.12.10-java

data/java/src/com/rubyeventmachine/{Connection.java → application/Connection.java}

@@ -28,7 +28,7 @@
 
 
 
-package com.rubyeventmachine;
+package com.rubyeventmachine.application;
 
 //import java.io.*;
 import java.nio.*;
@@ -38,7 +38,7 @@ import java.net.*;
 public class Connection {
 	
 	public Application application;
-	public String signature;
+	public long signature;
 	
 	public void postInit() {}
 	public void connectionCompleted() {}

data/java/src/com/rubyeventmachine/{ConnectionFactory.java → application/ConnectionFactory.java}

@@ -28,7 +28,7 @@
 
 
 
-package com.rubyeventmachine;
+package com.rubyeventmachine.application;
 
 //import com.rubyeventmachine.*;
 

data/java/src/com/rubyeventmachine/{DefaultConnectionFactory.java → application/DefaultConnectionFactory.java}

@@ -28,9 +28,9 @@
 
 
 
-package com.rubyeventmachine;
+package com.rubyeventmachine.application;
 
-import com.rubyeventmachine.ConnectionFactory;
+import com.rubyeventmachine.application.ConnectionFactory;
 
 public class DefaultConnectionFactory implements ConnectionFactory {
 

data/java/src/com/rubyeventmachine/{PeriodicTimer.java → application/PeriodicTimer.java}

@@ -27,7 +27,7 @@
  */
 
 
-package com.rubyeventmachine;
+package com.rubyeventmachine.application;
 
 public class PeriodicTimer extends Timer {
 

data/java/src/com/rubyeventmachine/{Timer.java → application/Timer.java}

@@ -27,7 +27,7 @@
  */
 
 
-package com.rubyeventmachine;
+package com.rubyeventmachine.application;
 
 public class Timer {
 	/**

data/java/src/com/rubyeventmachine/tests/ApplicationTest.java

@@ -42,6 +42,7 @@ import java.io.*;
 import java.nio.*;
 
 import com.rubyeventmachine.*;
+import com.rubyeventmachine.application.*;
 
 public class ApplicationTest {
 

data/java/src/com/rubyeventmachine/tests/ConnectTest.java

@@ -35,11 +35,13 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import java.net.*;
 import java.io.*;
 import java.nio.*;
 import java.nio.channels.*;
 
 import com.rubyeventmachine.*;
+import com.rubyeventmachine.application.*;
 
 public class ConnectTest {
 
@@ -110,12 +112,12 @@ public class ConnectTest {
 		Application a = new Application();
 		a.addTimer(0, new Timer() {
 			public void fire() {
-				application.startServer(new InetSocketAddress("localhost", 20000), new Server());
+				application.startServer(new InetSocketAddress("localhost", 20000), new DefaultConnectionFactory());
 			}
 		});
 		a.addTimer(500, new Timer() {
 			public void fire() {
-				application.bindConnect("localhost", 33333, "localhost", 20000);
+				application.bindConnect("localhost", 33333, "localhost", 20000, new Connection());
 			}
 		});
 

data/java/src/com/rubyeventmachine/tests/TestDatagrams.java

@@ -1,6 +1,6 @@
 package com.rubyeventmachine.tests;
 
-import com.rubyeventmachine.*;
+import com.rubyeventmachine.application.*;
 import java.net.*;
 import java.nio.*;
 

data/java/src/com/rubyeventmachine/tests/TestServers.java

@@ -31,6 +31,7 @@ package com.rubyeventmachine.tests;
 
 
 import com.rubyeventmachine.*;
+import com.rubyeventmachine.application.*;
 import java.net.*;
 import org.junit.After;
 import org.junit.AfterClass;

data/java/src/com/rubyeventmachine/tests/TestTimers.java

@@ -30,6 +30,7 @@
 package com.rubyeventmachine.tests;
 
 import com.rubyeventmachine.*;
+import com.rubyeventmachine.application.*;
 import java.io.*;
 
 import org.junit.Assert;

data/lib/em/connection.rb

@@ -34,12 +34,14 @@ module EventMachine
     #
     def self.new(sig, *args) #:nodoc:
       allocate.instance_eval do
+        # Store signature
+        @signature = sig
+        associate_callback_target sig
+
         # Call a superclass's #initialize if it has one
         initialize(*args)
 
-        # Store signature and run #post_init
-        @signature = sig
-        associate_callback_target sig
+        # post initialize callback
         post_init
 
         self
@@ -51,9 +53,9 @@ module EventMachine
     def initialize(*args) #:nodoc:
     end
 
-    def associate_callback_target(sig) #:nodoc:
-      # no-op for the time being, to match similar no-op in rubymain.cpp
-    end
+    # def associate_callback_target(sig) #:nodoc:
+    #   # no-op for the time being, to match similar no-op in rubymain.cpp
+    # end
 
     # EventMachine::Connection#post_init is called by the event loop
     # immediately after the network connection has been established,
@@ -136,8 +138,8 @@ module EventMachine
     # a low-level proxy relay for all data inbound for this connection, to the connection given
     # as the argument. This is essentially just a helper method for enable_proxy.
     # See EventMachine::enable_proxy documentation for details.
-    def proxy_incoming_to(conn)
-      EventMachine::enable_proxy(self, conn)
+    def proxy_incoming_to(conn,bufsize=0)
+      EventMachine::enable_proxy(self, conn, bufsize)
     end
 
     # Helper method for EventMachine::disable_proxy(self)
@@ -173,6 +175,10 @@ module EventMachine
       EventMachine::detach_fd @signature
     end
 
+    def get_sock_opt level, option
+      EventMachine::get_sock_opt @signature, level, option
+    end
+
     # EventMachine::Connection#close_connection_after_writing is a variant of close_connection.
     # All of the descriptive comments given for close_connection also apply to
     # close_connection_after_writing, <i>with one exception:</i> If the connection has
@@ -451,7 +457,7 @@ module EventMachine
 
     # Alias for #set_comm_inactivity_timeout.
     def comm_inactivity_timeout= value
-      self.send :set_comm_inactivity_timeout, value
+      self.set_comm_inactivity_timeout value
     end
 
     # comm_inactivity_timeout= allows you to set the inactivity-timeout property for
@@ -464,10 +470,26 @@ module EventMachine
       EventMachine::set_comm_inactivity_timeout @signature, value.to_f
     end
 
+    # pending_connect_timeout is the duration after which a TCP connection in the connecting 
+    # state will fail. It is important to distinguish this value from comm_inactivity_timeout,
+    # which looks at how long since data was passed on an already established connection.
+    # The value is a float in seconds.
+    def pending_connect_timeout
+      EventMachine::get_pending_connect_timeout @signature
+    end
+
+    # Alias for #set_pending_connect_timeout.
+    def pending_connect_timeout= value
+      self.set_pending_connect_timeout value
+    end
+
+    # set_pending_connect_timeout sets the duration after which a TCP connection in a
+    # connecting state will fail. Takes a float in seconds.
+    def set_pending_connect_timeout value
+      EventMachine::set_pending_connect_timeout @signature, value.to_f
+    end
+
     # Reconnect to a given host/port with the current EventMachine::Connection instance
-    #--
-    # EXPERIMENTAL. DO NOT RELY ON THIS METHOD TO REMAIN SUPPORTED.
-    # (03Nov06)
     def reconnect server, port
       EventMachine::reconnect server, port, self
     end
@@ -501,5 +523,42 @@ module EventMachine
     def stream_file_data filename, args={}
       EventMachine::FileStreamer.new( self, filename, args )
     end
+
+    # Enable notify_readable callbacks on this connection. Only possible if the connection was created
+    # using EM.attach and had notify_readable/notify_writable defined on the handler.
+    def notify_readable= mode
+      EventMachine::set_notify_readable @signature, mode
+    end
+
+    # Returns true if the connection is being watched for readability.
+    def notify_readable?
+      EventMachine::is_notify_readable @signature
+    end
+
+    # Enable notify_writable callbacks on this connection. Only possible if the connection was created
+    # using EM.attach and had notify_readable/notify_writable defined on the handler.
+    def notify_writable= mode
+      EventMachine::set_notify_writable @signature, mode
+    end
+
+    # Returns true if the connection is being watched for writability.
+    def notify_writable?
+      EventMachine::is_notify_writable @signature
+    end
+
+    # Pause a connection so that #send_data and #receive_data events are not fired until #resume is called.
+    def pause
+      EventMachine::pause_connection @signature
+    end
+
+    # Resume a connection's #send_data and #receive_data events.
+    def resume
+      EventMachine::resume_connection @signature
+    end
+
+    # True if the connect was paused using #pause.
+    def paused?
+      EventMachine::connection_paused? @signature
+    end
   end
 end

data/lib/em/deferrable.rb

@@ -42,6 +42,7 @@ module EventMachine
     #
     def callback &block
       return unless block
+      @deferred_status ||= :unknown
       if @deferred_status == :succeeded
         block.call(*@deferred_args)
       elsif @deferred_status != :failed
@@ -59,6 +60,7 @@ module EventMachine
     #
     def errback &block
       return unless block
+      @deferred_status ||= :unknown
       if @deferred_status == :failed
         block.call(*@deferred_args)
       elsif @deferred_status != :succeeded
@@ -121,6 +123,8 @@ module EventMachine
     #
     def set_deferred_status status, *args
       cancel_timeout
+      @errbacks ||= nil
+      @callbacks ||= nil
       @deferred_status = status
       @deferred_args = args
       case @deferred_status
@@ -155,6 +159,7 @@ module EventMachine
     # Cancels an outstanding timeout if any. Undoes the action of #timeout.
     #
     def cancel_timeout
+      @deferred_timeout ||= nil
       if @deferred_timeout
         @deferred_timeout.cancel
         @deferred_timeout = nil

data/lib/em/protocols.rb

@@ -31,5 +31,6 @@ module EventMachine
     autoload :Memcache, 'em/protocols/memcache'
     autoload :Postgres3, 'em/protocols/postgres3'
     autoload :ObjectProtocol, 'em/protocols/object_protocol'
+    autoload :Socks4, 'em/protocols/socks4'
   end
 end

data/lib/em/protocols/httpclient2.rb

@@ -40,6 +40,12 @@ module EventMachine
     #  }
     class HttpClient2 < Connection
       include LineText2
+      
+      def initialize
+        @authorization = nil
+        @closed = nil
+        @requests = nil
+      end
 
       class Request # :nodoc:
         include Deferrable
@@ -57,6 +63,8 @@ module EventMachine
           @header_lines = []
           @headers = {}
           @blanks = 0
+          @chunk_trailer = nil
+          @chunking = nil
         end
 
         def send_request

data/lib/em/protocols/line_and_text.rb

@@ -23,7 +23,6 @@
 #
 # 
 # 
-require File.dirname(__FILE__) + '/../buftok'
 
 module EventMachine
   module Protocols

data/lib/em/protocols/linetext2.rb

@@ -132,6 +132,7 @@ module EventMachine
       # when in sized text mode. User overrides of #receive_binary_data need to
       # be aware that they may get a short buffer.
       def unbind
+        @lt2_mode ||= nil
         if @lt2_mode == :text and @lt2_textpos > 0
           receive_binary_data @lt2_textbuffer.join
         end

data/lib/em/protocols/object_protocol.rb

@@ -11,13 +11,19 @@ module EventMachine
     #  end
     #
     module ObjectProtocol
+      # By default returns Marshal, override to return JSON or YAML, or any
+      # other serializer/deserializer responding to #dump and #load.
+      def serializer
+        Marshal
+      end
+
       def receive_data data # :nodoc:
         (@buf ||= '') << data
 
         while @buf.size >= 4
           if @buf.size >= 4+(size=@buf.unpack('N').first)
             @buf.slice!(0,4)
-            receive_object Marshal.load(@buf.slice!(0,size))
+            receive_object serializer.load(@buf.slice!(0,size))
           else
             break
           end
@@ -31,7 +37,7 @@ module EventMachine
 
       # Sends a ruby object over the network
       def send_object obj
-        data = Marshal.dump(obj)
+        data = serializer.dump(obj)
         send_data [data.respond_to?(:bytesize) ? data.bytesize : data.size, data].pack('Na*')
       end
     end

data/lib/em/protocols/smtpclient.rb

@@ -30,26 +30,49 @@ module EventMachine
 
     # Simple SMTP client
     #
-    #   email = EM::Protocols::SmtpClient.send(
-    #     :domain=>"example.com",
-    #     :host=>'localhost',
-    #     :port=>25, # optional, defaults 25
-    #     :starttls=>true, # use ssl
-    #     :from=>"sender@example.com",
-    #     :to=> ["to_1@example.com", "to_2@example.com"],
-    #     :header=> {"Subject" => "This is a subject line"},
-    #     :body=> "This is the body of the email"
-    #   )
-    #   email.callback{
-    #     puts 'Email sent!'
-    #   }
-    #   email.errback{ |e|
-    #     puts 'Email failed!'
-    #   }
+    #  email = EM::Protocols::SmtpClient.send(
+    #    :domain=>"example.com",
+    #    :host=>'localhost',
+    #    :port=>25, # optional, defaults 25
+    #    :starttls=>true, # use ssl
+    #    :from=>"sender@example.com",
+    #    :to=> ["to_1@example.com", "to_2@example.com"],
+    #    :header=> {"Subject" => "This is a subject line"},
+    #    :body=> "This is the body of the email"
+    #  )
+    #  email.callback{
+    #    puts 'Email sent!'
+    #  }
+    #  email.errback{ |e|
+    #    puts 'Email failed!'
+    #  }
+    #
+    # Sending generated emails (using mailfactory)
+    #
+    #  mail = MailFactory.new
+    #  mail.to = 'someone@site.co'
+    #  mail.from = 'me@site.com'
+    #  mail.subject = 'hi!'
+    #  mail.text = 'hello world'
+    #  mail.html = '<h1>hello world</h1>'
+    #
+    #  email = EM::P::SmtpClient.send(
+    #    :domain=>'site.com',
+    #    :from=>mail.from,
+    #    :to=>mail.to,
+    #    :content=>"#{mail.to_s}\r\n.\r\n"
+    #  )
     #
     class SmtpClient < Connection
       include EventMachine::Deferrable
       include EventMachine::Protocols::LineText2
+      
+      def initialize
+        @succeeded = nil
+        @responder = nil
+        @code = nil
+        @msg = nil
+      end
 
       # :host => required String
       #   a string containing the IP address or host name of the SMTP server to connect to.
@@ -95,6 +118,9 @@ module EventMachine
       #   correct line-breaks to text data. I think the :body parameter should remain as it is, and we
       #   should add a :content parameter that contains autoconversions and/or conversion parameters.
       #   Then we can check if either :body or :content is present and do the right thing.
+      # :content => Optional array or string
+      #   Alternative to providing header and body, an array or string of raw data which MUST be in
+      #   correct SMTP body format, including a trailing dot line
       # :verbose => Optional.
       #   If true, will cause a lot of information (including the server-side of the
       #   conversation) to be dumped to $>.

data/lib/em/protocols/socks4.rb

@@ -0,0 +1,66 @@
+module EventMachine
+  module Protocols
+    # Basic SOCKS v4 client implementation
+    #
+    # Use as you would any regular connection:
+    #
+    # class MyConn < EM::P::Socks4
+    #   def post_init
+    #     send_data("sup")
+    #   end
+    #
+    #   def receive_data(data)
+    #     send_data("you said: #{data}")
+    #   end
+    # end
+    #
+    # EM.connect socks_host, socks_port, MyConn, host, port
+    #
+    class Socks4 < Connection
+      def initialize(host, port)
+        @host = Socket.gethostbyname(host).last
+        @port = port
+        @socks_error_code = nil
+        @buffer = ''
+        setup_methods
+      end
+
+      def setup_methods
+        class << self
+          def post_init; socks_post_init; end
+          def receive_data(*a); socks_receive_data(*a); end
+        end
+      end
+
+      def restore_methods
+        class << self
+          remove_method :post_init
+          remove_method :receive_data
+        end
+      end
+
+      def socks_post_init
+        header = [4, 1, @port, @host, 0].flatten.pack("CCnA4C")
+        send_data(header)
+      end
+
+      def socks_receive_data(data)
+        @buffer << data
+        return  if @buffer.size < 8
+
+        header_resp = @buffer.slice! 0, 8
+        _, r = header_resp.unpack("cc")
+        if r != 90
+          @socks_error_code = r
+          close_connection
+          return
+        end
+
+        restore_methods
+
+        post_init
+        receive_data(@buffer)  unless @buffer.empty?
+      end
+    end
+  end
+end