papermill 1.3.4 → 1.3.5

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

data/app/controllers/papermill_controller.rb

@@ -1,9 +1,27 @@
 class PapermillController < ApplicationController
-  prepend_before_filter :load_asset,  :only => [ "show", "destroy", "update", "edit", "crop", "receive_from_pixlr" ]
+  unloadable
+  prepend_before_filter :load_asset,  :only => [ "show", "destroy", "update", "edit", "crop" ]
+  prepend_before_filter :load_old_asset_and_assetable, :only => ["create"]
   prepend_before_filter :load_assets, :only => [ "sort", "mass_delete", "mass_edit", "mass_thumbnail_reset" ]
-  
   skip_before_filter :verify_authenticity_token, :only => [:create] # not needed (Flash same origin policy)
   
+  before_filter :authorize_create, :only => [:create]
+  before_filter :authorize_update_and_destroy, :only => [:update, :destroy]
+  before_filter :authorize_multiple_modification, :only => [:sort, :mass_delete, :mass_edit, :mass_thumbnail_reset]
+  
+  def authorize_create
+    eval(Papermill::options[:authorize_create])
+  end
+  
+  def authorize_update_and_destroy
+    eval(Papermill::options[:authorize_update_and_destroy])
+  end
+
+  def authorize_multiple_modification
+    eval(Papermill::options[:authorize_multiple_modification])
+  end
+  
+  
   def show
     # first escaping is done by rails prior to route recognition, need to do a second one on MSWIN systems to get original one.
     params[:style] = CGI::unescape(params[:style]) if Papermill::MSWIN
@@ -17,10 +35,15 @@ class PapermillController < ApplicationController
   def create
     @asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
     if @asset.save
-      PapermillAsset.find(:all, :conditions => { :assetable_id => @asset.assetable_id, :assetable_type => @asset.assetable_type, :assetable_key => @asset.assetable_key }).each do |asset|
-        asset.destroy unless asset == @asset
-      end if !params[:gallery]
-      render :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style], :targetted_geometry => params[:targetted_geometry] }
+      @old_asset.destroy if @old_asset
+      render :update do |page|
+        page.replace params[:Fileid], :partial => "papermill/asset", :object => @asset, :locals => { :gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style], :targetted_geometry => params[:targetted_geometry] }
+        page.remove "papermill_asset_#{@old_asset.id}" if @old_asset
+      end
+    else
+      page << %{ notify("#{@asset.name}", @asset.errors.full_messages.join('<br />'), "error"); }
+      page.remove params[:Fileid]
+      page.show "papermill_asset_#{@old_asset.id}" if @old_asset
     end
   end
   
@@ -31,13 +54,7 @@ class PapermillController < ApplicationController
   def crop
     render :action => "crop", :layout => false
   end
-  
-  def receive_from_pixlr
-    @asset.file = params[:image]
-    @asset.destroy_thumbnails
-    render :nothing => true
-  end
-  
+
   def update
     @asset.create_thumb_file(params[:target], params[:papermill_asset].merge({ :geometry => "#{params[:target]}#" })) if params[:target]
     render :update do |page|
@@ -86,11 +103,20 @@ class PapermillController < ApplicationController
   end
   
   private
+  
+  def load_old_asset_and_assetable
+    unless params[:gallery]
+      @old_asset = PapermillAsset.find(:first, :conditions => {:assetable_type => params[:assetable_type], :assetable_id => params[:assetable_id], :assetable_key => params[:assetable_key]})
+    end
+    @assetable = params[:assetable_type].constantize.find_by_id(params[:assetable_id])
+  end
+  
   def load_asset
-    @asset = PapermillAsset.find(params[:id] || (params[:id0] + params[:id1] + params[:id2]).to_i)
+    @asset = PapermillAsset.find(params[:id] || (params[:id0] + params[:id1] + params[:id2]).to_i, :include => "assetable")
+    @assetable = @asset.assetable
   end
   
   def load_assets
-    @assets = (params[:papermill_asset] || []).map{ |id| PapermillAsset.find(id) }
+    @assets = (params[:papermill_asset] || []).map{ |id| PapermillAsset.find(id, :include => "assetable") }
   end
 end

data/app/views/papermill/_asset.html.erb

@@ -1,5 +1,5 @@
 <%- dom_id = "papermill_asset_#{asset.id}" -%>
-<%- delete_link = %{<a onclick="if(confirm('#{escape_javascript t("papermill.delete-confirmation", :resource => asset.name)}')){ jQuery.ajax({async:true, beforeSend:function(request){jQuery('##{dom_id}').hide();}, dataType:'script', error:function(request){jQuery('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("papermill.delete", :resource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
+<%- delete_link = %{<a onclick="if(confirm('#{escape_javascript t("papermill.delete-confirmation", :resource => asset.name)}')){ jQuery.ajax({async:true,  dataType:'script', type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("papermill.delete", :resource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
 
 <div id="<%= dom_id %>" class="asset" title="<%= t("papermill.#{(thumbnail_style) ? "thumbnail-" : ""}edit-title", :resource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset, :targetted_geometry => targetted_geometry) %>">
 	<%= delete_link %>

data/app/views/papermill/edit.html.erb

@@ -8,7 +8,6 @@
       <%= image_tag(@asset.url("400x400>"), :onDblClick => "popup('#{crop_papermill_path(@asset, :target => "original", :targetted_geometry => params[:targetted_geometry])}'); return false;", :title => I18n.t("papermill.crop", :resource => @asset.name)) %>
       
       
-      <%# @test = "webonrails.com/wp-content/uploads/2008/11/hosting-rails-app-and-wordpress-on-same-domainas-folder-instead-of-subdomain-webonrails_1225783508773.png" %>
       <%# link_to I18n.t("papermill.edit-with-pixlr", :resource => @asset.name), "http://www.pixlr.com/editor/?image=http://#{@test || request.env["HTTP_HOST"] + @asset.url}&target=http://#{receive_from_pixlr_papermill_path(@asset)}&method=POST", :target => "_blank" %>
       <div style="clear:both;"></div>
     <% else %>

data/{lib/papermill → generators/papermill_initializer}/papermill_initializer.rb

@@ -180,6 +180,10 @@ module Papermill
       # Default named_scope name for catch-all :papermill declaration
       
       #  :base_association_name => :assets,
+      
+      # Do you want papermill_assets to touch your assetable when CRUDed? (true|false|updated_at_field_name)
+      
+      #  :touch => false,
     
       # Set to true to require aliases in all url/path, disabling the 
       # Don't forget to give an alias value to options[:thumbnail][:style] if true!
@@ -218,6 +222,47 @@ module Papermill
       
       # If you use those defaults, the first asset will end-up in RAILS_ROOT/public/system/papermill/000/000/001/original/my_first_asset_name.ext
       # You'll access it with my_domain.com/system/papermill/000/000/001/original/my_first_asset_name.ext
+      
+      # You can add authorization support. The code is eval'ed directly in the controller (don't ask why, the answer is full of 'unloadable', 'ApplicationController has been removed from the module tree but is still active', etc.)
+      
+      # :authorize_create => "true",
+      # :authorize_multiple_modification => "true",
+      # :authorize_update_and_destroy => "true",
+      
+      # For example, this is my own setup.
+      # You'll need a public ApplicationController#current_user, 
+      # adapt the authorization part (can_edit(Assetable)) to your own needs : 
+      
+      # :authorize_create => %{
+      #   unless @assetable.nil? || current_user.can_edit?(@assetable)
+      #     render :update do |page|
+      #       page << %{notify("Wrong credentials", "You can't create an asset here", "error");}
+      #       page.remove params[:Fileid]
+      #       page.show "papermill_asset_" + @old_asset.id.to_s if @old_asset
+      #     end
+      #     false
+      #   end
+      # }, 
+      # :authorize_update_and_destroy => %{
+      #   unless @asset.try(:assetable).nil? || current_user.can_edit?(@asset.assetable)
+      #     render :update do |page|
+      #       page << %{notify("Wrong credentials", "You can't edit or destroy assets here", "error");}
+      #     end
+      #     false
+      #   end
+      # }, 
+      # :authorize_multiple_modification => %{
+      #   authorized = true
+      #   @assets && @assets.each do |asset| 
+      #     authorized = authorized && current_user.can_edit?(asset.assetable)
+      #   end
+      #   unless authorized
+      #     render :update do |page|
+      #       page << %{notify("Wrong credentials", "You can't do edit or destroy assets here", "error");}
+      #     end
+      #     false
+      #   end
+      # }
     }
   end
 end

data/generators/papermill_initializer/papermill_initializer_generator.rb

@@ -6,7 +6,7 @@ class PapermillInitializerGenerator < Rails::Generator::Base
     puts "Copying papermill initializer to config/initializers/..."
     FileUtils.rm_rf("#{RAILS_ROOT}/config/initializers/papermill.rb")
     FileUtils.cp_r(
-      File.join(File.dirname(__FILE__), '../..', 'lib', 'papermill', 'papermill_initializer.rb'),
+      File.join(File.dirname(__FILE__), 'papermill_initializer.rb'),
       "#{RAILS_ROOT}/config/initializers/papermill.rb"
       )
     puts "Done! Check config/initializer/papermill.rb for result."

data/lib/papermill/form_builder.rb

@@ -148,8 +148,8 @@ module ActionView::Helpers::FormTagHelper
     size = [width && "width:#{width}px", height && "height:#{height}px"].compact.join("; ")
     if og = options[:gallery]
       vp, hp, vm, hm, b = [og[:vpadding], og[:hpadding], og[:vmargin], og[:hmargin], og[:border_thickness]].map &:to_i
-      gallery_width = (og[:width] || width) && "width:#{og[:width] || og[:columns]*(width+(hp+hm+b)*2)}px;" || ""
-      gallery_height = (og[:height] || height) && "min-height:#{og[:height] || og[:lines]*(height+(vp+vm+b)*2)}px;" || ""
+      gallery_width = (og[:width] || width) && "width:#{og[:width] || og[:columns]*(width.to_i+(hp+hm+b)*2)}px;" || ""
+      gallery_height = (og[:height] || height) && "min-height:#{og[:height] || og[:lines]*(height.to_i+(vp+vm+b)*2)}px;" || ""
       html << %{##{dom_id} { #{gallery_width} #{gallery_height} }}
       html << %{##{dom_id} .asset { margin:#{vm}px #{hm}px; border-width:#{b}px; padding:#{vp}px #{hp}px; #{size}; }}
     else

data/lib/papermill/papermill_asset.rb

@@ -12,7 +12,7 @@ class PapermillAsset < ActiveRecord::Base
   
   validates_attachment_presence :file
   
-  belongs_to :assetable, :polymorphic => true
+  belongs_to :assetable, :polymorphic => true, :touch => Papermill::options[:touch]
   default_scope :order => 'position'
   
   named_scope :key, lambda { |assetable_key| { :conditions => ['assetable_key = ?', assetable_key.to_s] }}

data/lib/papermill/papermill_options.rb

@@ -49,6 +49,7 @@ module Papermill
     :watermark => "/images/rails.png",
     :watermark_im_command => %{- | composite \\( %s -resize 100% \\) - -dissolve 20% -gravity center -geometry +0+0 },
     :base_association_name => :assets,
+    :touch => false,
     :alias_only => false,
     :aliases => {},
     :use_url_key => false,
@@ -57,5 +58,8 @@ module Papermill
     :use_id_partition => true,
     :papermill_url_prefix => "/system/papermill",
     :papermill_path_prefix => ":rails_root/public/system/papermill",
+    :authorize_create => true, 
+    :authorize_update_and_destroy => true, 
+    :authorize_multiple_modification => true,
   }
 end

data/public/papermill/papermill.js

@@ -41,8 +41,6 @@ notify = function(title, message, type) {
 	if(type == "warning") {	jQuery.jGrowl(message, { header: title, life: 15000, theme: type }) }
 	if(type == "error") {	jQuery.jGrowl(message, { header: title, sticky: true, theme: type }) }
 }
-
-
 var Papermill = {
 	files_queued: 0,
 	file_dialog_complete: function(num_selected, num_queued)
@@ -71,12 +69,13 @@ var Papermill = {
 				div.append(jQuery('<span></span>').attr('class', 'name').html(file.name.substring(0, 10) + '...'));
 				div.append(jQuery('<span></span>').attr('class', 'status').html(SWFUPLOAD_PENDING));
 				div.append(jQuery('<span></span>').attr('class', 'progress').append('<span></span>'));
-
 				if(self.settings.file_queue_limit == 1) {
-					jQuery("#" + self.settings.upload_id).html(div);
-				} else {
-					jQuery("#" + self.settings.upload_id).append(div);
+					old_asset = jQuery("#" + self.settings.upload_id).children()[0];
+					if(old_asset) {
+						jQuery(old_asset).hide();
+					}
 				}
+				jQuery("#" + self.settings.upload_id).append(div);
 			})
 			this.startUpload(this.sorted_queue[this.index++].id);
 		}
@@ -84,6 +83,7 @@ var Papermill = {
 	upload_start: function(file)
 	{
 		jQuery('#' + file.id + ' .status').html(SWFUPLOAD_LOADING);
+		this.addFileParam(file.id, "Fileid", file.id);
 	},
 	upload_progress: function(file, bytes, total)
 	{
@@ -101,7 +101,7 @@ var Papermill = {
 	}, 
 	upload_success: function(file, data)
 	{
-		jQuery('#' + file.id).replaceWith(jQuery(data));
+		eval(data);
 	},
 	upload_complete: function(file)
 	{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +01:00
+date: 2010-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - generators/papermill_assets/USAGE
 - generators/papermill_assets/papermill_assets_generator.rb
 - generators/papermill_initializer/USAGE
+- generators/papermill_initializer/papermill_initializer.rb
 - generators/papermill_initializer/papermill_initializer_generator.rb
 - generators/papermill_table/USAGE
 - generators/papermill_table/papermill_table_generator.rb
@@ -73,7 +74,6 @@ files:
 - lib/papermill/papermill.rb
 - lib/papermill/papermill_asset.rb
 - lib/papermill/papermill_helper.rb
-- lib/papermill/papermill_initializer.rb
 - lib/papermill/papermill_options.rb
 - lib/papermill/papermill_paperclip_processor.rb
 - public/.DS_Store