github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 03:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rollback to previous s3 syntax (ie. subdomains)

Browse Source
This commit is contained in:
Régis Hanol 2013-07-20 11:30:36 +02:00
parent 857813271f
commit 33977252c9
4 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@ -99,7 +99,7 @@ class Upload < ActiveRecord::Base
end
def self.is_on_s3?(url)
SiteSetting.enable_s3_uploads? && (url.start_with?(S3Store.base_url) || url.start_with?(S3Store.base_url_old))
SiteSetting.enable_s3_uploads? && url.start_with?(S3Store.base_url)
end
def self.get_from_url(url)

4
lib/s3_store.rb
View File

@ -13,10 +13,6 @@ module S3Store
end
def self.base_url
"//s3.amazonaws.com/#{SiteSetting.s3_upload_bucket}"
end
def self.base_url_old
"//#{SiteSetting.s3_upload_bucket.downcase}.s3.amazonaws.com"
end

2
spec/components/s3_store_spec.rb
View File

@ -25,7 +25,7 @@ describe S3Store do
it 'returns the url of the S3 upload if successful' do
# NOTE: s3 bucket's name are case sensitive so we can't use it as a subdomain...
S3Store.store_file(file, "SHA", 1).should == '//s3.amazonaws.com/S3_Upload_Bucket/1SHA.png'
S3Store.store_file(file, "SHA", 1).should == '//s3_upload_bucket.s3.amazonaws.com/1SHA.png'
end
after(:each) do

20
spec/models/upload_spec.rb
View File

@ -164,7 +164,7 @@ describe Upload do
it "identifies S3 uploads" do
SiteSetting.stubs(:enable_s3_uploads).returns(true)
SiteSetting.stubs(:s3_upload_bucket).returns("Bucket")
Upload.has_been_uploaded?("//s3.amazonaws.com/Bucket/1337.png").should == true
Upload.has_been_uploaded?("//bucket.s3.amazonaws.com/1337.png").should == true
end
it "identifies external urls" do
@ -174,24 +174,6 @@ describe Upload do
end
context ".is_on_s3?" do
before do
SiteSetting.stubs(:enable_s3_uploads).returns(true)
SiteSetting.stubs(:s3_upload_bucket).returns("BuCkEt")
end
it "case-insensitively matches the old subdomain format" do
Upload.is_on_s3?("//bucket.s3.amazonaws.com/1337.png").should == true
end
it "case-sensitively matches the new folder format" do
Upload.is_on_s3?("//s3.amazonaws.com/BuCkEt/1337.png").should == true
Upload.is_on_s3?("//s3.amazonaws.com/bucket/1337.png").should == false
end
end
context ".get_from_url" do
it "works only when the file has been uploaded" do