From c2a7460315e55a75fe24ca0a4d8e44b62fd7d8cb Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 13 Feb 2019 19:30:58 +0100 Subject: [PATCH 1/2] Add ruby debugger support --- .gitignore | 1 + Gemfile | 1 + Gemfile.lock | 3 +++ 3 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index ac9f9c928..b7e4b5c36 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ storage/ /node_modules yarn-debug.log* .yarn-integrity +/.vscode diff --git a/Gemfile b/Gemfile index 1fabe7f8a..693759995 100644 --- a/Gemfile +++ b/Gemfile @@ -99,6 +99,7 @@ group :development, :test do gem 'pry-byebug' gem 'rspec-rails' gem 'rspec_junit_formatter' + gem 'ruby-debug-ide', require: false gem 'spring' # Spring speeds up development by keeping your application running in the background gem 'spring-commands-rspec' end diff --git a/Gemfile.lock b/Gemfile.lock index 1337f9a9f..a04b2d384 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -510,6 +510,8 @@ GEM unicode-display_width (~> 1.4.0) rubocop-rspec-focused (1.0.0) rubocop (>= 0.51) + ruby-debug-ide (0.6.1) + rake (>= 0.8.1) ruby-progressbar (1.10.0) ruby_dep (1.5.0) ruby_parser (3.12.0) @@ -713,6 +715,7 @@ DEPENDENCIES rspec_junit_formatter rubocop rubocop-rspec-focused + ruby-debug-ide sanitize-url sassc-rails scenic From 7413df81e0ab0186e8052cb35b38313162f41228 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Thu, 14 Feb 2019 16:23:11 +0100 Subject: [PATCH 2/2] Revert "file upload: proxy direct upload through the APP_HOST" This reverts commit 2365efbdaaca8b8444c12ac8c61903066e15da15. --- app/lib/active_storage/service/ds_proxy_service.rb | 2 +- spec/lib/active_storage/service/ds_proxy_service.rb | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/lib/active_storage/service/ds_proxy_service.rb b/app/lib/active_storage/service/ds_proxy_service.rb index e81fdfacb..78c420693 100644 --- a/app/lib/active_storage/service/ds_proxy_service.rb +++ b/app/lib/active_storage/service/ds_proxy_service.rb @@ -27,7 +27,7 @@ module ActiveStorage def publicize(url) search = %r{^https://[^/]+/v1/AUTH_[a-f0-9]{32}} - replace = "https://#{ENV['APP_HOST']}/direct-upload" + replace = 'https://static.demarches-simplifiees.fr' url.gsub(search, replace) end end diff --git a/spec/lib/active_storage/service/ds_proxy_service.rb b/spec/lib/active_storage/service/ds_proxy_service.rb index 87889d76f..90814b21b 100644 --- a/spec/lib/active_storage/service/ds_proxy_service.rb +++ b/spec/lib/active_storage/service/ds_proxy_service.rb @@ -1,20 +1,17 @@ describe ActiveStorage::Service::DsProxyService do let(:private_host) { 'storage.sbg1.cloud.ovh.net:443' } - let(:public_host) { 'www.demarches-simplifiees.fr' } + let(:public_host) { 'static.demarches-simplifiees.fr' } let(:auth) { 'AUTH_a24c37ed11a84896914514384898c34b' } let(:bucket) { 'test_local' } let(:key) { '2R6rr89nFeSRkSgXHd3smvEf' } let(:temp_url_params) { 'temp_url_sig=5ab8cfc3ba5da2598a6c88cc6b1b461fe4e115bc&temp_url_expires=1547598179' } - let(:storage_service) { storage_service = double(ActiveStorage::Service) } - subject do - allow(ENV).to receive(:[]).with('APP_HOST').and_return(public_host) - ActiveStorage::Service::DsProxyService.new(wrapped: storage_service) - end + let(:storage_service) { storage_service = double(ActiveStorage::Service) } + subject { ActiveStorage::Service::DsProxyService.new(wrapped: storage_service) } describe '#url' do let(:private_url) { "https://#{private_host}/v1/#{auth}/#{bucket}/#{key}?#{temp_url_params}" } - let(:public_url) { "https://#{public_host}/direct-upload/#{bucket}/#{key}?#{temp_url_params}" } + let(:public_url) { "https://#{public_host}/#{bucket}/#{key}?#{temp_url_params}" } before do expect(storage_service).to receive(:url).and_return(private_url) @@ -28,7 +25,7 @@ describe ActiveStorage::Service::DsProxyService do describe '#url_for_direct_upload' do let(:download_params) { 'inline&filename=documents_top_confidentiels.bmp' } let(:private_url) { "https://#{private_host}/v1/#{auth}/#{bucket}/#{key}?#{temp_url_params}&#{download_params}" } - let(:public_url) { "https://#{public_host}/direct-upload/#{bucket}/#{key}?#{temp_url_params}&#{download_params}" } + let(:public_url) { "https://#{public_host}/#{bucket}/#{key}?#{temp_url_params}&#{download_params}" } before do expect(storage_service).to receive(:url_for_direct_upload).and_return(private_url)