http_request.rb 1.1.7 → 1.1.8

data/Changelog

@@ -1,4 +1,7 @@
-v1.1.6
+v1.1.8
+   * fixed parameters when uploading files (it's double escaped)
+
+v1.1.7
    * replaced X_REQUESTED_WITH with X-Requested-With for sending AJAX request
 
 v1.1.6

data/README.rdoc

@@ -69,12 +69,12 @@ add cookies into header
 upload file by post method
     HttpRequest.post(
       :url => 'http://localhost/upload.php', 
-      :files => [{
+      :files => {
         :file_name     => 'test.txt',            # original file name, default is rand name such as 0cdex_0
         :field_name    => 'user_file',           # input field name, default is "files[]"
         :content_type  => 'text/plain',          # content type, default is application/octet-stream
         :file_content  => 'Have a nice day!'     # file content
-      }]
+      }
     )
 
 upload more than 1 file
@@ -227,4 +227,4 @@ download multiple files from a directory
   bug fixing, testing and testing...
 
 == LATEST VERSION
-  1.1.7
+  1.1.8

data/lib/http_request.rb

@@ -286,7 +286,7 @@ class HttpRequest
 
 	# parse parameters for the options[:parameters] and @uri.query
 	def parse_parameters
-		if @options[:parameters].is_a? Hash
+		if @options[:parameters].is_a?(Hash)
 			@options[:parameters] = @options[:parameters].collect{|k, v| 
 					"#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
 			}.join('&')
@@ -297,7 +297,7 @@ class HttpRequest
 		end
 
 		# for uploading files
-		build_multipart	if @options[:files].is_a?(Array) and 'post'.eql?(@options[:method])
+		build_multipart	if @options[:files] and 'post'.eql?(@options[:method])
 	end
 
 	# for uploading files
@@ -305,16 +305,17 @@ class HttpRequest
 		boundary = md5(rand.to_s).to_s[0..5]
 		@headers['Content-type'] = "multipart/form-data, boundary=#{boundary}"
 		multipart = []
-		if @options[:parameters]
-			@options[:parameters] = CGI.parse(@options[:parameters]) if @options[:parameters].is_a? String
+		if @options[:parameters].is_a?(String)
+			@options[:parameters] = CGI.parse(@options[:parameters])
 			if @options[:parameters].is_a? Hash
 				@options[:parameters].each {|k, v| 
 					multipart << "--#{boundary}" 
-					multipart << "Content-disposition: form-data; name=\"#{CGI.escape(k.to_s)}\"" 
-					multipart << "\r\n#{CGI.escape(v.to_s)}"
+					multipart << "Content-disposition: form-data; name=\"#{k}\"" 
+					multipart << "\r\n#{v.first}"
 				}
 			end
 		end
+    @options[:files] = [@options[:files]] if @options[:files].is_a?(Hash)
 		@options[:files].each_with_index {|f, index|
 			f[:field_name] ||= "files[]"
 			f[:file_name] ||= "#{boundary}_#{index}"

data/test/test_http_request.rb

@@ -63,29 +63,23 @@ context "some basic requests with parameter" do
 		hr.get(URL + '/get?&#').body.should.equal({}.inspect)
 		hr.get(URL + '/get?abc=').body.should.equal({'abc' => ''}.inspect)
 
-		hr.get(URL + '/get?lang=Ruby&version=1.9').body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.get(URL + '/get?lang=Ruby&version=1.9').body.should.include('"lang"=>"Ruby"')
+		hr.get(URL + '/get?lang=Ruby&version=1.9').body.should.include('"version"=>"1.9"')
 
-		hr.get(:url => URL + '/get', :parameters => 'lang=Ruby&version=1.9').body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.get(:url => URL + '/get', :parameters => 'lang=Ruby&version=1.9').body.should.include('"lang"=>"Ruby"')
+		hr.get(:url => URL + '/get', :parameters => 'lang=Ruby&version=1.9').body.should.include('"version"=>"1.9"')
 
-		hr.get(:url => URL + '/get', :parameters => {:lang => 'Ruby', :version => 1.9}).body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.get(:url => URL + '/get', :parameters => {:lang => 'Ruby', :version => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.get(:url => URL + '/get', :parameters => {:lang => 'Ruby', :version => '1.9'}).body.should.include('"version"=>"1.9"')
 
-		hr.get(:url => URL + '/get?lang=Ruby', :parameters => {:version => 1.9}).body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.get(:url => URL + '/get?lang=Ruby', :parameters => {:version => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.get(:url => URL + '/get?lang=Ruby', :parameters => {:version => '1.9'}).body.should.include('"version"=>"1.9"')
 
-		hr.get(:url => URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.get(:url => URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.get(:url => URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"version"=>"1.9"')
 
-		hr.get(URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.get(URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.get(URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"version"=>"1.9"')
 
 		hr.get(URL + '/get?ids[]=1&ids[]=2').body.should.equal({
       'ids' => ['1', '2']
@@ -103,9 +97,9 @@ context "some basic requests with parameter" do
       'ids' => {'a' => '1', 'b' => '2'}
 		}.inspect)
 
-		hr.get(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.equal({
-      'ids' => {'a' => '1', 'b' => '2'}
-		}.inspect)
+		hr.get(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.include('"ids"=>{')
+		hr.get(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.include('"a"=>"1"')
+		hr.get(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.include('"b"=>"2"')
 	end
 
 	specify "post method" do
@@ -114,21 +108,23 @@ context "some basic requests with parameter" do
 		hr.post(URL + '/get?&#').body.should.equal({}.inspect)
 		hr.post(URL + '/get?abc=').body.should.equal({'abc' => ''}.inspect)
 
-		hr.post(URL + '/get?lang=Ruby&version=1.9').body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.post(URL + '/get?lang=Ruby&version=1.9').body.should.include('"lang"=>"Ruby"')
+		hr.post(URL + '/get?lang=Ruby&version=1.9').body.should.include('"version"=>"1.9"')
 
-		hr.post(:url => URL + '/get', :parameters => 'lang=Ruby&version=1.9').body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.post(:url => URL + '/get', :parameters => 'lang=Ruby&version=1.9').body.should.include('"lang"=>"Ruby"')
+		hr.post(:url => URL + '/get', :parameters => 'lang=Ruby&version=1.9').body.should.include('"version"=>"1.9"')
 
-		hr.post(:url => URL + '/get', :parameters => {:lang => 'Ruby', :version => 1.9}).body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.post(:url => URL + '/get', :parameters => {:lang => 'Ruby', :version => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.post(:url => URL + '/get', :parameters => {:lang => 'Ruby', :version => '1.9'}).body.should.include('"version"=>"1.9"')
 
-		hr.post(:url => URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.equal({
-			'lang' => 'Ruby', 'version' => '1.9'
-		}.inspect)
+		hr.post(:url => URL + '/get?lang=Ruby', :parameters => {:version => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.post(:url => URL + '/get?lang=Ruby', :parameters => {:version => '1.9'}).body.should.include('"version"=>"1.9"')
+
+		hr.post(:url => URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.post(:url => URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"version"=>"1.9"')
+
+		hr.post(URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"lang"=>"Ruby"')
+		hr.post(URL + '/get', :parameters => {'lang' => 'Ruby', 'version' => '1.9'}).body.should.include('"version"=>"1.9"')
 
 		hr.post(URL + '/get?ids[]=1&ids[]=2').body.should.equal({
       'ids' => ['1', '2']
@@ -146,9 +142,9 @@ context "some basic requests with parameter" do
       'ids' => {'a' => '1', 'b' => '2'}
 		}.inspect)
 
-		hr.post(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.equal({
-      'ids' => {'a' => '1', 'b' => '2'}
-		}.inspect)
+		hr.post(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.include('"ids"=>{')
+		hr.post(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.include('"a"=>"1"')
+		hr.post(:url => URL + '/get', :parameters => {'ids[a]' => 1, 'ids[b]' => 2}).body.should.include('"b"=>"2"')
 	end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: http_request.rb
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - xianhua.zhou
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +08:00
+date: 2010-09-14 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -47,7 +46,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -56,7 +54,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"