httpclient 2.3.0 → 2.3.0.1

data/lib/httpclient/http.rb

@@ -542,7 +542,7 @@ module HTTP
           # bear in mind that server may not support it. at least ruby's CGI doesn't.
           @body = body
           remember_pos(@body)
-          @size = (body.size - body.pos) rescue body.size if body.respond_to?(:size)
+          @size = body.respond_to?(:size) ? body.size - body.pos : nil
         elsif boundary and Message.multiparam_query?(body)
           @body = build_query_multipart_str(body, boundary)
           @size = @body.size
@@ -554,45 +554,27 @@ module HTTP
 
       def remember_pos(io)
         # IO may not support it (ex. IO.pipe)
-        @positions[io] = io.pos rescue nil if io.respond_to?(:pos)
+        @positions[io] = io.pos if io.respond_to?(:pos)
       end
 
       def reset_pos(io)
-        io.pos = @positions[io] if @positions[io]
+        io.pos = @positions[io] if @positions.key?(io)
       end
 
       def dump_file(io, dev)
-        return dump_file_length(io, @size, dev) if @size
         buf = ''
         while !io.read(@chunk_size, buf).nil?
           dev << buf
         end
       end
 
-      def dump_file_length(io, size, dev)
-        buf = ''
-        while size > 0 && !(read = io.read(size > @chunk_size ? @chunk_size : size, buf)).nil?
-          dev << buf
-          size -= read.bytesize
-        end
-      end
-
       def dump_chunks(io, dev)
-        return dump_chunks_length(io, io.size, dev) if io.respond_to?(:size) && io.size
         buf = ''
         while !io.read(@chunk_size, buf).nil?
           dev << dump_chunk(buf)
         end
       end
 
-      def dump_chunks_length(io, size, dev)
-        buf = ''
-        while size > 0 && !(read = io.read(size > @chunk_size ? @chunk_size : size, buf)).nil?
-          dev << dump_chunk(buf)
-          size -= read.bytesize
-        end
-      end
-
       def dump_chunk(str)
         dump_chunk_size(str.bytesize) + (str + CRLF)
       end
@@ -618,8 +600,18 @@ module HTTP
           if Message.file?(part)
             @as_stream = true
             @body << part
-            # use chunked upload
-            @size = nil
+            if part.respond_to?(:lstat)
+              @size += part.lstat.size
+            elsif part.respond_to?(:size)
+              if sz = part.size
+                @size += sz
+              else
+                @size = nil
+              end
+            else
+              # use chunked upload
+              @size = nil
+            end
           elsif @body[-1].is_a?(String)
             @body[-1] += part.to_s
             @size += part.to_s.bytesize if @size

data/lib/httpclient/util.rb

@@ -23,6 +23,10 @@ class HTTPClient
     require 'uri'
     begin
       require 'addressable/uri'
+      # Older versions doesn't have #default_port
+      unless Addressable::URI.instance_methods.include?(:default_port) # 1.9 only
+        raise LoadError
+      end
       class AddressableURI < Addressable::URI
         # Overwrites the original definition just for one line...
         def authority

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.3.0'
+  VERSION = '2.3.0.1'
 end

data/test/test_httpclient.rb

@@ -748,6 +748,19 @@ EOS
     end
   end
 
+  def test_post_with_file_without_size
+    STDOUT.sync = true
+    File.open(__FILE__) do |file|
+      def file.size
+        # Simulates some strange Windows behaviour
+        raise SystemCallError.new "Unknown Error (20047)"
+      end
+      assert_nothing_raised do
+        @client.post(serverurl + 'servlet', {1=>2, 3=>file})
+      end
+    end
+  end
+
   def test_post_with_io # streaming, but not chunked
     myio = StringIO.new("X" * (HTTP::Message::Body::DEFAULT_CHUNK_SIZE + 1))
     def myio.read(*args)
@@ -764,7 +777,7 @@ EOS
     assert_match(/\r\n2\r\n/m, res.content)
     assert_match(/\r\nContent-Disposition: form-data; name="3"; filename=""\r\n/m, res.content)
     assert_match(/\r\nContent-Length:/m, str.string)
-    assert_equal(2, myio.called, 'should just read 2 times, no need to extra read for detecting EOF')
+    assert_equal(3, myio.called)
   end
 
   def test_post_with_io_nosize # streaming + chunked post
@@ -781,26 +794,6 @@ EOS
     assert_match(/\r\nTransfer-Encoding: chunked\r\n/m, str.string)
   end
 
-  def test_post_with_sized_io
-    myio = StringIO.new("45")
-    def myio.size
-      1
-    end
-    @client.debug_dev = str = StringIO.new
-    res = @client.post(serverurl + 'servlet', myio)
-    assert_match(/\r\n4\n/, str.string, 'should send "4" not "45"')
-  end
-
-  def test_post_with_sized_io_chunked
-    myio = StringIO.new("45")
-    def myio.size
-      1
-    end
-    @client.debug_dev = str = StringIO.new
-    res = @client.post(serverurl + 'servlet', {:file => myio})
-    assert_match(/\r\n4\r\n/, str.string, 'should send "4" not "45"')
-  end
-
   def test_post_async
     param = {'1'=>'2', '3'=>'4'}
     conn = @client.post_async(serverurl + 'servlet', param)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -478554732977301043
+      hash: 926508888754393425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -478554732977301043
+      hash: 926508888754393425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23