diff --git a/config/core_ext/net-http-multipart.rb b/config/core_ext/net-http-multipart.rb deleted file mode 100644 index a98a113b..00000000 --- a/config/core_ext/net-http-multipart.rb +++ /dev/null @@ -1,26 +0,0 @@ -require "net/http" - -class Net::HTTP::Post - def multipart=(params = []) - boundary_token = "--multipart-boundary" - self.content_type = "multipart/form-data; boundary=#{boundary_token}" - - self.body = "" - params.each do |p| - self.body += "--#{boundary_token}\r\n" - self.body += "Content-Disposition: form-data; name=#{p[:name]}" - self.body += "; filename=#{p[:filename]}" if p[:filename] - self.body += "\r\n" - if p[:binary] - self.body += "Content-Transfer-Encoding: binary\r\n" - - mime_type = MiniMime.lookup_by_filename(p[:filename].to_s).try(:content_type) - mime_type ||= "application/octet-stream" - - self.body += "Content-Type: #{mime_type}\r\n" - end - self.body += "\r\n#{p[:data]}\r\n" - end - self.body += "--#{boundary_token}--\r\n" - end -end diff --git a/lib/similar_images.rb b/lib/similar_images.rb index f337437d..29dd3a53 100644 --- a/lib/similar_images.rb +++ b/lib/similar_images.rb @@ -52,23 +52,15 @@ module SimilarImages params = [] if search_url - params += [ { - name: "url", - data: search_url - } ] + params << [ "url", search_url ] else - params += [ { - name: "file", - binary: true, - data: source_file, - filename: File.basename(source_filename) - } ] + params << [ "file", source_file, filename: File.basename(source_filename) ] end services_list.each do |s| - params += [ { name: "service[]", data: s } ] + params << [ "service[]", s ] end - params += [ { name: "forcegray", data: "on" } ] if options[:forcegray] == "1" + params << [ "forcegray", "on" ] if options[:forcegray] == "1" begin Timeout.timeout(10) do @@ -85,7 +77,7 @@ module SimilarImages http.read_timeout = 10 request = Net::HTTP::Post.new(server) - request.multipart = params + request.set_form params, "multipart/form-data" response = http.request(request) server_responses[server] = response.body end