Skip to content

bd - exclude headers option added on file upload #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deanbr wants to merge 11 commits into
base: master
Choose a base branch
from
Open

bd - exclude headers option added on file upload #2

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0228b4a
Experimenting with the boundary setting
Apr 27, 2017
1fc29f2
Fix typo
Apr 27, 2017
d506a0f
Uncomment code
Apr 27, 2017
5e7e837
Remove unnecessary spaces
Apr 27, 2017
524bfb5
Change boundary value
Apr 27, 2017
6d636df
Updating boundary to remove hyphens
Apr 27, 2017
cbb3754
Further testing with Restclient
Apr 27, 2017
5636355
Clean up test printlns, change logic in Payload request to use parent…
Apr 27, 2017
ff44495
temporarily reverting the payload headers method
Apr 27, 2017
fa6f5b0
Reverting changes, added todo
Apr 27, 2017
7bf42b1
Attempt to strip header info if exclude_headers is true
Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions lib/restclient/payload.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,11 @@ class Multipart < Base

def build_stream(params)
b = '--' + boundary
exclude_headers = params[:exclude_headers]

@stream = Tempfile.new("RESTClient.Stream.#{rand(1000)}")
@stream.binmode
@stream.write(b + EOL)
@stream.write(b + EOL) unless exclude_headers

case params
when Hash, ParamsArray
Expand All @@ -134,14 +135,14 @@ def build_stream(params)
x.each_with_index do |a, index|
k, v = * a
if v.respond_to?(:read) && v.respond_to?(:path)
create_file_field(@stream, k, v)
create_file_field(@stream, k, v) unless exclude_headers
else
create_regular_field(@stream, k, v)
end
@stream.write(EOL + b)
@stream.write(EOL) unless last_index == index
@stream.write(EOL + b) unless exclude_headers
@stream.write(EOL) unless last_index == index || exclude_headers
end
@stream.write('--')
@stream.write('--') unless exclude_headers
@stream.write(EOL)
@stream.seek(0)
end
Expand All @@ -153,13 +154,15 @@ def create_regular_field(s, k, v)
s.write(v)
end

def create_file_field(s, k, v)
def create_file_field(s, k, v, exclude_headers = false)
begin
s.write("Content-Disposition: form-data;")
s.write(" name=\"#{k}\";") unless (k.nil? || k=='')
s.write(" filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
s.write("Content-Type: #{v.respond_to?(:content_type) ? v.content_type : mime_for(v.path)}#{EOL}")
s.write(EOL)
unless exclude_headers
s.write("Content-Disposition: form-data;")
s.write(" name=\"#{k}\";") unless (k.nil? || k=='')
s.write(" filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
s.write("Content-Type: #{v.respond_to?(:content_type) ? v.content_type : mime_for(v.path)}#{EOL}")
s.write(EOL)
end
while (data = v.read(8124))
s.write(data)
end
Expand Down Expand Up @@ -198,7 +201,8 @@ def handle_key key
end

def headers
super.merge({'Content-Type' => %Q{multipart/form-data; boundary=#{boundary}}})
# TODO: Update to allow user to pass in boundary in execute call
super.merge({'Content-Type' => %Q{multipart/form-data; boundary=ABW5FxdjB4-3nf6AYqUutk96-trWPzHdLABW5FxdjB4}})
end

def close
Expand Down