kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't depend on HTTParty

Browse source 
"httparty" is only added in #30020 to write two tests to make PUT requests
against S3 and GCS.

The same requests can be made with net/http, removing a dependency from the Gemfile.
This commit is contained in:
claudiob 2017-08-01 10:56:39 -07:00
parent a9cb1968b6
commit 98bb99ef61
5 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -93,8 +93,6 @@ group :cable do
end end
group :storage do group :storage do
gem "httparty"
gem "aws-sdk", "~> 2", require: false gem "aws-sdk", "~> 2", require: false
gem "google-cloud-storage", "~> 1.3", require: false gem "google-cloud-storage", "~> 1.3", require: false

4
Gemfile.lock
View file

@ -268,8 +268,6 @@ GEM
signet (~> 0.7) signet (~> 0.7)
hiredis (0.6.1) hiredis (0.6.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.15.6)
multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (0.8.6) i18n (0.8.6)
jmespath (1.3.1) jmespath (1.3.1)
@ -311,7 +309,6 @@ GEM
msgpack (1.1.0-x64-mingw32) msgpack (1.1.0-x64-mingw32)
msgpack (1.1.0-x86-mingw32) msgpack (1.1.0-x86-mingw32)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
mustache (1.0.5) mustache (1.0.5)
mustermann (1.0.0) mustermann (1.0.0)
@ -503,7 +500,6 @@ DEPENDENCIES
erubis (~> 2.7.0) erubis (~> 2.7.0)
google-cloud-storage (~> 1.3) google-cloud-storage (~> 1.3)
hiredis hiredis
httparty
jquery-rails jquery-rails
json (>= 2.0.0) json (>= 2.0.0)
kindlerb (~> 1.2.0) kindlerb (~> 1.2.0)

1
activestorage/test/service/azure_service_test.rb
View file

@ -1,5 +1,4 @@
require "service/shared_service_tests" require "service/shared_service_tests"
require "httparty"
require "uri" require "uri"
if SERVICE_CONFIGURATIONS[:azure] if SERVICE_CONFIGURATIONS[:azure]

16
activestorage/test/service/gcs_service_test.rb
View file

@ -1,5 +1,5 @@
require "service/shared_service_tests" require "service/shared_service_tests"
require "httparty" require "net/http"
if SERVICE_CONFIGURATIONS[:gcs] if SERVICE_CONFIGURATIONS[:gcs]
class ActiveStorage::Service::GCSServiceTest < ActiveSupport::TestCase class ActiveStorage::Service::GCSServiceTest < ActiveSupport::TestCase
@ -14,12 +14,14 @@ if SERVICE_CONFIGURATIONS[:gcs]
checksum = Digest::MD5.base64digest(data) checksum = Digest::MD5.base64digest(data)
url = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size, checksum: checksum) url = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size, checksum: checksum)
HTTParty.put( uri = URI.parse url
url, request = Net::HTTP::Put.new uri.request_uri
body: data, request.body = data
headers: { "Content-Type" => "text/plain", "Content-MD5" => checksum }, request.add_field 'Content-Type', 'text/plain'
debug_output: STDOUT request.add_field 'Content-MD5', checksum
) Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
http.request request
end
assert_equal data, @service.download(key) assert_equal data, @service.download(key)
ensure ensure

16
activestorage/test/service/s3_service_test.rb
View file

@ -1,5 +1,5 @@
require "service/shared_service_tests" require "service/shared_service_tests"
require "httparty" require "net/http"
if SERVICE_CONFIGURATIONS[:s3] if SERVICE_CONFIGURATIONS[:s3]
class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase
@ -14,12 +14,14 @@ if SERVICE_CONFIGURATIONS[:s3]
checksum = Digest::MD5.base64digest(data) checksum = Digest::MD5.base64digest(data)
url = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size, checksum: checksum) url = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size, checksum: checksum)
HTTParty.put( uri = URI.parse url
url, request = Net::HTTP::Put.new uri.request_uri
body: data, request.body = data
headers: { "Content-Type" => "text/plain", "Content-MD5" => checksum }, request.add_field 'Content-Type', 'text/plain'
debug_output: STDOUT request.add_field 'Content-MD5', checksum
) Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
http.request request
end
assert_equal data, @service.download(key) assert_equal data, @service.download(key)
ensure ensure