BBenezech-papermill 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/controllers/papermill_controller.rb

@@ -4,18 +4,20 @@ class PapermillController < ApplicationController
 
   def show
     begin
-      if Papermill::PAPERMILL_DEFAULTS[:alias_only]
-        style = Papermill::PAPERMILL_DEFAULTS[:aliases][params[:style]]
+      asset = PapermillAsset.find(params[: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
+
+      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
+        redirect_to asset.url(params[:style])
       else
-        style = Papermill::PAPERMILL_DEFAULTS[:aliases][params[:style]] || params[:style]
+        redirect_to asset.url
       end
-      raise unless style
-      asset = PapermillAsset.find(params[:id])
-      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
-      redirect_to asset.url(params[:style])
     rescue
       render :text => t("not-processed", :scope => "papermill"), :status => "500"
     end

data/papermill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BBenezech-papermill
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -63,7 +63,6 @@ files:
 - uninstall.rb
 has_rdoc: false
 homepage: http://github.com/BBenezech/papermill
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -84,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Paperclip wrapper