eventmachine 0.12.0 → 0.12.2

data/lib/eventmachine_version.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine_version.rb 686 2008-05-14 21:21:10Z francis $
+# $Id: eventmachine_version.rb 785 2008-09-15 09:46:23Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -25,7 +25,7 @@
 
 module EventMachine
 
-  VERSION = "0.12.0"
+  VERSION = "0.12.2"
 
 end
 

data/lib/jeventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: jeventmachine.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id: jeventmachine.rb 771 2008-08-28 00:45:23Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -41,14 +41,16 @@ module EventMachine
 	ConnectionCompleted = 104
 	LoopbreakSignalled = 105
 
-	class EM < com.rubyeventmachine.EmReactor
+	# This thunk class used to be called EM, but that caused conflicts with
+	# the alias "EM" for module EventMachine. (FC, 20Jun08)
+	class JEM < com.rubyeventmachine.EmReactor
 		def eventCallback a1, a2, a3
 			s = String.from_java_bytes(a3.array[a3.position...a3.limit])
 			EventMachine::event_callback a1, a2, s
 		end
 	end
 	def self.initialize_event_machine
-		@em = EM.new
+		@em = JEM.new
 	end
 	def self.release_machine
 		@em = nil
@@ -68,8 +70,12 @@ module EventMachine
 	def self.stop_tcp_server sig
 		@em.stopTcpServer sig
 	end
+	def self.start_unix_server filename
+		# TEMPORARILY unsupported until someone figures out how to do it.
+		raise "unsupported on this platform"
+	end
 	def self.send_data sig, data, length
-		@em.sendData sig, data, length
+		@em.sendData sig, data.to_java_bytes
 	end
 	def self.send_datagram sig, data, length, address, port
 		@em.sendDatagram sig, data, length, address, port
@@ -80,6 +86,9 @@ module EventMachine
 	def self.close_connection sig, after_writing
 		@em.closeConnection sig, after_writing
 	end
+	def self.set_comm_inactivity_timeout sig, interval
+		@em.setCommInactivityTimeout sig, interval
+	end
 	def self.start_tls sig
 		@em.startTls sig
 	end
@@ -99,8 +108,25 @@ module EventMachine
 	def self.open_udp_socket server, port
 		@em.openUdpSocket server, port
 	end
+	def self.invoke_popen cmd
+		# TEMPORARILY unsupported until someone figures out how to do it.
+		raise "unsupported on this platform"
+	end
+	def self.read_keyboard
+		# TEMPORARILY unsupported until someone figures out how to do it.
+		raise "temporarily unsupported on this platform"
+	end
+	def self.set_max_timer_count num
+		# harmless no-op in Java. There's no built-in timer limit.
+	end
 	def self.library_type
 		:java
 	end
+
+	class Connection
+		def associate_callback_target sig
+			# No-op for the time being
+		end
+	end
 end
 

data/lib/protocols/header_and_content.rb

@@ -1,4 +1,4 @@
-# $Id: header_and_content.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id: header_and_content.rb 782 2008-09-13 20:02:17Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -28,7 +28,13 @@
 module EventMachine
     module Protocols
 
-	class HeaderAndContentProtocol < LineAndTextProtocol
+	# Originally, this subclassed LineAndTextProtocol, which in
+	# turn relies on BufferedTokenizer, which doesn't gracefully
+	# handle the transitions between lines and binary text.
+	# Changed 13Sep08 by FCianfrocca.
+	class HeaderAndContentProtocol < Connection
+	    include LineText2
+	
 
 	    ContentLengthPattern = /Content-length:\s*(\d+)/i
 

data/lib/protocols/httpclient.rb

@@ -1,4 +1,4 @@
-# $Id: httpclient.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id: httpclient.rb 786 2008-09-16 07:33:27Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -109,6 +109,8 @@ class HttpClient < Connection
       qs = "?" + qs
     end
 
+    version = args[:version] || "1.1"
+
     # Allow an override for the host header if it's not the connect-string.
     host = args[:host_header] || args[:host] || "_"
     # For now, ALWAYS tuck in the port string, although we may want to omit it if it's the default.
@@ -122,7 +124,7 @@ class HttpClient < Connection
     # ESSENTIAL for the request's line-endings to be CRLF, not LF. Some servers misbehave otherwise.
     # TODO: We ASSUME the caller wants to send a 1.1 request. May not be a good assumption.
     req = [
-      "#{verb} #{request}#{qs} HTTP/1.1",
+      "#{verb} #{request}#{qs} HTTP/#{version}",
       "Host: #{host}:#{port}",
       "User-agent: Ruby EventMachine",
     ]
@@ -138,6 +140,12 @@ class HttpClient < Connection
       req << "Cookie: #{args[:cookie]}"
     end
 
+    # Basic-auth stanza contributed by Mike Murphy.
+    if args[:basic_auth]
+      basic_auth_string = ["#{args[:basic_auth][:username]}:#{args[:basic_auth][:password]}"].pack('m').strip
+      req << "Authorization: Basic #{basic_auth_string}"
+    end 
+
     req << ""
     reqstring = req.map {|l| "#{l}\r\n"}.join
     send_data reqstring
@@ -159,12 +167,13 @@ class HttpClient < Connection
         @content = ""
         @status = nil
         @read_state = :header
+	@connection_close = nil
       when :header
         ary = data.split( /\r?\n/m, 2 )
         if ary.length == 2
           data = ary.last
           if ary.first == ""
-	      if @content_length and @content_length > 0
+	      if (@content_length and @content_length > 0) || @connection_close
 		  @read_state = :content
 	      else
 		  dispatch_response
@@ -182,6 +191,8 @@ class HttpClient < Connection
               # a bad guy. (There is an exploit that depends on multiple
               # content-length headers.)
               @content_length ||= $'.to_i
+            elsif ary.first =~ /\Aconnection:\s*close/i
+              @connection_close = true
             end
           end
         else

data/lib/protocols/linetext2.rb

@@ -1,4 +1,4 @@
-# $Id: linetext2.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id: linetext2.rb 778 2008-09-13 19:54:18Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -83,8 +83,13 @@ module EventMachine
 
 						@lt2_textpos += will_take
 						if @lt2_textpos >= @lt2_textsize
-							receive_binary_data @lt2_textbuffer.join
+							# Reset line mode (the default behavior) BEFORE calling the
+							# receive_binary_data. This makes it possible for user code
+							# to call set_text_mode, enabling chains of text blocks
+							# (which can possibly be of different sizes).
 							set_line_mode
+							receive_binary_data @lt2_textbuffer.join
+							receive_end_of_binary_data
 						end
 
 						receive_data tail
@@ -121,6 +126,11 @@ module EventMachine
 				end
 			end
 
+			# Alias for #set_text_mode, added for back-compatibility with LineAndTextProtocol.
+			def set_binary_mode size=nil
+				set_text_mode size
+			end
+
 			# In case of a dropped connection, we'll send a partial buffer to user code
 			# when in sized text mode. User overrides of #receive_binary_data need to
 			# be aware that they may get a short buffer.
@@ -139,6 +149,14 @@ module EventMachine
 			def receive_binary_data data
 				# no-op
 			end
+
+			# Stub. Should be subclassed by user code.
+			# This is called when transitioning internally from text mode
+			# back to line mode. Useful when client code doesn't want
+			# to keep track of how much data it's received.
+			def receive_end_of_binary_data
+				# no-op
+			end
 		end
 	end
 end

data/lib/protocols/postgres.rb

@@ -0,0 +1,261 @@
+#
+# $Id: postgres.rb 783 2008-09-14 02:48:46Z francis $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 15 November 2006
+# 
+# See EventMachine and EventMachine::Connection for documentation and
+# usage examples.
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2006-08 by Francis Cianfrocca. All Rights Reserved.
+# Gmail: blackhedd
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either: 1) the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version; or 2) Ruby's License.
+# 
+# See the file COPYING for complete licensing information.
+#
+#---------------------------------------------------------------------------
+#
+# 
+# 
+
+
+=begin
+PROVISIONAL IMPLEMENTATION of an evented Postgres client.
+This implements version 3 of the Postgres wire protocol, which will work
+with any Postgres version from roughly 7.4 onward.
+
+Until this code is judged ready for prime time, you have to access it by
+explicitly requiring protocols/postgres.
+
+Objective: we want to access Postgres databases without requiring threads.
+Until now this has been a problem because the Postgres client implementations 
+have all made use of blocking I/O calls, which is incompatible with a
+thread-free evented model.
+
+But rather than re-implement the Postgres Wire3 protocol, we're taking advantage
+of the existing postgres-pr library, which was originally written by Michael
+Neumann but (at this writing) appears to be no longer maintained. Still, it's
+in basically a production-ready state, and the wire protocol isn't that complicated
+anyway.
+
+We need to monkeypatch StringIO because it lacks the #readbytes method needed
+by postgres-pr.
+
+We're tucking in a bunch of require statements that may not be present in garden-variety
+EM installations. Until we find a good way to only require these if a program
+requires postgres, this file will need to be required explicitly.
+
+The StringIO monkeypatch is lifted verbatim from the standard library readbytes.rb,
+which adds method #readbytes directly to class IO. But StringIO is not a subclass of IO.
+
+We cloned the handling of postgres messages from lib/postgres-pr/connection.rb
+in the postgres-pr library, and modified it for event-handling.
+
+TODO: The password handling in dispatch_conn_message is totally incomplete.
+
+
+We return Deferrables from the user-level operations surfaced by this interface.
+Experimentally, we're using the pattern of always returning a boolean value as the
+first argument of a deferrable callback to indicate success or failure. This is
+instead of the traditional pattern of calling Deferrable#succeed or #fail, and
+requiring the user to define both a callback and an errback function.
+
+Sample code:
+require 'eventmachine'
+require 'protocols/postgres' # provisionally needed
+
+EM.run {
+	db = EM.connect_unix_domain( "/tmp/.s.PGSQL.5432", EM::P::Postgres3 )
+	db.connect( dbname, username, psw ).callback do |status|
+		if status
+			db.query( "select * from some_table" ).callback do |status, result, errors|
+				if status
+					result.rows.each do |row|
+						p row
+					end
+				end
+			end
+		end
+	end
+}
+
+
+
+=end
+
+
+require 'readbytes'
+require 'postgres-pr/message'
+require 'postgres-pr/connection'
+require 'stringio'
+
+include PostgresPR
+
+class StringIO
+  # Reads exactly +n+ bytes.
+  #
+  # If the data read is nil an EOFError is raised.
+  #
+  # If the data read is too short a TruncatedDataError is raised and the read
+  # data is obtainable via its #data method.
+  def readbytes(n)
+    str = read(n)
+    if str == nil
+      raise EOFError, "End of file reached"
+    end
+    if str.size < n
+      raise TruncatedDataError.new("data truncated", str) 
+    end
+    str
+  end
+end
+
+
+module EventMachine; module Protocols; class Postgres3 < EventMachine::Connection
+
+
+	def initialize
+		@data = ""
+		@params = {}
+	end
+
+	def connect db, user, psw=nil
+		d = EM::DefaultDeferrable.new
+		d.timeout 15
+
+		if @pending_query || @pending_conn
+			d.succeed false, "Operation already in progress"
+		else
+			@pending_conn = d
+			prms = {"user"=>user, "database"=>db}
+			@user = user
+			if psw
+				@password = psw
+				#prms["password"] = psw
+			end
+			send_data PostgresPR::StartupMessage.new( 3 << 16, prms ).dump
+		end
+
+		d
+	end
+
+	def query sql
+		d = EM::DefaultDeferrable.new
+		d.timeout 15
+
+		if @pending_query || @pending_conn
+			d.succeed false, "Operation already in progress"
+		else
+			@r = PostgresPR::Connection::Result.new
+			@e = []
+			@pending_query = d
+			send_data PostgresPR::Query.dump(sql)
+		end
+
+		d
+	end
+
+
+	def receive_data data
+		@data << data
+		while @data.length >= 5
+			pktlen = @data[1...5].unpack("N").first
+			if @data.length >= (1 + pktlen)
+				pkt = @data.slice!(0...(1+pktlen))
+				m = StringIO.open( pkt, "r" ) {|io| PostgresPR::Message.read( io ) }
+				if @pending_conn
+					dispatch_conn_message m
+				elsif @pending_query
+					dispatch_query_message m
+				else
+					raise "Unexpected message from database"
+				end
+			else
+				break # very important, break out of the while
+			end
+		end
+	end
+
+
+	def unbind
+		if o = (@pending_query || @pending_conn)
+			o.succeed false, "lost connection"
+		end
+	end
+
+	# Cloned and modified from the postgres-pr.
+	def dispatch_conn_message msg
+		case msg
+		when AuthentificationClearTextPassword
+			raise ArgumentError, "no password specified" if @password.nil?
+			send_data PasswordMessage.new(@password).dump
+
+		when AuthentificationCryptPassword
+			raise ArgumentError, "no password specified" if @password.nil?
+			send_data PasswordMessage.new(@password.crypt(msg.salt)).dump
+
+		when AuthentificationMD5Password
+			raise ArgumentError, "no password specified" if @password.nil?
+			require 'digest/md5'
+
+			m = Digest::MD5.hexdigest(@password + @user) 
+			m = Digest::MD5.hexdigest(m + msg.salt)
+			m = 'md5' + m
+			send_data PasswordMessage.new(m).dump
+
+		when AuthentificationKerberosV4, AuthentificationKerberosV5, AuthentificationSCMCredential
+			raise "unsupported authentification"
+
+		when AuthentificationOk
+		when ErrorResponse
+			raise msg.field_values.join("\t")
+		when NoticeResponse
+			@notice_processor.call(msg) if @notice_processor
+		when ParameterStatus
+			@params[msg.key] = msg.value
+		when BackendKeyData
+			# TODO
+			#p msg
+		when ReadyForQuery
+			# TODO: use transaction status
+			pc,@pending_conn = @pending_conn,nil
+			pc.succeed true
+		else
+			raise "unhandled message type"
+		end
+	end
+
+	# Cloned and modified from the postgres-pr.
+	def dispatch_query_message msg
+		case msg
+		when DataRow
+			@r.rows << msg.columns
+		when CommandComplete
+			@r.cmd_tag = msg.cmd_tag
+		when ReadyForQuery
+			pq,@pending_query = @pending_query,nil
+			pq.succeed true, @r, @e
+		when RowDescription
+			@r.fields = msg.fields
+		when CopyInResponse
+		when CopyOutResponse
+		when EmptyQueryResponse
+		when ErrorResponse
+			# TODO
+			@e << msg
+		when NoticeResponse
+			@notice_processor.call(msg) if @notice_processor
+		else
+			# TODO
+		end
+	end
+
+end; end; end
+