eventmachine 0.12.2 → 0.12.4

data/lib/eventmachine_version.rb

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

data/lib/evma.rb

@@ -1,4 +1,4 @@
-# $Id: evma.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/callback.rb

@@ -1,4 +1,4 @@
-# $Id: callback.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/container.rb

@@ -1,4 +1,4 @@
-# $Id: container.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/factory.rb

@@ -1,4 +1,4 @@
-# $Id: factory.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/protocol.rb

@@ -1,4 +1,4 @@
-# $Id: protocol.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/reactor.rb

@@ -1,4 +1,4 @@
-# $Id: reactor.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/jeventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: jeventmachine.rb 771 2008-08-28 00:45:23Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -28,7 +28,7 @@
 # For C++ EventMachines, the analogous functionality is found in ext/rubymain.cpp,
 # which is a garden-variety Ruby-extension glue module.
 
-
+require 'java'
 require 'em_reactor'
 
 module EventMachine
@@ -49,6 +49,11 @@ module EventMachine
 			EventMachine::event_callback a1, a2, s
 		end
 	end
+	class Connection < com.rubyeventmachine.Connection
+		def associate_callback_target sig
+			# No-op for the time being.
+		end
+	end
 	def self.initialize_event_machine
 		@em = JEM.new
 	end

data/lib/pr_eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: pr_eventmachine.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -578,7 +578,7 @@ module EventMachine
           end
 
           if w < data.length
-            $outbound_q.unshift data[w..-1]
+            @outbound_q.unshift data[w..-1]
             break
           end
         rescue Errno::EAGAIN

data/lib/protocols/buftok.rb

@@ -124,4 +124,4 @@ class BufferedTokenizer
   def empty?
     @input.empty?
   end
-end
+end

data/lib/protocols/header_and_content.rb

@@ -1,4 +1,4 @@
-# $Id: header_and_content.rb 782 2008-09-13 20:02:17Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/httpcli2.rb

@@ -1,4 +1,4 @@
-# $Id: httpcli2.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -28,7 +28,17 @@
 module EventMachine
 module Protocols
 
-
+  # = Example
+  #
+  #  
+  #  EM.run{
+  #    include EM::Protocols
+  #    conn = HttpClient2.connect 'google.com', 80
+  #  
+  #    req = conn.get('/')
+  #    req.callback{
+  #      p(req.content)
+  #    }
 	class HttpClient2 < Connection
 		include LineText2
 
@@ -119,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
@@ -134,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
 
@@ -224,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/httpclient.rb

@@ -1,4 +1,4 @@
-# $Id: httpclient.rb 786 2008-09-16 07:33:27Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -65,6 +65,12 @@ class HttpClient < Connection
   # Refactor this code so that protocol errors all get handled one way (an exception?),
   # instead of sprinkling set_deferred_status :failed calls everywhere.
 
+  # === Arg list
+  # :host => 'ip/dns', :port => fixnum, :verb => 'GET', :request => 'path', 
+  # :basic_auth => {:username => '', :password => ''}, :content => 'content',
+  # :contenttype => 'text/plain', :query_string => '', :host_header => '',
+  # :cookie => ''
+
   def self.request( args = {} )
     args[:port] ||= 80
     EventMachine.connect( args[:host], args[:port], self ) {|c|

data/lib/protocols/line_and_text.rb

@@ -1,4 +1,4 @@
-# $Id: line_and_text.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -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

@@ -1,4 +1,4 @@
-# $Id: linetext2.rb 778 2008-09-13 19:54:18Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -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/postgres.rb

@@ -1,5 +1,5 @@
 #
-# $Id: postgres.rb 783 2008-09-14 02:48:46Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/saslauth.rb

@@ -1,4 +1,4 @@
-# $Id: saslauth.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/smtpclient.rb

@@ -1,4 +1,4 @@
-# $Id: smtpclient.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/protocols/smtpserver.rb

@@ -1,4 +1,4 @@
-# $Id: smtpserver.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -119,40 +119,53 @@ module Protocols
 
 		def receive_line ln
 			@@parms[:verbose] and $>.puts ">>> #{ln}"
-			if @state.include?(:data)
-				process_data_line ln
-			elsif ln =~ EhloRegex
+			
+			return process_data_line ln if @state.include?(:data)
+			
+			case ln
+			when EhloRegex
 				process_ehlo $'.dup
-			elsif ln =~ HeloRegex
+			when HeloRegex
 				process_helo $'.dup
-			elsif ln =~ MailFromRegex
+			when MailFromRegex
 				process_mail_from $'.dup
-			elsif ln =~ RcptToRegex
+			when RcptToRegex
 				process_rcpt_to $'.dup
-			elsif ln =~ DataRegex
+			when DataRegex
 				process_data
-			elsif ln =~ RsetRegex
+			when RsetRegex
 				process_rset
-			elsif ln =~ VrfyRegex
+			when VrfyRegex
 				process_vrfy
-			elsif ln =~ ExpnRegex
+			when ExpnRegex
 				process_expn
-			elsif ln =~ HelpRegex
+			when HelpRegex
 				process_help
-			elsif ln =~ NoopRegex
+			when NoopRegex
 				process_noop
-			elsif ln =~ QuitRegex
+			when QuitRegex
 				process_quit
-			elsif ln =~ StarttlsRegex
+			when StarttlsRegex
 				process_starttls
-			elsif ln =~ AuthRegex
+			when AuthRegex
 				process_auth $'.dup
 			else
 				process_unknown
 			end
 		end
 
-
+    # TODO - implement this properly, the implementation is a stub!
+    def process_vrfy
+      send_data "250 Ok, but unimplemented\r\n"
+    end
+    # TODO - implement this properly, the implementation is a stub!
+    def process_help
+      send_data "250 Ok, but unimplemented\r\n"
+    end
+    # TODO - implement this properly, the implementation is a stub!
+    def process_expn
+      send_data "250 Ok, but unimplemented\r\n"
+    end
 
 		#--
 		# This is called at several points to restore the protocol state
@@ -289,8 +302,8 @@ module Protocols
 				d = receive_data_command
 
 				if d.respond_to?(:callback)
-					d.callback &succeeded
-					d.errback &failed
+					d.callback(&succeeded)
+					d.errback(&failed)
 				else
 					(d ? succeeded : failed).call
 				end
@@ -383,8 +396,8 @@ module Protocols
 				d = receive_recipient rcpt
 
 				if d.respond_to?(:set_deferred_status)
-					d.callback &succeeded
-					d.errback &failed
+					d.callback(&succeeded)
+					d.errback(&failed)
 				else
 					(d ? succeeded : failed).call
 				end
@@ -433,8 +446,8 @@ module Protocols
 				d = receive_message
 
 				if d.respond_to?(:set_deferred_status)
-					d.callback &succeeded
-					d.errback &failed
+					d.callback(&succeeded)
+					d.errback(&failed)
 				else
 					(d ? succeeded : failed).call
 				end

data/lib/protocols/stomp.rb

@@ -1,4 +1,4 @@
-# $Id: stomp.rb 738 2008-07-06 01:01:04Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -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/lib/protocols/tcptest.rb

@@ -1,4 +1,4 @@
-# $Id: tcptest.rb 668 2008-01-04 23:00:34Z blackhedd $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/tasks/cpp.rake

@@ -0,0 +1,77 @@
+# EventMachine C++ Rakefile Stab Case
+# TODO : track header files as a build dependency...
+# TODO : cross platform support
+# TODO : configure style functionality
+namespace :cpp do
+
+  require 'rake/clean'
+
+  # *nix only atm...
+  module Cpp
+    class <<self
+      def cpp; "g++"; end
+      def archive; "ar"; end
+      def compile file, output, includes=nil, flags=nil
+        sh %{#{cpp} #{file} #{includes} #{flags} -c -o #{output}}
+      end
+      def link file, output, libs=nil, flags=nil
+        sh %{#{cpp} #{file} #{libs} #{flags} -o #{output}}
+      end
+      def static output, files
+        sh %{#{archive} cr #{output} #{files}}
+      end
+    end
+  end
+
+  module EmConfig
+    Path = ENV['EVENTMACHINE_SOURCE'] || 'ext'
+    Sources = FileList["#{Path}/*.cpp"]
+    Sources.delete_if { |s| /ruby/ =~ s }
+    Compiled = Sources.sub(%r{^#{Path}/(.*)\.cpp}, "#{Path}/\\1.o")
+
+    Flags = "-O2 -pipe -fno-common -DOS_UNIX -DWITHOUT_SSL"
+    Includes = ""
+    Libs = ''
+  end
+  CLEAN.include(EmConfig::Compiled)
+
+  rule %r{^#{EmConfig::Path}/.*\.o$} => [proc { |targ| 
+    targ.sub(%r{^#{EmConfig::Path}/(.*)\.o$}, "#{EmConfig::Path}/\\1.cpp")
+    }] do |t|
+    Cpp.compile t.source, t.name, EmConfig::Includes, EmConfig::Flags
+  end
+
+  file "#{EmConfig::Path}/libeventmachine.a" => EmConfig::Compiled do |t|
+    Cpp.static t.name, EmConfig::Compiled
+  end
+  CLEAN.include("#{EmConfig::Path}/libeventmachine.a")
+
+  module AppConfig
+    Appname = 'echo_em'
+    Sources = FileList['*.cpp']
+    Compiled = Sources.sub(%r{^(.*)\.cpp}, '\\1.o')
+
+    Flags = ["", EmConfig::Flags].join(' ')
+    Includes = ["-I. -I#{EmConfig::Path}", EmConfig::Includes].join(' ')
+    Libs = ["-L#{EmConfig::Path} -leventmachine", EmConfig::Libs].join(' ')
+  end
+  CLEAN.include(AppConfig::Compiled)
+  CLEAN.include(AppConfig::Appname)
+
+  rule %r{^.*\.o$} => [proc { |targ| 
+    targ.sub(%r{^(.*)\.o$}, '\\1.cpp')
+    }] do |t|
+    Cpp.compile t.source, t.name, AppConfig::Includes, AppConfig::Flags
+  end
+
+  file AppConfig::Appname => ["#{EmConfig::Path}/libeventmachine.a", AppConfig::Compiled] do |t|
+    Cpp.link AppConfig::Compiled, t.name, AppConfig::Libs, AppConfig::Flags
+  end
+
+  task :build => AppConfig::Appname
+
+  task :run => AppConfig::Appname do
+    sh "./#{AppConfig::Appname}"
+  end
+
+end