eventmachine 0.7.0 → 0.7.2

data/lib/protocols/header_and_content.rb

@@ -1,34 +1,23 @@
-# $Id: header_and_content.rb 281 2006-11-20 03:17:22Z blackhedd $
+# $Id: header_and_content.rb 322 2007-05-22 22:18:35Z blackhedd $
 #
-# Author:: blackhedd (gmail address: garbagecat10).
-# Date:: 15 November 2006
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 15 Nov 2006
 # 
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# This program is made available under the terms of the GPL version 2.
-#
 # See EventMachine and EventMachine::Connection for documentation and
 # usage examples.
 #
 #----------------------------------------------------------------------------
 #
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# Gmail: garbagecat10
-#
+# Copyright (C) 2006-07 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 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.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 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.
 #
 #---------------------------------------------------------------------------
 #

data/lib/protocols/httpclient.rb

@@ -1,34 +1,23 @@
-# $Id: httpclient.rb 226 2006-08-10 08:55:49Z blackhedd $
+# $Id: httpclient.rb 322 2007-05-22 22:18:35Z blackhedd $
 #
-# Author:: blackhedd (gmail address: garbagecat10).
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
 # Date:: 16 July 2006
 # 
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# This program is made available under the terms of the GPL version 2.
-#
 # See EventMachine and EventMachine::Connection for documentation and
 # usage examples.
 #
 #----------------------------------------------------------------------------
 #
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# Gmail: garbagecat10
-#
+# Copyright (C) 2006-07 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 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.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 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.
 #
 #---------------------------------------------------------------------------
 #
@@ -43,8 +32,9 @@ class HttpClient < Connection
   include EventMachine::Deferrable
 
 
+    MaxPostContentLength = 20 * 1024 * 1024
+
   # USAGE SAMPLE:
-  # WARNING, POST is not yet supported!!!!!
   #
   # EventMachine.run {
   #   http = EventMachine::Protocols::HttpClient.request(
@@ -62,7 +52,7 @@ class HttpClient < Connection
   #
 
   # TODO:
-  # POST REQUESTS!!!!!!!!!!!
+  # Add streaming so we can support enormous POSTs. Current max is 20meg.
   # Timeout for connections that run too long or hang somewhere in the middle.
   # Persistent connections (HTTP/1.1), may need a associated delegate object.
   # DNS: Some way to cache DNS lookups for hostnames we connect to. Ruby's
@@ -100,10 +90,11 @@ class HttpClient < Connection
   end
 
   def send_request args
+    args[:verb] ||= args[:method] # Support :method as an alternative to :verb.
     args[:verb] ||= :get # IS THIS A GOOD IDEA, to default to GET if nothing was specified?
 
     verb = args[:verb].to_s.upcase
-    unless ["GET", "POST", "HEAD"].include?(verb)
+    unless ["GET", "POST", "PUT", "DELETE", "HEAD"].include?(verb)
       set_deferred_status :failed, {:status => 0} # TODO, not signalling the error type
       return # NOTE THE EARLY RETURN, we're not sending any data.
     end
@@ -120,16 +111,33 @@ class HttpClient < Connection
 
     # 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.
+    port = args[:port]
+
+    # POST items.
+    postcontenttype = args[:contenttype] || "application/octet-stream"
+    postcontent = args[:content] || ""
+    raise "oversized content in HTTP POST" if postcontent.length > MaxPostContentLength
 
     # ESSENTIAL for the request's line-endings to be CRLF, not LF. Some servers misbehave otherwise.
     req = [
-      "#{verb} #{request}#{qs} HTTP/1.1",
-      "Host: #{host}",
+      "#{verb} #{request}#{qs} HTTP/1.0",
+      "Host: #{host}:#{port}",
       "User-agent: Ruby EventMachine",
-      ""
-    ].map {|l| "#{l}\r\n"}.join
+    ]
 
-    send_data req
+    if verb == "POST" || verb == "PUT"
+      req << "Content-type: #{postcontenttype}"
+      req << "Content-length: #{postcontent.length}"
+    end
+
+    req << ""
+    reqstring = req.map {|l| "#{l}\r\n"}.join
+    send_data reqstring
+
+    if verb == "POST" || verb == "PUT"
+      send_data postcontent
+    end
   end
 
 
@@ -149,7 +157,12 @@ class HttpClient < Connection
         if ary.length == 2
           data = ary.last
           if ary.first == ""
-            @read_state = :content
+	      if @content_length and @content_length > 0
+		  @read_state = :content
+	      else
+		  dispatch_response
+		  @read_state = :base
+	      end
           else
             @headers << ary.first
             if @headers.length == 1

data/lib/protocols/line_and_text.rb

@@ -1,141 +1,120 @@
-# $Id: line_and_text.rb 279 2006-11-18 15:40:25Z blackhedd $
+# $Id: line_and_text.rb 322 2007-05-22 22:18:35Z blackhedd $
 #
-# Author:: blackhedd (gmail address: garbagecat10).
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
 # Date:: 15 November 2006
 # 
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# This program is made available under the terms of the GPL version 2.
-#
 # See EventMachine and EventMachine::Connection for documentation and
 # usage examples.
 #
 #----------------------------------------------------------------------------
 #
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# Gmail: garbagecat10
-#
+# Copyright (C) 2006-07 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 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.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 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.
 #
 #---------------------------------------------------------------------------
 #
 # 
-
-
+# 
+require File.dirname(__FILE__) + '/buftok'
 
 module EventMachine
-    module Protocols
-
-	class LineAndTextProtocol < Connection
-	    MaxLineLength = 16*1024
-	    MaxBinaryLength = 32*1024*1024
+  module Protocols
 
-	    def initialize *args
-		super
-		lbp_init_line_state
-	    end
-	    def receive_data data
-		if @lbp_mode == :lines
-		    @lbp_data << data
-		    while i = @lbp_data.index("\n")
-			# line-length test is provisional. Need to be tunable and do something
-			# more intelligent than throwing something.
-			if i > MaxLineLength
-			    receive_error("overlength line") if respond_to?(:receive_error)
-			    close_connection
-			    break # exit the while loop
-			end
-			line = @lbp_data.slice!(0..i).chomp
-			receive_line line if respond_to?(:receive_line)
-		    end
-		else
-		    if @lbp_binary_limit > 0
-			wanted = @lbp_binary_limit - @lbp_binary_bytes_received
-			chunk = nil
-			if data.length > wanted
-			    chunk = data.slice!(0...wanted)
-			else
-			    chunk = data
-			    data = ""
-			end
-			@lbp_binary_buffer[@lbp_binary_bytes_received...(@lbp_binary_bytes_received+chunk.length)] = chunk
-			@lbp_binary_bytes_received += chunk.length
-			if @lbp_binary_bytes_received == @lbp_binary_limit
-			    receive_binary_data(@lbp_binary_buffer) if respond_to?(:receive_binary_data)
-			    lbp_init_line_state
-			end
-			receive_data(data) if data.length > 0
-		    else
-			receive_binary_data(data) if respond_to?(:receive_binary_data)
-			data = ""
-		    end
-		end
-	    end
+    class LineAndTextProtocol < Connection
+      MaxLineLength = 16*1024
+      MaxBinaryLength = 32*1024*1024
 
-	    def unbind
-		if @lbp_mode == :binary and @lbp_binary_limit > 0
-		    if respond_to?(:receive_binary_data)
-			receive_binary_data( @lbp_binary_buffer[0...@lbp_binary_bytes_received] )
-		    end
-		end
-	    end
+      def initialize *args
+        super
+        lbp_init_line_state
+      end
+      def receive_data data
+        if @lbp_mode == :lines
+          begin
+            @lpb_buffer.extract(data).each { |line| receive_line(line) if respond_to?(:receive_line) }
+          rescue Exception
+            receive_error('overlength line') if respond_to?(:receive_error)
+            close_connection
+            return
+          end
+        else
+          if @lbp_binary_limit > 0
+            wanted = @lbp_binary_limit - @lbp_binary_bytes_received
+            chunk = nil
+            if data.length > wanted
+              chunk = data.slice!(0...wanted)
+            else
+              chunk = data
+              data = ""
+            end
+            @lbp_binary_buffer[@lbp_binary_bytes_received...(@lbp_binary_bytes_received+chunk.length)] = chunk
+            @lbp_binary_bytes_received += chunk.length
+            if @lbp_binary_bytes_received == @lbp_binary_limit
+              receive_binary_data(@lbp_binary_buffer) if respond_to?(:receive_binary_data)
+              lbp_init_line_state
+            end
+            receive_data(data) if data.length > 0
+          else
+            receive_binary_data(data) if respond_to?(:receive_binary_data)
+            data = ""
+          end
+        end
+      end
 
-	    # Set up to read the supplied number of binary bytes.
-	    # This recycles all the data currently waiting in the line buffer, if any.
-	    # If the limit is nil, then ALL subsequent data will be treated as binary
-	    # data and passed to the upstream protocol handler as we receive it.
-	    # If a limit is given, we'll hold the incoming binary data and not
-	    # pass it upstream until we've seen it all, or until there is an unbind
-	    # (in which case we'll pass up a partial).
-	    # Specifying nil for the limit (the default) means there is no limit.
-	    # Specifiyng zero for the limit will cause an immediate transition back to line mode.
-	    #
-	    def set_binary_mode size = nil
-		if @lbp_mode == :lines
-		    if size == 0
-			receive_binary_data("") if respond_to?(:receive_binary_data)
-			# Do no more work here. Stay in line mode and keep consuming data.
-		    else
-			@lbp_binary_limit = size.to_i # (nil will be stored as zero)
-			if @lbp_binary_limit > 0
-			    raise "Overlength" if @lbp_binary_limit > MaxBinaryLength # arbitrary sanity check
-			    @lbp_binary_buffer = "\0" * @lbp_binary_limit
-			    @lbp_binary_bytes_received = 0
-			end
+      def unbind
+        if @lbp_mode == :binary and @lbp_binary_limit > 0
+          if respond_to?(:receive_binary_data)
+            receive_binary_data( @lbp_binary_buffer[0...@lbp_binary_bytes_received] )
+          end
+        end
+      end
 
-			@lbp_mode = :binary
-			if @lbp_data.length > 0
-			    d,@lbp_data = @lbp_data,""
-			    receive_data d
-			end
-		    end
-		else
-		    raise "invalid operation"
-		end
-	    end
+      # Set up to read the supplied number of binary bytes.
+      # This recycles all the data currently waiting in the line buffer, if any.
+      # If the limit is nil, then ALL subsequent data will be treated as binary
+      # data and passed to the upstream protocol handler as we receive it.
+      # If a limit is given, we'll hold the incoming binary data and not
+      # pass it upstream until we've seen it all, or until there is an unbind
+      # (in which case we'll pass up a partial).
+      # Specifying nil for the limit (the default) means there is no limit.
+      # Specifiyng zero for the limit will cause an immediate transition back to line mode.
+      #
+      def set_binary_mode size = nil
+        if @lbp_mode == :lines
+          if size == 0
+            receive_binary_data("") if respond_to?(:receive_binary_data)
+            # Do no more work here. Stay in line mode and keep consuming data.
+          else
+            @lbp_binary_limit = size.to_i # (nil will be stored as zero)
+            if @lbp_binary_limit > 0
+              raise "Overlength" if @lbp_binary_limit > MaxBinaryLength # arbitrary sanity check
+              @lbp_binary_buffer = "\0" * @lbp_binary_limit
+              @lbp_binary_bytes_received = 0
+            end
 
-	    #--
-	    # For internal use, establish protocol baseline for handling lines.
-	    def lbp_init_line_state
-		@lbp_data = ""
-		@lbp_mode = :lines
-	    end
-	    private :lbp_init_line_state
+            @lbp_mode = :binary
+            receive_data @lpb_buffer.flush
+          end
+        else
+          raise "invalid operation"
+        end
+      end
 
-	end
+      #--
+      # For internal use, establish protocol baseline for handling lines.
+      def lbp_init_line_state
+        @lpb_buffer = BufferedTokenizer.new("\n", MaxLineLength)
+        @lbp_mode = :lines
+      end
+      private :lbp_init_line_state
     end
+  end
 end
-

data/lib/protocols/tcptest.rb

@@ -1,37 +1,27 @@
-# $Id: tcptest.rb 218 2006-07-17 10:29:20Z blackhedd $
+# $Id: tcptest.rb 322 2007-05-22 22:18:35Z blackhedd $
 #
-# Author:: blackhedd (gmail address: garbagecat10).
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
 # Date:: 16 July 2006
 # 
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# This program is made available under the terms of the GPL version 2.
-#
 # See EventMachine and EventMachine::Connection for documentation and
 # usage examples.
 #
 #----------------------------------------------------------------------------
 #
-# Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
-#
-# Gmail: garbagecat10
-#
+# Copyright (C) 2006-07 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 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.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 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.
 #
 #---------------------------------------------------------------------------
 #
+#
 #