papermill_controller.rb in papermill-0.11.0

- old
+ new

@@ -7,10 +7,11 @@
       complete_id = (params[:id0] + params[:id1] + params[:id2]).to_i
       asset = PapermillAsset.find(complete_id)
       raise if asset.nil? || params[:style] == "original"
       style = Papermill::PAPERMILL_DEFAULTS[:aliases][params[:style]] || !Papermill::PAPERMILL_DEFAULTS[:alias_only] && params[:style]
       raise unless style
-
+      style = {:geometry => style} unless style.is_a? Hash  # new Paperclip API
+      
       if asset.image?
         temp_thumbnail = Paperclip::Thumbnail.make(asset_file = asset.file, style)
         new_parent_folder_path = File.dirname(new_image_path = asset_file.path(params[:style]))
         FileUtils.mkdir_p new_parent_folder_path unless File.exists? new_parent_folder_path
         FileUtils.cp temp_thumbnail.path, new_image_path
\ No newline at end of file