heythisisnate-paperclip 2.3.0.2 → 2.3.0.5

data/lib/paperclip/attachment.rb

@@ -100,15 +100,23 @@ module Paperclip
     # security, however, for performance reasons.  set
     # include_updated_timestamp to false if you want to stop the attachment
     # update time appended to the url
-    #def url style = default_style, include_updated_timestamp = true
-    #  url = original_filename.nil? ? interpolate(@default_url, style) : interpolate(@url, style)
-    #  include_updated_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url
-    #end
+    def unsigned_url style = default_style, include_updated_timestamp = true
+      url = original_filename.nil? ? interpolate(@default_url, style) : interpolate(@url, style)
+      include_updated_timestamp && updated_at ? [url, updated_at].compact.join(url.include?("?") ? "&" : "?") : url
+    end
 
-    def url(style = nil, time_limit = 5.seconds)
+    def signed_url(style = nil, time_limit = 5.seconds)
       AWS::S3::S3Object.url_for(path(style).gsub(%r{^/}, ""), 'dpic', :expires_in => time_limit)
     end
 
+    def url(style = nil, opts = nil)
+      if %w{thumb small}.include?(style.to_s)
+        unsigned_url style, true
+      else
+        signed_url style, 5.seconds
+      end
+    end
+
     # Returns the path of the attachment as defined by the :path option. If the
     # file is stored in the filesystem the path refers to the path of the file
     # on disk. If the file is stored in S3, the path is the "key" part of the

data/lib/paperclip/storage.rb

@@ -192,10 +192,11 @@ module Paperclip
         @queued_for_write.each do |style, file|
           begin
             log("saving #{path(style)}")
+            permissions = %{thumb small}.include?(style.to_s) ? :public_read : :authenticated_read
             AWS::S3::S3Object.store(path(style),
-                                    file,
-                                    bucket_name,
-                                    {:content_type => instance_read(:content_type)}.merge(@s3_headers))
+                file,
+                bucket_name,
+                {:content_type => instance_read(:content_type)}.merge({:access => permissions}).merge(@s3_headers))
           rescue AWS::S3::ResponseError => e
             raise
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: heythisisnate-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.0.2
+  version: 2.3.0.5
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-08-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ files:
 - test/storage_test.rb
 - test/thumbnail_test.rb
 - shoulda_macros/paperclip.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://www.thoughtbot.com/projects/paperclip
 licenses: 
 post_install_message: 
@@ -119,7 +119,7 @@ requirements:
 rubyforge_project: paperclip
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []