kemko/paperclip
1
0
Fork 0
mirror of https://github.com/kemko/paperclip.git synced 2026-01-06 02:15:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed unused settings

Browse Source
This commit is contained in:
Max Melentiev
2018-11-09 19:32:51 +03:00
parent 84f983881c
commit 63587c88d4
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/paperclip/attachment.rb
View File

@@ -40,10 +40,6 @@ module Paperclip
options = self.class.default_options.merge(options)
@url = options[:url]
@s3_url = options[:s3_url]
@s3_path = options[:s3_path]
@filesystem_url = options[:filesystem_url]
@filesystem_path = options[:filesystem_path]
@url = @url.call(self) if @url.is_a?(Proc)
@path = options[:path]
@path = @path.call(self) if @path.is_a?(Proc)
@@ -52,7 +48,6 @@ module Paperclip
@styles = options[:styles]
@styles = @styles.call(self) if @styles.is_a?(Proc)
@default_url = options[:default_url]
@filesystem_url = options[:filesystem_url]
@validations = options[:validations]
@default_style = options[:default_style]
@storage = options[:storage]

5
lib/paperclip/storage/delayeds3.rb
View File

@@ -71,18 +71,13 @@ module Paperclip
@s3_credentials = self.class.parse_credentials(@options[:s3_credentials])
@bucket = @options[:bucket] || @s3_credentials[:bucket]
@bucket = @bucket.call(self) if @bucket.is_a?(Proc)
@s3_options = @options[:s3_options] || {}
@s3_permissions = @options[:s3_permissions] || 'public-read'
@s3_protocol = @options[:s3_protocol] || (@s3_permissions == 'public-read' ? 'http' : 'https')
@s3_headers = @options[:s3_headers] || {}
@s3_host_alias = @options[:s3_host_alias]
@job_priority = @options[:job_priority]
@fog_provider = @options[:fog_provider]
@fog_directory = @options[:fog_directory]
@fog_credentials = @options[:fog_credentials]
@s3_url = ":s3_path_url" unless @s3_url.to_s.match(/^:s3.*url$/)
end
def aws_bucket