lib/paperclip-aws.rb in paperclip-aws-1.2.0 vs lib/paperclip-aws.rb in paperclip-aws-1.3.0

@@ -10,38 +10,45 @@
           require 'aws-sdk'
         rescue LoadError => e
           e.message << " (You may need to install the aws-sdk gem)"
           raise e
         end unless defined?(AWS)
-
-        base.instance_eval do
-          @s3_credentials   = parse_credentials(@options[:s3_credentials])
+        
+        base.instance_eval do         
+          @s3_credentials = parse_credentials(@options.s3_credentials)
+          @s3_permissions = set_permissions(@options.s3_permissions)
+          @s3_protocol    = @options.s3_protocol    ||
+            Proc.new do |style, attachment|
+              permission  = (@s3_permissions[style.to_sym] || @s3_permissions[:default])
+              permission  = permission.call(attachment, style) if permission.is_a?(Proc)
+              (permission == :public_read) ? 'http' : 'https'
+            end
+          @s3_headers     = @options.s3_headers     || {}
           
-          # setup bucket
-          @s3_bucket = @options[:s3_bucket] || @s3_credentials[:bucket]
+          @s3_bucket      = @options.bucket
           @s3_bucket = @s3_bucket.call(self) if @s3_bucket.is_a?(Proc) 
           
-          # setup permissions
-          @s3_acl           = @options[:s3_acl]           || :public_read
-          @s3_sse = @options[:s3_sse]
-
+          @s3_options     = @options.s3_options     || {}
+          # setup Amazon Server Side encryption
+          @s3_sse           = @s3_options[:sse]            || false
           # choose what storage class we use, 'standard' or 'reduced_redundancy'
-          @s3_storage_class = @options[:s3_storage_class] || :standard
+          @s3_storage_class = @s3_options[:storage_class]  || :standard
           
-          @s3_protocol      = @options[:s3_protocol]      || 'http'
-          @s3_headers       = @options[:s3_headers]       || {}
-          @s3_host_alias    = @options[:s3_host_alias]
+          @s3_endpoint      = @s3_credentials[:endpoint] || 's3.amazonaws.com'
+                    
+          @s3_host_alias    = @options.s3_host_alias
           @s3_host_alias    = @s3_host_alias.call(self) if @s3_host_alias.is_a?(Proc)
           
-          @s3_endpoint = @s3_credentials[:endpoint] || 's3.amazonaws.com'
+
           
           @s3 = AWS::S3.new(
             :access_key_id => @s3_credentials[:access_key_id],
             :secret_access_key => @s3_credentials[:secret_access_key],
             :s3_endpoint => @s3_endpoint
           )
         end
+        
       end
               
       def url(style=default_style, options={})
         if self.original_filename.nil? 
           default_url = @default_url.is_a?(Proc) ? @default_url.call(self) : @default_url
@@ -52,11 +59,11 @@
           options.reverse_merge!({
             :expires => 60*60,
             :action => :read
           })          
           secure = ( self.choose_protocol(options) == 'https' )                   
-          @s3.buckets[@s3_bucket].objects[path(style)].url_for(options[:action], {  :secure => secure, :expires => options[:expires] }).to_s
+          @s3.buckets[@s3_bucket].objects[path(style).gsub(%r{^/}, "")].url_for(options[:action], {  :secure => secure, :expires => options[:expires] }).to_s
         else
           if @s3_host_alias.present?
             "#{choose_protocol(options)}://#{@s3_host_alias}/#{path(style).gsub(%r{^/}, "")}"
           else
             "#{choose_protocol(options)}://#{@s3_endpoint}/#{@s3_bucket}/#{path(style).gsub(%r{^/}, "")}"
@@ -71,10 +78,19 @@
       def parse_credentials(creds)
         creds = find_credentials(creds).stringify_keys
         env = Object.const_defined?(:Rails) ? Rails.env : nil
         (creds[env] || creds).symbolize_keys
       end
+      
+      def set_permissions permissions
+        if permissions.is_a?(Hash)
+          permissions[:default] = permissions[:default] || :public_read
+        else
+          permissions = { :default => permissions || :public_read }
+        end
+        permissions
+      end
 
       def exists?(style = default_style)
         if path(style).nil? || path(style).to_s.strip == ""
           return false
         end
@@ -116,13 +132,13 @@
           begin
             log("saving #{path(style)}")
 
             @s3.buckets[@s3_bucket].objects[path(style)].write(
               file,
-              :acl => @s3_acl,
-              :storage_class => @s3_storage_class,
+              :acl => @s3_permissions[:style.to_sym] || @s3_permissions[:default],
+              :storage_class => @s3_storage_class.to_sym,
               :content_type => file.content_type,
-              :server_side_encryption => @s3_sse
+              :server_side_encryption => @s3_sse.to_s
             )
           rescue AWS::S3::Errors::NoSuchBucket => e
             create_bucket
             retry
           rescue AWS::Errors::Base => e