markdillon-restclient 1.2 → 1.3

data/lib/restclient.rb

@@ -92,3 +92,4 @@ module RestClient
 		nil
 	end
 end
+

data/lib/restclient/multipart.rb

@@ -7,6 +7,10 @@ class Base
 		@stream = StringIO.new(params)
 		@stream.seek(0)
 	end
+	
+	def rewind
+	 @stream.seek(0)
+	end
 
 	def read(bytes=nil)
 		@stream.read(bytes)

data/lib/restclient/request.rb

@@ -88,6 +88,7 @@ module RestClient
 			unless p.is_a?(Hash)
 				p
 			else
+			  p = flatten_params(p)
 			  if p.delete(:multipart) == true
 			    multipart = Multipart.new(p)
 			    @headers[:content_type] = %Q{multipart/form-data; boundary="#{multipart.boundary}"}
@@ -95,62 +96,25 @@ module RestClient
 		    else
   				@headers[:content_type] ||= 'application/x-www-form-urlencoded'
   				p.keys.map do |k|
-  					key = parent_key ? "#{parent_key}[#{k}]" : k
-  					if p[k].is_a? Hash
-  						process_payload(p[k], key)
-  					else
-  						value = URI.escape(p[k].to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-  						"#{key}=#{value}"
-  					end
-  				end.join("&")
+  					value = URI.escape(p[k].to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+						"#{k}=#{value}"
+  				end.join('&')
 				end
 			end
 		end
 		
-		def build_multipart(params)
-  		b = "--#{boundary}"
-
-  		@stream = Tempfile.new("RESTClient.Stream.#{rand(1000)}")
-  		@stream.write(b)
-  		params.each do |k,v|
-  		  @stream.write(EOL)
-  			if v.respond_to?(:read) && v.respond_to?(:path)
-  				create_file_field(@stream, k,v)
-  			else
-  				create_regular_field(@stream, k,v)
-  			end
-  			@stream.write(EOL + b)
-  		end
-  		@stream.write('--')
-  		@stream.write(EOL)
-  		@stream.seek(0)
-  	end
-  	
-  	def create_regular_field(s, k, v)
-  		s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"")
-  		s.write(EOL)
-  		s.write(EOL)
-  		s.write(v)
-  	end
-
-  	def create_file_field(s, k, v, content_type = nil)
-  	  content_type ||= `file -b --mime #{v.path}`.gsub(/\n/, '')
-  		begin
-  			s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"; filename=\"#{v.path}\"#{EOL}")
-  			s.write("Content-Type: #{content_type}#{EOL}")
-  			s.write(EOL)
-  			while data = v.read(8124)
-  				s.write(data)
-  			end
-  		ensure
-  			v.close
-  		end
-  	end
-  	
-  	def boundary
-  		@boundary ||= rand(1_000_000).to_s
-  	end
-
+		def flatten_params(p=nil, parent_key=nil, newp={})
+		  p.keys.each do |k|
+		    key = parent_key ? "#{parent_key}[#{k}]" : k
+				if p[k].is_a? Hash
+					newp = flatten_params(p[k], key, newp)
+				else
+					newp[key] = p[k]
+				end
+	    end
+	    return newp
+		end
+		
 		def transmit(uri, req, payload)
 			setup_credentials(req)
 
@@ -186,8 +150,6 @@ module RestClient
 			raise RestClient::ServerBrokeConnection
 		rescue Timeout::Error
 			raise RestClient::RequestTimeout
-		ensure
-		  @payload.close
 		end
 
 		def setup_credentials(req)

data/restclient.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name = "restclient"
-    s.version = "1.2"
+    s.version = "1.3"
     s.summary = "Simple REST client for Ruby, inspired by microframework syntax for specifying actions."
     s.description = "A simple REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
     s.author = "Adam Wiggins"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markdillon-restclient
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Adam Wiggins