Make sure Paperclip doesn't raise an exception when using a numeric s…

…tyle name
thoughtbot · Mar 12, 2012 · 8edccdc · 8edccdc
1 parent f6e01b6
commit 8edccdc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/paperclip/interpolations.rb b/lib/paperclip/interpolations.rb
@@ -93,7 +93,7 @@ def basename attachment, style_name
     # If the style has a format defined, it will return the format instead
     # of the actual extension.
     def extension attachment, style_name
-      ((style = attachment.styles[style_name.to_sym]) && style[:format]) ||
+      ((style = attachment.styles[style_name.to_s.to_sym]) && style[:format]) ||
         File.extname(attachment.original_filename).gsub(/^\.+/, "")
     end
 

diff --git a/lib/paperclip/storage/s3.rb b/lib/paperclip/storage/s3.rb
@@ -95,7 +95,7 @@ def self.extended base
           @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  = (@s3_permissions[style.to_s.to_sym] || @s3_permissions[:default])
               permission  = permission.call(attachment, style) if permission.is_a?(Proc)
               (permission == :public_read) ? 'http' : 'https'
             end