http2 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/http2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{http2}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-10-03}
+  s.date = %q{2012-10-05}
   s.description = %q{A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/http2.rb

@@ -339,83 +339,79 @@ class Http2
     #Use tempfile to store contents to avoid eating memory if posting something really big.
     require "tempfile"
     
-    praw = Tempfile.open("http2_post_multipart_tmp_#{boundary}")
-    args[:post].each do |key, val|
-      praw << "--#{boundary}#{@nl}"
-      
-      if val.class.name.to_s == "Tempfile" and val.respond_to?(:original_filename)
-        praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
-        praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
-      elsif val.is_a?(Hash) and val[:filename]
-        praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val[:filename]}\";#{@nl}"
+    Tempfile.open("http2_post_multipart_tmp_#{boundary}") do |praw|
+      args[:post].each do |key, val|
+        praw << "--#{boundary}#{@nl}"
         
-        if val[:content]
-          praw << "Content-Length: #{val[:content].to_s.bytesize}#{@nl}"
-        elsif val[:fpath]
-          praw << "Content-Length: #{File.size(val[:fpath])}#{@nl}"
+        if val.class.name.to_s == "Tempfile" and val.respond_to?(:original_filename)
+          praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
+          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
+        elsif val.is_a?(Hash) and val[:filename]
+          praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val[:filename]}\";#{@nl}"
+          
+          if val[:content]
+            praw << "Content-Length: #{val[:content].to_s.bytesize}#{@nl}"
+          elsif val[:fpath]
+            praw << "Content-Length: #{File.size(val[:fpath])}#{@nl}"
+          else
+            raise "Could not figure out where to get content from."
+          end
         else
-          raise "Could not figure out where to get content from."
+          praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
+          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
         end
-      else
-        praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
-        praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
-      end
-      
-      praw << "Content-Type: text/plain#{@nl}"
-      praw << @nl
-      
-      if val.class.name.to_s == "StringIO"
-        praw << val.read
-      elsif val.is_a?(Hash) and val[:content]
-        praw << val[:content].to_s
-      elsif val.is_a?(Hash) and val[:fpath]
-        File.open(val[:fpath], "r") do |fp|
-          begin
-            while data = fp.sysread(4096)
-              praw << data
+        
+        praw << "Content-Type: text/plain#{@nl}"
+        praw << @nl
+        
+        if val.class.name.to_s == "StringIO"
+          praw << val.read
+        elsif val.is_a?(Hash) and val[:content]
+          praw << val[:content].to_s
+        elsif val.is_a?(Hash) and val[:fpath]
+          File.open(val[:fpath], "r") do |fp|
+            begin
+              while data = fp.sysread(4096)
+                praw << data
+              end
+            rescue EOFError
+              #ignore.
             end
-          rescue EOFError
-            #ignore.
           end
+        else
+          praw << val.to_s
         end
-      else
-        praw << val.to_s
+        
+        praw << @nl
       end
       
-      praw << @nl
-    end
-    
-    praw << "--#{boundary}--"
-    praw.close(false)
-    
-    
-    #Generate header-string containing 'praw'-variable.
-    header_str = "POST /#{args[:url]} HTTP/1.1#{@nl}"
-    header_str << self.header_str(self.default_headers(args).merge(
-      "Content-Type" => "multipart/form-data; boundary=#{boundary}",
-      "Content-Length" => praw.size
-    ), args)
-    header_str << @nl
-    
-    
-    #Debug.
-    print "Headerstr: #{header_str}\n" if @debug
-    
-    
-    #Write and return.
-    @mutex.synchronize do
-      self.write(header_str)
-      File.open(praw.path, "r") do |fp|
-        begin
-          while data = fp.sysread(4096)
-            self.sock_write(data)
-          end
-        rescue EOFError
-          #ignore.
+      praw << "--#{boundary}--"
+      
+      
+      #Generate header-string containing 'praw'-variable.
+      header_str = "POST /#{args[:url]} HTTP/1.1#{@nl}"
+      header_str << self.header_str(self.default_headers(args).merge(
+        "Content-Type" => "multipart/form-data; boundary=#{boundary}",
+        "Content-Length" => praw.size
+      ), args)
+      header_str << @nl
+      
+      
+      #Debug.
+      print "Headerstr: #{header_str}\n" if @debug
+      
+      
+      #Write and return.
+      @mutex.synchronize do
+        self.write(header_str)
+        
+        praw.rewind
+        praw.lines do |data|
+          self.sock_write(data)
         end
+        
+        return self.read_response(args)
       end
-      
-      return self.read_response(args)
     end
   end
   
@@ -532,8 +528,14 @@ class Http2
       io = StringIO.new(@resp.args[:body])
       gz = Zlib::GzipReader.new(io)
       untrusted_str = gz.read
-      ic = Iconv.new("UTF-8//IGNORE", "UTF-8")
-      valid_string = ic.iconv(untrusted_str + " ")[0..-2]
+      
+      begin
+        valid_string = ic.encode("utf-8")
+      rescue
+        ic = Iconv.new("UTF-8//IGNORE", "UTF-8")
+        valid_string = ic.iconv(untrusted_str + " ")[0..-2]
+      end
+      
       @resp.args[:body] = valid_string
     end
     

data/spec/http2_spec.rb

@@ -64,13 +64,26 @@ describe "Http2" do
   it "should be able to do multipart-requests and keep-alive when using multipart." do
     Http2.new(:host => "www.partyworm.dk", :follow_redirects => false, :encoding_gzip => false, :debug => false) do |http|
       0.upto(5) do
+        fpath = File.realpath(__FILE__)
+        fpath2 = "#{File.realpath(File.dirname(__FILE__))}/../lib/http2.rb"
+        
         resp = http.post_multipart(:url => "multipart_test.php", :post => {
-          "test_var" => "true"
+          "test_var" => "true",
+          "test_file1" => {
+            :fpath => fpath,
+            :filename => "specfile"
+          },
+          "test_file2" => {
+            :fpath => fpath2,
+            :filename => "http2.rb"
+          }
         })
         
-        if resp.body != "multipart-test-test_var=true"
-          raise "Expected body to be 'multipart-test-test_var=true' but it wasnt: '#{resp.body}'."
-        end
+        data = JSON.parse(resp.body)
+        
+        raise "Expected 'test_var' post to be 'true' but it wasnt: '#{data["post"]["test_var"]}'." if data["post"]["test_var"] != "true"
+        raise "Expected 'test_file1' to be the same as file but it wasnt:\n#{data["files_data"]["test_file1"]}\n\n#{File.read(fpath)}" if data["files_data"]["test_file1"] != File.read(fpath)
+        raise "Expected 'test_file2' to be the same as file but it wasnt:\n#{data["files_data"]["test_file2"]}\n\n#{File.read(fpath)}" if data["files_data"]["test_file2"] != File.read(fpath2)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 +02:00
+date: 2012-10-05 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20083460 !ruby/object:Gem::Requirement
+  requirement: &21138800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *20083460
+  version_requirements: *21138800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20076900 !ruby/object:Gem::Requirement
+  requirement: &21138280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *20076900
+  version_requirements: *21138280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20066380 !ruby/object:Gem::Requirement
+  requirement: &21135240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20066380
+  version_requirements: *21135240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20060500 !ruby/object:Gem::Requirement
+  requirement: &21134660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *20060500
+  version_requirements: *21134660
 description: A lightweight framework for doing http-connections in Ruby. Supports
   cookies, keep-alive, compressing and much more.
 email: k@spernj.org
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4041781090872138595
+      hash: -1035862485575419894
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: