Rename the S3 provider to just S3
This commit is contained in:
parent
5da0d0b5c3
commit
ca0127d6a6
@ -5,7 +5,7 @@ require "openssl"
|
|||||||
require "webrick/httputils"
|
require "webrick/httputils"
|
||||||
|
|
||||||
module RemoteStorage
|
module RemoteStorage
|
||||||
class S3Rest
|
class S3
|
||||||
include RestProvider
|
include RestProvider
|
||||||
|
|
||||||
private
|
private
|
@ -5,7 +5,7 @@ require "sinatra/base"
|
|||||||
require 'sinatra/config_file'
|
require 'sinatra/config_file'
|
||||||
require "sinatra/reloader"
|
require "sinatra/reloader"
|
||||||
require "remote_storage/swift"
|
require "remote_storage/swift"
|
||||||
require "remote_storage/s3_rest"
|
require "remote_storage/s3"
|
||||||
|
|
||||||
class LiquorCabinet < Sinatra::Base
|
class LiquorCabinet < Sinatra::Base
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ class LiquorCabinet < Sinatra::Base
|
|||||||
if settings.respond_to? :swift
|
if settings.respond_to? :swift
|
||||||
RemoteStorage::Swift.new(settings, self)
|
RemoteStorage::Swift.new(settings, self)
|
||||||
elsif settings.respond_to? :s3
|
elsif settings.respond_to? :s3
|
||||||
RemoteStorage::S3Rest.new(settings, self)
|
RemoteStorage::S3.new(settings, self)
|
||||||
else
|
else
|
||||||
puts <<-EOF
|
puts <<-EOF
|
||||||
You need to set one storage backend in your config.yml file.
|
You need to set one storage backend in your config.yml file.
|
||||||
|
@ -6,7 +6,7 @@ describe "S3 provider" do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def storage_class
|
def storage_class
|
||||||
RemoteStorage::S3Rest
|
RemoteStorage::S3
|
||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user