diff --git a/lib/paperclip/attachment.rb b/lib/paperclip/attachment.rb index a755add..410e66f 100644 --- a/lib/paperclip/attachment.rb +++ b/lib/paperclip/attachment.rb @@ -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] diff --git a/lib/paperclip/storage/delayeds3.rb b/lib/paperclip/storage/delayeds3.rb index ead978c..f7198e9 100644 --- a/lib/paperclip/storage/delayeds3.rb +++ b/lib/paperclip/storage/delayeds3.rb @@ -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