eventmachine-eventmachine 0.12.3 → 0.12.4

data/lib/eventmachine.rb

@@ -384,7 +384,6 @@ module EventMachine
 	def EventMachine::cancel_timer signature
 		@timers[signature] = proc{} if @timers.has_key?(signature)
 	end
-	private_class_method :cancel_timer
 
 
   # stop_event_loop may called from within a callback method
@@ -1105,7 +1104,7 @@ module EventMachine
 	#--
 	# Perhaps misnamed since the underlying function uses socketpair and is full-duplex.
 	#
-	def self::popen cmd, handler=nil
+	def self::popen cmd, handler=nil, *args
 		klass = if (handler and handler.is_a?(Class))
 			handler
 		else
@@ -1115,7 +1114,7 @@ module EventMachine
 		w = Shellwords::shellwords( cmd )
 		w.unshift( w.first ) if w.first
 		s = invoke_popen( w )
-		c = klass.new s
+		c = klass.new s, *args
 		@conns[s] = c
 		yield(c) if block_given?
 		c
@@ -1382,6 +1381,10 @@ class Connection
 	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
+
 	# EventMachine::Connection#post_init is called by the event loop
 	# immediately after the network connection has been established,
 	# and before resumption of the network loop.
@@ -1500,7 +1503,9 @@ class Connection
 	# connection objects. (Need an example to make that clear.)
 	#
 	def send_data data
-		EventMachine::send_data @signature, data, data.length
+	  size = data.bytesize if data.respond_to?(:bytesize)
+	  size ||= data.size
+		EventMachine::send_data @signature, data, size
 	end
 
 	# Returns true if the connection is in an error state, false otherwise.

data/lib/eventmachine_version.rb

@@ -25,7 +25,7 @@
 
 module EventMachine
 
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 
 end
 

data/lib/protocols/httpcli2.rb

@@ -129,12 +129,12 @@ module Protocols
 					if chunksize > 0
 						@conn.set_text_mode(ln.to_i(16))
 					else
-						@content = @content.join
+						@content = @content ? @content.join : ''
 						@chunk_trailer = true
 					end
 				else
 					# We correctly come here after each chunk gets read.
-					p "Got A BLANK chunk line"
+					# p "Got A BLANK chunk line"
 				end
 
 			end
@@ -144,7 +144,7 @@ module Protocols
 			# We get a single chunk. Append it to the incoming content and switch back to line mode.
 			#
 			def receive_chunked_text text
-				p "RECEIVED #{text.length} CHUNK"
+				# p "RECEIVED #{text.length} CHUNK"
 				(@content ||= []) << text
 			end
 
@@ -234,7 +234,7 @@ module Protocols
 
 			h,prt,ssl = args[:host], Integer(args[:port]), (args[:tls] || args[:ssl])
 			conn = EM.connect( h, prt, self )
-			# TODO, start_tls if necessary
+      conn.start_tls if ssl
 			conn.set_default_host_header( h, prt, ssl )
 			conn
 		end

data/lib/protocols/line_and_text.rb

@@ -27,7 +27,11 @@ require File.dirname(__FILE__) + '/buftok'
 
 module EventMachine
   module Protocols
-
+    # A protocol that handles line-oriented data with interspersed binary text.
+    #
+    # This version is optimized for performance. See EventMachine::Protocols::LineText2
+    # for a version which is optimized for correctness with regard to binary text blocks
+    # that can switch back to line mode.
     class LineAndTextProtocol < Connection
       MaxLineLength = 16*1024
       MaxBinaryLength = 32*1024*1024

data/lib/protocols/linetext2.rb

@@ -24,22 +24,20 @@
 # 
 # 
 
-
-# In the grand, time-honored tradition of re-inventing the wheel, we offer
-# here YET ANOTHER protocol that handles line-oriented data with interspersed
-# binary text. This one trades away some of the performance optimizations of
-# EventMachine::Protocols::LineAndTextProtocol in order to get better correctness
-# with regard to binary text blocks that can switch back to line mode. It also
-# permits the line-delimiter to change in midstream.
-# This was originally written to support Stomp.
-
-# TODO! We're not enforcing the limits on header lengths and text-lengths.
-# When we get around to that, call #receive_error if the user defined it, otherwise
-# throw exceptions.
-
 module EventMachine
 	module Protocols
+		# In the grand, time-honored tradition of re-inventing the wheel, we offer
+		# here YET ANOTHER protocol that handles line-oriented data with interspersed
+		# binary text. This one trades away some of the performance optimizations of
+		# EventMachine::Protocols::LineAndTextProtocol in order to get better correctness
+		# with regard to binary text blocks that can switch back to line mode. It also
+		# permits the line-delimiter to change in midstream.
+		# This was originally written to support Stomp.
 		module LineText2
+			# TODO! We're not enforcing the limits on header lengths and text-lengths.
+			# When we get around to that, call #receive_error if the user defined it, otherwise
+			# throw exceptions.
+      
 			MaxLineLength = 16*1024
 			MaxBinaryLength = 32*1024*1024
 

data/lib/protocols/stomp.rb

@@ -31,6 +31,29 @@ module EventMachine
 
 		# Implements Stomp (http://docs.codehaus.org/display/STOMP/Protocol).
 		#
+		# == Usage example
+		#
+		#   class StompClient < EM::Connection
+		#     include EM::Protocols::Stomp
+		#
+		#     def connection_completed
+		#       connect :login => 'guest', :passcode => 'guest'
+		#     end
+		#
+		#     def receive_msg msg
+		#       if msg.command == "CONNECTED"
+		#         subscribe '/some/topic'
+		#       else
+		#         p ['got a message', msg]
+		#         puts msg.body
+		#       end
+		#     end
+		#   end
+		#
+		#   EM.run{
+		#     EM.connect 'localhost', 61613, StompClient
+		#   }
+		#
 		module Stomp
 			include LineText2
 

data/tests/test_epoll.rb

@@ -132,6 +132,7 @@ class TestEpoll < Test::Unit::TestCase
 
 
 	def test_unix_domain
+		fn = "/tmp/xxx.chain"
 		EM.epoll
 		s = EM.set_descriptor_table_size 60000
 		EM.run {
@@ -143,7 +144,6 @@ class TestEpoll < Test::Unit::TestCase
 			# Let's not sweat the Unix-ness of the filename, since this test can't possibly
 			# work on Windows anyway.
 			#
-			fn = "/tmp/xxx.chain"
 			File.unlink(fn) if File.exist?(fn)
 			EM.start_unix_domain_server fn, TestEchoServer
 			$n = 0
@@ -155,6 +155,8 @@ class TestEpoll < Test::Unit::TestCase
 		}
 		assert_equal(0, $n)
 		assert_equal(50, $max)
+	ensure
+		File.unlink(fn) if File.exist?(fn)
 	end
 
 end

data/tests/test_httpclient2.rb

@@ -68,52 +68,61 @@ class TestHttpClient2 < Test::Unit::TestCase
 	end
 
 	def test_bad_server
+	  err = nil
 		EM.run {
 			http = EM::P::HttpClient2.connect Localhost, 9999
 			d = http.get "/"
-			d.errback {p d.internal_error; EM.stop }
+			d.errback { err = true; d.internal_error; EM.stop }
 		}
+		assert(err)
 	end
 
 	def test_get
+	  content = nil
 		EM.run {
 			http = EM::P::HttpClient2.connect "www.bayshorenetworks.com", 80
 			d = http.get "/"
 			d.callback {
-				p d.content
+				content = d.content
 				EM.stop
 			}
 		}
+		assert(content)
 	end
 
 	# Not a pipelined request because we wait for one response before we request the next.
 	def test_get_multiple
+	  content = nil
 		EM.run {
 			http = EM::P::HttpClient2.connect "www.bayshorenetworks.com", 80
 			d = http.get "/"
 			d.callback {
 				e = http.get "/"
 				e.callback {
-					p e.content
+					content = e.content
 					EM.stop
 				}
 			}
 		}
+		assert(content)
 	end
 
 	def test_get_pipeline
+	  headers, headers2 = nil, nil
 		EM.run {
 			http = EM::P::HttpClient2.connect "www.microsoft.com", 80
 			d = http.get("/")
 			d.callback {
-				p d.headers
+				headers = d.headers
 			}
 			e = http.get("/")
 			e.callback {
-				p e.headers
+				headers2 = e.headers
 			}
 			EM::Timer.new(1) {EM.stop}
 		}
+		assert(headers)
+		assert(headers2)
 	end
 
 
@@ -126,6 +135,19 @@ class TestHttpClient2 < Test::Unit::TestCase
 			d.errback {EM.stop}
 		}
 	end
+	
+  def test_https_get
+    d = nil
+    EM.run {
+      http = EM::P::HttpClient2.connect :host => 'www.amazon.com', :port => 443, :ssl => true
+      d = http.get "/"
+      d.callback {
+        EM.stop
+      }
+    }
+    assert_equal(200, d.status)
+  end
+
 
 
 end

data/tests/test_ltp.rb

@@ -62,7 +62,6 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
     assert( RUBY_PLATFORM !~ /java/ )
 
     lines_received = []
-    Thread.abort_on_exception = true
     EventMachine.run {
       EventMachine.start_server( TestHost, TestPort, SimpleLineTest ) do |conn|
         conn.instance_eval "@line_buffer = lines_received"
@@ -90,7 +89,6 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
     assert( RUBY_PLATFORM !~ /java/ )
 
     lines_received = []
-    Thread.abort_on_exception = true
     EventMachine.run {
       EventMachine.start_server( TestHost, TestPort, SimpleLineTest ) do |conn|
         conn.instance_eval "@error_message = lines_received"
@@ -130,7 +128,6 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
     output = ''
     lines_received = []
     text_received = []
-    Thread.abort_on_exception = true
     EventMachine.run {
       EventMachine.start_server( TestHost, TestPort, LineAndTextTest ) do |conn|
         conn.instance_eval "@lines = lines_received; @text = text_received"
@@ -171,7 +168,6 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
     output = ''
     lines_received = []
     text_received = []
-    Thread.abort_on_exception = true
     EventMachine.run {
       EventMachine.start_server( TestHost, TestPort, BinaryTextTest ) do |conn|
         conn.instance_eval "@lines = lines_received; @text = text_received"

data/tests/test_send_file.rb

@@ -188,7 +188,6 @@ class TestSendFile < Test::Unit::TestCase
 	  begin
 	    require 'fastfilereaderext'
     rescue LoadError
-      $stderr.puts "no fastfilereaderext, not running test_stream_large_file_data"
       return
     end
 		File.open( TestFilename, "w" ) {|f|
@@ -214,7 +213,6 @@ class TestSendFile < Test::Unit::TestCase
 	  begin
 	    require 'fastfilereaderext'
     rescue LoadError
-      $stderr.puts "no fastfilereaderext, not running test_stream_large_chunked_file_data"
       return
     end
 		File.open( TestFilename, "w" ) {|f|

data/tests/test_smtpclient.rb

@@ -30,52 +30,54 @@ require 'test/unit'
 
 class TestSmtpClient < Test::Unit::TestCase
 
-	Localhost = "127.0.0.1"
-	Localport = 9801
+  Localhost = "127.0.0.1"
+  Localport = 9801
 
-	def setup
-	end
+  def setup
+  end
 
-	def teardown
-	end
+  def teardown
+  end
 
-	def test_a
-		# No real tests until we have a server implementation to test against.
-		# This is what the call looks like, though:
+  def test_a
+    # No real tests until we have a server implementation to test against.
+    # This is what the call looks like, though:
+    err = nil
+    EM.run {
+      d = EM::Protocols::SmtpClient.send :domain=>"example.com",
+      :host=>Localhost,
+      :port=>Localport, # optional, defaults 25
+      :starttls=>true,
+      :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",
+      :verbose=>true
+      d.errback {|e|
+        err = e
+        EM.stop
+      }
+    }
+    assert(err)
+  end
 
-		EM.run {
-			d = EM::Protocols::SmtpClient.send :domain=>"example.com",
-				:host=>Localhost,
-				:port=>Localport, # optional, defaults 25
-				:starttls=>true,
-				: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",
-				:verbose=>true
-			d.errback {|e|
-				p e
-				EM.stop
-			}
-		}
-	end
-
-	def test_content
-
-		EM.run {
-			d = EM::Protocols::SmtpClient.send :domain=>"example.com",
-				:host=>Localhost,
-				:port=>Localport, # optional, defaults 25
-				:starttls=>true,
-				:from=>"sender@example.com",
-				:to=> ["to_1@example.com", "to_2@example.com"],
-				:content => ["Subject: xxx\r\n\r\ndata\r\n.\r\n"],
-				:verbose=>true
-			d.errback {|e|
-				p e
-				EM.stop
-			}
-		}
-	end
+  def test_content
+    err = nil
+    EM.run {
+      d = EM::Protocols::SmtpClient.send :domain=>"example.com",
+      :host=>Localhost,
+      :port=>Localport, # optional, defaults 25
+      :starttls=>true,
+      :from=>"sender@example.com",
+      :to=> ["to_1@example.com", "to_2@example.com"],
+      :content => ["Subject: xxx\r\n\r\ndata\r\n.\r\n"],
+      :verbose=>true
+      d.errback {|e|
+        err = e
+        EM.stop
+      }
+    }
+    assert(err)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine-eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-08 00:00:00 -08:00
+date: 2009-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -112,6 +112,11 @@ files:
 - ext/eventmachine.h
 - ext/eventmachine_cpp.h
 - ext/extconf.rb
+- ext/fastfilereader
+- ext/fastfilereader/extconf.rb
+- ext/fastfilereader/mapper.cpp
+- ext/fastfilereader/mapper.h
+- ext/fastfilereader/rubymain.cpp
 - ext/files.cpp
 - ext/files.h
 - ext/kb.cpp