rhodes 3.2.0.beta.4 → 3.2.0.beta.5

data/lib/extensions/net-http/net/ftp.rb

@@ -25,6 +25,7 @@ module Net
   class FTPTempError < FTPError; end 
   class FTPPermError < FTPError; end 
   class FTPProtoError < FTPError; end
+  class FTPConnectionError < FTPError; end
   # :startdoc:
 
   #
@@ -128,10 +129,12 @@ module Net
     #
     def initialize(host = nil, user = nil, passwd = nil, acct = nil)
       super()
-      @binary = false
+      @binary = true
       @passive = false
       @debug_mode = false
       @resume = false
+      @sock = NullSocket.new
+      @logged_in = false
       if host
 	connect(host)
 	if user
@@ -143,10 +146,19 @@ module Net
     def binary=(newmode)
       if newmode != @binary
         @binary = newmode
-        @binary ? voidcmd("TYPE I") : voidcmd("TYPE A")
+        send_type_command if @logged_in
       end
     end
 
+    def send_type_command
+      if @binary
+        voidcmd("TYPE I")
+      else
+        voidcmd("TYPE A")
+      end
+    end
+    private :send_type_command
+
     def with_binary(newmode)
       oldmode = binary
       self.binary = newmode
@@ -362,23 +374,7 @@ module Net
       return conn
     end
     private :transfercmd
-    
-    def getaddress
-      thishost = Socket.gethostname
-      if not thishost.index(".")
-	thishost = Socket.gethostbyname(thishost)[0]
-      end
-      if ENV.has_key?("LOGNAME")
-	realuser = ENV["LOGNAME"]
-      elsif ENV.has_key?("USER")
-	realuser = ENV["USER"]
-      else
-	realuser = "anonymous"
-      end
-      return realuser + "@" + thishost
-    end
-    private :getaddress
-    
+
     #
     # Logs in to the remote host. The session must have been previously
     # connected.  If +user+ is the string "anonymous" and the +password+ is
@@ -389,7 +385,7 @@ module Net
     #
     def login(user = "anonymous", passwd = nil, acct = nil)
       if user == "anonymous" and passwd == nil
-	passwd = getaddress
+	passwd = "anonymous@"
       end
       
       resp = ""
@@ -408,7 +404,8 @@ module Net
 	raise FTPReplyError, resp
       end
       @welcome = resp
-      self.binary = true
+      send_type_command
+      @logged_in = true
     end
     
     #
@@ -445,12 +442,7 @@ module Net
           loop do
             line = conn.gets
             break if line == nil
-            if line[-2, 2] == CRLF
-              line = line[0 .. -3]
-            elsif line[-1] == ?\n
-              line = line[0 .. -2]
-            end
-            yield(line)
+            yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?)
           end
           conn.close
           voidresp
@@ -470,7 +462,7 @@ module Net
       end
       synchronize do
 	with_binary(true) do
-          conn = transfercmd(cmd, rest_offset)
+          conn = transfercmd(cmd)
           loop do
             buf = file.read(blocksize)
             break if buf == nil
@@ -544,7 +536,7 @@ module Net
       end
       begin
 	f.binmode if localfile
-	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
+	retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
 	  f.write(data) if localfile
 	  yield(data) if block_given?
           result.concat(data) if result
@@ -570,10 +562,11 @@ module Net
         result = ""
       end
       begin
-	retrlines("RETR " + remotefile) do |line|
-	  f.puts(line) if localfile
-	  yield(line) if block_given?
-          result.concat(line + "\n") if result
+	retrlines("RETR " + remotefile) do |line, newline|
+          l = newline ? line + "\n" : line
+	  f.print(l) if localfile
+	  yield(line, newline) if block_given?
+          result.concat(l) if result
 	end
         return result
       ensure
@@ -613,7 +606,11 @@ module Net
       f = open(localfile)
       begin
 	f.binmode
-	storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
+        if rest_offset
+          storbinary("APPE " + remotefile, f, blocksize, rest_offset, &block)
+        else
+          storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
+        end
       ensure
 	f.close
       end
@@ -676,7 +673,7 @@ module Net
     def list(*args, &block) # :yield: line
       cmd = "LIST"
       args.each do |arg|
-	cmd = cmd + " " + arg
+	cmd = cmd + " " + arg.to_s
       end
       if block
 	retrlines(cmd, &block)
@@ -970,8 +967,15 @@ module Net
       return dirname
     end
     private :parse257
-  end
 
+    # :stopdoc:
+    class NullSocket
+      def method_missing(mid, *args)
+        raise FTPConnectionError, "not connected"
+      end
+    end
+    # :startdoc:
+  end
 end
 
 

data/lib/extensions/net-http/net/http.rb

@@ -22,8 +22,8 @@
 # http://www.ruby-lang.org/ja/man/html/net_http.html
 # 
 #--
-# $Id: http.rb 18805 2008-08-24 03:21:36Z naruse $
-#++ 
+# $Id: http.rb 30571 2011-01-16 12:35:11Z yugui $
+#++
 
 require 'net/protocol'
 require 'uri'
@@ -39,7 +39,7 @@ module Net   #:nodoc:
   # 
   # This library provides your program functions to access WWW
   # documents via HTTP, Hyper Text Transfer Protocol version 1.1.
-  # For details of HTTP, refer [RFC2616]
+  # For details of HTTP, refer to [RFC2616]
   # (http://www.ietf.org/rfc/rfc2616.txt).
   # 
   # == Examples
@@ -220,7 +220,7 @@ module Net   #:nodoc:
   #       HTTPUnknownResponse
   #       HTTPInformation                    # 1xx
   #           HTTPContinue                       # 100
-  #           HTTPSwitchProtocl                  # 101
+  #           HTTPSwitchProtocol                 # 101
   #       HTTPSuccess                        # 2xx
   #           HTTPOK                             # 200
   #           HTTPCreated                        # 201
@@ -284,7 +284,7 @@ module Net   #:nodoc:
   class HTTP < Protocol
 
     # :stopdoc:
-    Revision = %q$Revision: 18805 $.split[1]
+    Revision = %q$Revision: 30571 $.split[1]
     HTTPVersion = '1.1'
     @newimpl = true
     begin
@@ -446,15 +446,51 @@ module Net   #:nodoc:
       BufferedIO
     end
 
-    # creates a new Net::HTTP object and opens its TCP connection and 
-    # HTTP session.  If the optional block is given, the newly 
-    # created Net::HTTP object is passed to it and closed when the 
+    # call-seq:
+    #   HTTP.start(address, port, p_addr, p_port, p_user, p_pass, &block)
+    #   HTTP.start(address, port=nil, p_addr=nil, p_port=nil, p_user=nil, p_pass=nil, opt, &block)
+    #
+    # creates a new Net::HTTP object and opens its TCP connection and
+    # HTTP session.
+    #
+    # Argments are following:
+    # _address_ :: hostname or IP address of the server
+    # _port_    :: port of the server
+    # _p_addr_  :: address of proxy
+    # _p_port_  :: port of proxy
+    # _p_user_  :: user of proxy
+    # _p_pass_  :: pass of proxy
+    # _opt_     :: optional hash
+    #
+    # _opt_ sets following values by its accessor.
+    # The keys are ca_file, ca_path, cert, cert_store, ciphers,
+    # close_on_empty_response, key, open_timeout, read_timeout, ssl_timeout,
+    # ssl_version, use_ssl, verify_callback, verify_depth and verify_mode.
+    # If you set :use_ssl as true, you can use https and default value of
+    # verify_mode is set as OpenSSL::SSL::VERIFY_PEER.
+    #
+    # If the optional block is given, the newly
+    # created Net::HTTP object is passed to it and closed when the
     # block finishes.  In this case, the return value of this method
     # is the return value of the block.  If no block is given, the
     # return value of this method is the newly created Net::HTTP object
     # itself, and the caller is responsible for closing it upon completion.
-    def HTTP.start(address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil, &block) # :yield: +http+
-      new(address, port, p_addr, p_port, p_user, p_pass).start(&block)
+    def HTTP.start(address, *arg, &block) # :yield: +http+
+      arg.pop if opt = Hash.try_convert(arg[-1])
+      port, p_addr, p_port, p_user, p_pass = *arg
+      port = https_default_port if !port && opt && opt[:use_ssl]
+      http = new(address, port, p_addr, p_port, p_user, p_pass)
+
+      #if opt
+      #  opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
+      #  http.methods.grep(/\A(\w+)=\z/) do |meth|
+      #    key = $1.to_sym
+      #    opt.key?(key) or next
+      #    http.__send__(meth, opt[key])
+      #  end
+     # end
+
+      http.start(&block)
     end
 
     class << HTTP
@@ -589,8 +625,11 @@ module Net   #:nodoc:
       end
       if use_ssl?
         ssl_parameters = Hash.new
+        iv_list = instance_variables
         SSL_ATTRIBUTES.each do |name|
-          if value = instance_variable_get("@#{name}")
+          ivname = "@#{name}".intern
+          if iv_list.include?(ivname) and
+             value = instance_variable_get(ivname)
             ssl_parameters[name] = value
           end
         end
@@ -607,23 +646,27 @@ module Net   #:nodoc:
       @socket.read_timeout = @read_timeout
       @socket.debug_output = @debug_output
       if use_ssl?
-        if proxy?
-          @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
-                                    @address, @port, HTTPVersion)
-          @socket.writeline "Host: #{@address}:#{@port}"
-          if proxy_user
-            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
-            credential.delete!("\r\n")
-            @socket.writeline "Proxy-Authorization: Basic #{credential}"
+        begin
+          if proxy?
+            @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
+                                      @address, @port, HTTPVersion)
+            @socket.writeline "Host: #{@address}:#{@port}"
+            if proxy_user
+              credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
+              credential.delete!("\r\n")
+              @socket.writeline "Proxy-Authorization: Basic #{credential}"
+            end
+            @socket.writeline ''
+            HTTPResponse.read_new(@socket).value
           end
-          @socket.writeline ''
-          HTTPResponse.read_new(@socket).value
-        end
-        if platform != 'Blackberry'
-          s.connect
+          timeout(@open_timeout) { s.connect }
           if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
             s.post_connection_check(@address)
           end
+        rescue => exception
+          D "Conn close because of connect error #{exception}"
+          @socket.close if @socket and not @socket.closed?
+          raise exception
         end
       end
       on_connect
@@ -821,7 +864,9 @@ module Net   #:nodoc:
       res = nil
       if HAVE_ZLIB
         unless  initheader.keys.any?{|k| k.downcase == "accept-encoding"}
-          initheader["accept-encoding"] = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+          initheader = initheader.merge({
+            "accept-encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+          })
           @compression = true
         end
       end
@@ -831,7 +876,7 @@ module Net   #:nodoc:
           the_body = r.read_body dest, &block
           case r["content-encoding"]
           when "gzip"
-            r.body= Zlib::GzipReader.new(StringIO.new(the_body)).read
+            r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding: "ASCII-8BIT").read
             r.delete("content-encoding")
           when "deflate"
             r.body= Zlib::Inflate.inflate(the_body);
@@ -1135,6 +1180,10 @@ module Net   #:nodoc:
       }
       end_transport req, res
       res
+    rescue => exception
+      D "Conn close because of error #{exception}"
+      @socket.close if @socket and not @socket.closed?
+      raise exception
     end
 
     def begin_transport(req)
@@ -1303,8 +1352,9 @@ module Net   #:nodoc:
     end
 
     # Returns the header field corresponding to the case-insensitive key.
-    # Returns the default value +args+, or the result of the block, or nil,
-    # if there's no header field named key.  See Hash#fetch
+    # Returns the default value +args+, or the result of the block, or
+    # raises an IndexErrror if there's no header field named +key+
+    # See Hash#fetch
     def fetch(key, *args, &block)   #:yield: +key+
       a = @header.fetch(key.downcase, *args, &block)
       a.kind_of?(Array) ? a.join(', ') : a
@@ -1321,9 +1371,9 @@ module Net   #:nodoc:
     alias each each_header
 
     # Iterates for each header names.
-    def each_name   #:yield: +key+
+    def each_name(&block)   #:yield: +key+
       block_given? or return enum_for(__method__)
-      @header.each_key { |key| yield key }
+      @header.each_key(&block)
     end
 
     alias each_key each_name
@@ -1463,13 +1513,13 @@ module Net   #:nodoc:
       return nil unless @header['content-range']
       m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
           raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
-      m[1].to_i .. m[2].to_i + 1
+      m[1].to_i .. m[2].to_i
     end
 
     # The length of the range represented in Content-Range: header.
     def range_length
       r = content_range() or return nil
-      r.end - r.begin
+      r.end - r.begin + 1
     end
 
     # Returns a content type string such as "text/html".
@@ -1605,7 +1655,6 @@ module Net   #:nodoc:
       initialize_http_header initheader
       self['Accept'] ||= '*/*'
       self['User-Agent'] ||= 'Ruby'
-      self['Connection'] ||= 'Close'
       @body = nil
       @body_stream = nil
     end
@@ -2165,13 +2214,20 @@ module Net   #:nodoc:
       end
 
       def each_response_header(sock)
+        key = value = nil
         while true
           line = sock.readuntil("\n", true).sub(/\s+\z/, '')
           break if line.empty?
-          m = /\A([^:]+):\s*/.match(line) or
-              raise HTTPBadResponse, 'wrong header line format'
-          yield m[1], m.post_match
+          if line[0] == ?\s or line[0] == ?\t and value
+            value << ' ' unless value.empty?
+            value << line.strip
+          else
+            yield key, value if key
+            key, value = line.strip.split(/\s*:\s*/, 2)
+            raise HTTPBadResponse, 'wrong header line format' if value.nil?
+          end
         end
+        yield key, value if key
       end
     end
 
@@ -2370,8 +2426,12 @@ module Net   #:nodoc:
             raise HTTPBadResponse, "wrong chunk size line: #{line}"
         len = hexlen.hex
         break if len == 0
-        @socket.read len, dest; total += len
-        @socket.read 2   # \r\n
+        begin
+          @socket.read len, dest
+        ensure
+          total += len
+          @socket.read 2   # \r\n
+        end
       end
       until @socket.readline.empty?
         # none

data/lib/extensions/net-http/net/https.rb

@@ -1,6 +1,6 @@
 =begin
 
-= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
+= net/https -- SSL/TLS enhancement for Net::HTTP.
 
 == Info
   'OpenSSL for Ruby 2' project
@@ -11,16 +11,6 @@
   This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
 
-== Requirements
-  This program requires Net 1.2.0 or higher version.
-  You can get it from RAA or Ruby's CVS repository.
-
-== Version
-  $Id: https.rb 18512 2008-08-12 05:20:09Z aamine $
-  
-  2001-11-06: Contiributed to Ruby/OpenSSL project.
-  2004-03-06: Some code is merged in to net/http.
-
 == Example
 
 Here is a simple HTTP client:
@@ -73,7 +63,7 @@ It can be replaced by the following code:
 
 : ca_file, ca_file=((|path|))
     Sets path of a CA certification file in PEM format.
-    The file can contrain several CA certificats.
+    The file can contrain several CA certificates.
 
 : ca_path, ca_path=((|path|))
     Sets path of a CA certification directory containing certifications
@@ -81,7 +71,7 @@ It can be replaced by the following code:
 
 : verify_mode, verify_mode=((|mode|))
     Sets the flags for server the certification verification at
-    begining of SSL/TLS session.
+    beginning of SSL/TLS session.
     OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable.
 
 : verify_callback, verify_callback=((|proc|))