twm_paperclip 2.3.6b → 2.3.6

data/lib/paperclip/storage/s3.rb

@@ -94,8 +94,8 @@ module Paperclip
         end
       end
 
-      def expiring_url(time = 3600, style = default_style)
-        AWS::S3::S3Object.url_for(path(style), bucket_name, :expires_in => time )
+      def expiring_url(time = 3600)
+        AWS::S3::S3Object.url_for(path, bucket_name, :expires_in => time )
       end
 
       def bucket_name
@@ -147,28 +147,21 @@ module Paperclip
             log("saving #{path(style)}")
             # Nasty hack, thumbnails for PDFs generated in jpg/png/gif are NOT the content_type of the original file!
             # Override the content_type based on these extensions.
-            access = @s3_permissions
-            unless style == :default_style
-              content_type = case(file.path)
-                when /.jpg$/
-                  "image/jpeg"
-                  access = :public_read
-                when /.png$/
-                  "image/png"
-                  access = :public_read
-                when /.gif$/
-                  "image/gif"
-                  access = :public_read
-                else
-                  instance_read(:content_type)
-              end
+            content_type = case(file.path)
+              when /.jpg$/
+                "image/jpeg"
+              when /.png$/
+                "image/png"
+              when /.gif$/
+                "image/gif"
+              else
+                instance_read(:content_type)
             end
             AWS::S3::S3Object.store(path(style),
                                     file,
                                     bucket_name,
-                                    {
-                                      :content_type => content_type,#instance_read(:content_type),
-                                      :access => access,
+                                    {:content_type => content_type,#instance_read(:content_type),
+                                     :access => @s3_permissions,
                                     }.merge(@s3_headers))
           rescue AWS::S3::NoSuchBucket => e
             create_bucket

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.3.6b" unless defined? Paperclip::VERSION
+  VERSION = "2.3.6" unless defined? Paperclip::VERSION
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twm_paperclip
 version: !ruby/object:Gem::Version 
-  hash: 3653147
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 3
-  - 6b
-  version: 2.3.6b
+  - 6
+  version: 2.3.6
 platform: ruby
 authors: 
 - Jon Yurek
@@ -206,14 +206,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip