papermill 0.14.3 → 0.16.0

data/config/locales/papermill.yml

@@ -27,6 +27,9 @@ en:
     save: "Send to server"
     location: "File : "
     url: "URL : "
+    modify-all: "Modify all: "
+    delete-all: "Delete all"
+    delete-all-confirmation: "Are you sure?"
 fr:
   papermill:
     not-processed: "Erreur/ressource non trouvée"
@@ -56,3 +59,6 @@ fr:
     save: "Envoyer"
     location: "Fichier : "
     url: "Lien : "
+    modify-all: "Modifier tout : "
+    delete-all: "Supprimer tout"
+    delete-all-confirmation: "Êtes-vous sûr ?"

data/config/routes.rb

@@ -1,4 +1,4 @@
 ActionController::Routing::Routes.draw do |map|
-  map.resources :papermill, :collection => { :sort => :post }
-  map.connect "#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING.gsub(":id_partition", ":id0/:id1/:id2")}", :controller => "papermill", :action => "show"
+  map.resources :papermill, :collection => { :sort => :post, :mass_edit => :post, :mass_delete => :post }
+  map.connect "#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING.gsub(":id_partition", ":id0/:id1/:id2")}", :controller => "papermill", :action => "show"
 end

data/generators/papermill_initializer/USAGE

@@ -0,0 +1,4 @@
+script/generate papermill_initializer
+  
+This will copy Papermill option hash to your config/initializers directory
+The old file directory will be deleted if present!

data/generators/papermill_initializer/papermill_initializer_generator.rb

@@ -0,0 +1,15 @@
+class PapermillInitializerGenerator < Rails::Generator::Base
+  def initialize(args, options = {})
+  end
+  
+  def manifest
+    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_options.rb'),
+      "#{RAILS_ROOT}/config/initializers/papermill.rb"
+      )
+    puts "Done! Check config/initializer/papermill.rb for result."
+    exit
+  end 
+end

data/generators/papermill_table/templates/migrate/papermill_migration.rb.erb

@@ -1,17 +1,22 @@
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :papermill_assets do |t|
+      # mandatory
       t.string   :file_file_name
       t.string   :file_content_type
       t.integer  :file_file_size
       t.integer  :position
-      t.text     :description
-      t.string   :copyright
-      t.string   :title
       t.integer  :assetable_id
       t.string   :assetable_type
       t.string   :assetable_key
       t.string   :type
+      t.string   :title
+      
+      
+      # optionnal
+      t.text     :description
+      t.string   :copyright
+      t.string   :alt
       t.timestamps
     end
   end

data/installation-template.txt

@@ -2,6 +2,7 @@ gem 'papermill'
 
 generate :papermill_table, "PapermillMigration"
 generate :papermill_assets
+generate :papermill_initializer
 generate :scaffold, "article title:string"
 rake "db:migrate"
 
@@ -62,7 +63,6 @@ file "app/views/articles/_form.html.erb", <<-END
 <% end %>
 END
 
-
 file "app/views/articles/show.html.erb", <<-END
 <p>
   <b>Title:</b>
@@ -78,7 +78,7 @@ file "app/views/articles/show.html.erb", <<-END
 <br /><br />
 <b>@article.assets(:my_other_image).first :</b>
 <p>
-  <% image = @article.asset(:my_other_image) %>
+  <% image = @article.assets(:my_other_image).first %>
   <%= link_to(image_tag(image.url("100x100#")), image.url) if image %>
 </p>
 <br /><br />
@@ -91,9 +91,9 @@ file "app/views/articles/show.html.erb", <<-END
   </ul>
 </p>
 <br /><br />
-<b>@article.asset(:my_other_asset) :</b>
+<b>@article.assets(:my_other_asset).first :</b>
 <p>
-  <% asset = @article.asset(:my_other_asset) %>
+  <% asset = @article.assets(:my_other_asset).first %>
   <%= link_to(asset.name, asset.url) if asset %>
 </p>
 

data/lib/{core_extensions.rb → extensions.rb}

@@ -13,24 +13,15 @@ module PapermillHashExtensions
     target
   end
 end
-module PapermillStringExtensions
-  def simple_sql_sanitizer
-    gsub(/\\/, '\&\&').gsub(/'/, "''")
-  end
-end
-module PapermillStringToUrlNotFound
-  def to_url
-    gsub(/[^a-zA-Z0-9]/, "-").gsub(/-+/, "-").gsub(/^-|-$/, "").downcase
-  end
-end
+
 module PapermillObjectExtensions
   # Nil if empty.
   def nie
     self.blank? ? nil : self
   end
 end
+
 module PapermillFileExtensions
-  
   def get_content_type
     begin
       MIME::Types.type_for(self.original_filename).to_s
@@ -41,10 +32,27 @@ module PapermillFileExtensions
 end
 
 module PapermillFormtasticExtensions
-  def method_missing(input_type, method, options)
-    return super unless input_type.to_s.match("_input")
-    input_type = input_type.to_s.split("_input").first
+  def image_upload_input(method, options)
+    self.label(method, options_for_label(options)) +
+    self.send(:image_upload, method, options)
+  end
+  def images_upload_input(method, options)
     self.label(method, options_for_label(options)) +
-    self.send(input_type, method, options)
+    self.send(:images_upload, method, options)
+  end
+  def asset_upload_input(method, options)
+    self.label(method, options_for_label(options)) +
+    self.send(:asset_upload, method, options)
+  end
+  def assets_upload_input(method, options)
+    self.label(method, options_for_label(options)) +
+    self.send(:assets_upload, method, options)
   end
 end
+
+
+module StringToUrlNotFound
+  def to_url
+    gsub(/[^a-zA-Z0-9]/, "-").gsub(/-+/, "-").gsub(/^-|-$/, "")
+  end
+end

data/lib/papermill.rb

@@ -1,12 +1,19 @@
 I18n.load_path = [File.join(File.dirname(__FILE__), "../config/locales/papermill.yml")] + I18n.load_path
-require 'core_extensions'
+require 'extensions'
 Object.send :include, PapermillObjectExtensions
 Hash.send :include, PapermillHashExtensions
 File.send :include, PapermillFileExtensions
-String.send :include, PapermillStringExtensions
-String.send :include, PapermillStringToUrlNotFound unless String.instance_methods.include? "to_url"
+String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
 Formtastic::SemanticFormBuilder.send(:include, PapermillFormtasticExtensions) rescue NameError
-require 'papermill/papermill_module'
+
+begin
+  require File.join(File.dirname(RAILS_ROOT), "config/initializers/papermill.rb")
+rescue LoadError
+  require 'papermill/papermill_options'
+end
+
+require 'paperclip' unless defined?(Paperclip)
+require 'papermill/papermill'
 require 'papermill/papermill_asset'
 require 'papermill/form_builder'
 require 'papermill/papermill_helper'

data/lib/papermill/form_builder.rb

@@ -1,3 +1,20 @@
+class ActionView::Helpers::FormBuilder
+  include ActionView::Helpers::FormTagHelper
+  
+  def assets_upload(key = nil, options = {})
+    papermill_upload_tag key, { :thumbnail => false }.update(options)
+  end
+  def asset_upload(key = nil, options = {})
+    papermill_upload_tag key, { :gallery => false, :thumbnail => false }.update(options)
+  end
+  def images_upload(key = nil, options = {})
+    papermill_upload_tag key, options
+  end
+  def image_upload(key = nil, options = {})
+    papermill_upload_tag key, { :gallery => false }.update(options)
+  end
+end
+
 module ActionView::Helpers::FormTagHelper
   
   def assets_upload_tag(assetable, key = nil, options = {})
@@ -24,21 +41,24 @@ module ActionView::Helpers::FormTagHelper
     end
  
     assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
-    options = if assetable && (association = (assetable.class.papermill_associations[key] || assetable.class.papermill_associations[:papermill_assets]))
-      association[:options].deep_merge(options)
-    elsif assetable.nil?
-      Papermill::PAPERMILL_DEFAULTS.deep_merge(options)
-    else
-      raise PapermillException.new("Can't find '#{key.to_s}' association for '#{assetable.class.to_s}'.\n\n##{assetable.class.to_s.underscore}.rb\nYou can take on of these actions: \n1. set either a catchall papermill association: 'papermill {your_option_hash}'\n2. or a specific association: 'papermill :#{key.to_s}, {your_option_hash}'")
-    end
+    options = (
+      if assetable && (association = (assetable.class.papermill_associations[key] || assetable.class.papermill_associations[Papermill::options[:base_association_name]]))
+        association[:options].deep_merge(options)
+      elsif assetable.nil?
+        Papermill::options.deep_merge(options)
+      else
+        raise PapermillException.new("Can't find '#{key.to_s}' association for '#{assetable.class.to_s}'.\n\n##{assetable.class.to_s.underscore}.rb\nYou can take on of these actions: \n1. set either a catchall papermill association: 'papermill {your_option_hash}'\n2. or a specific association: 'papermill :#{key.to_s}, {your_option_hash}'")
+      end
+    )
+    
     assetable_id = assetable && (assetable.id || assetable.timestamp) || nil
-    assetable_type = assetable && assetable.class.to_s || nil
+    assetable_type = assetable && assetable.class.base_class.name || nil
     id = "papermill_#{assetable_type}_#{assetable_id}_#{key ? key.to_s : 'nil'}"
     if options[:thumbnail]
       w = options[:thumbnail][:width]  || options[:thumbnail][:height] && options[:thumbnail][:aspect_ratio] && (options[:thumbnail][:height] * options[:thumbnail][:aspect_ratio]).to_i || nil
       h = options[:thumbnail][:height] || options[:thumbnail][:width]  && options[:thumbnail][:aspect_ratio] && (options[:thumbnail][:width]  / options[:thumbnail][:aspect_ratio]).to_i || nil
-      options[:thumbnail][:style] ||= (w || h) && "#{w || options[:thumbnail][:max_width]}x#{h || options[:thumbnail][:max_height]}>" || "original"
-      if options[:thumbnail][:inline_css]
+      options[:thumbnail][:style] ||= (w || h) && "#{w}x#{h}>" || "original"
+      if options[:inline_css]
         size = []
         size << "width:#{w}px" if w
         size << "height:#{h}px" if h
@@ -52,7 +72,7 @@ module ActionView::Helpers::FormTagHelper
             hm = options[:gallery][:hmargin].to_i
             b  = options[:gallery][:border_thickness].to_i
             gallery_width = (options[:gallery][:width] || w) && "width:#{options[:gallery][:width] || options[:gallery][:columns]*(w+(hp+hm+b)*2)}px;" || ""
-            gallery_height = (options[:gallery][:height] || h) && "#{options[:gallery][:autogrow] ? "" : "min-"}height:#{options[:gallery][:height] || options[:gallery][:lines]*(h+(vp+vm+b)*2)}px;" || ""
+            gallery_height = (options[:gallery][:height] || h) && "min-height:#{options[:gallery][:height] || options[:gallery][:lines]*(h+(vp+vm+b)*2)}px;" || ""
             inline_css << %{##{id} { #{gallery_width} #{gallery_height} }}
             inline_css << %{##{id} li { margin:#{vm}px #{hm}px; border-width:#{b}px; padding:#{vp}px #{hp}px; #{size}; }}
           else
@@ -63,46 +83,58 @@ module ActionView::Helpers::FormTagHelper
         end
       end
     end
-    html = []
-    
-    asset_class = options[:class_name] && options[:class_name].to_s.constantize || association && association[:class] || PapermillAsset
-    
+        
     url_options = {
       :controller => "/papermill", 
       :action => "create", 
-      :escape => false, 
-      :asset_class => asset_class.to_s,
-      :assetable_key => key, 
-      :gallery => (options[:gallery] != false), 
-      :thumbnail_style => (options[:thumbnail] && options[:thumbnail][:style])
+      :asset_class => (options[:class_name] && options[:class_name].to_s.constantize || association && association[:class] || PapermillAsset).to_s,
+      :gallery => !!options[:gallery], 
+      :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style]
     }
+    
     url_options.merge!({
       :assetable_id => assetable_id, 
-      :assetable_type => assetable_type.underscore, 
+      :assetable_type => assetable_type
     }) if assetable
+    
+    url_options.merge!({
+      :assetable_key => key
+    }) if key
+    
+    
+    html = {}
     create_url = @template.url_for(url_options)
     if assetable && assetable.new_record? && !@timestamped
-      html << @template.hidden_field(assetable.class.to_s.underscore, :timestamp, :value => assetable.timestamp)
+      @timestamp_field = @template.hidden_field(assetable_type.underscore, :timestamp, :value => assetable.timestamp)
       @timestamped = true
     end
     
     conditions = {:assetable_type => assetable_type, :assetable_id => assetable_id}
     conditions.merge!({:assetable_key => key.to_s}) if key
-    collection = asset_class.find(:all, :conditions => conditions, :order => "position")
+    collection = PapermillAsset.all(:conditions => conditions, :order => "position")
     
-    html << %{<div id="#{id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{id}" class="swf_button"></span></div>}
-    html << @template.content_tag(:ul, :id => id, :class => "#{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {
+    html[:upload_button] = %{<div id="#{id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;"><span id="browse_for_#{id}" class="swf_button"></span></div>}
+    html[:container] = @template.content_tag(:ul, :id => id, :class => "#{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {
       @template.render :partial => "papermill/asset", :collection => collection, :locals => { :thumbnail_style => (options[:thumbnail] && options[:thumbnail][:style]) }
-    }
+    } 
+    
+    if options[:gallery]
+      html[:dashboard] = {}
+      html[:dashboard][:mass_edit] = %{<select id="batch_#{id}">#{options[:mass_editable_fields].map do |field|
+                %{<option value="#{field.to_s}">#{I18n.t("papermill.#{field.to_s}", :default => field.to_s)}</option>}
+              end.join("\n")}</select>
+              <a onclick="modify_all('#{id}'); return false;" style="cursor:pointer">#{I18n.t("papermill.modify-all")}</a>}
+      html[:dashboard][:mass_delete] = %{<a onclick="mass_delete('#{id}', '#{@template.escape_javascript I18n.t("papermill.delete-all-confirmation")}'); return false;" style="cursor:pointer">#{I18n.t("papermill.delete-all")}</a>}
+      html[:dashboard] = @template.content_tag(:ul, options[:dashboard].map{|action| @template.content_tag(:li, html[:dashboard][action], :class => action.to_s) }.join("\n"), :class => "dashboard")
+    end
+    
     @template.content_for :papermill_inline_js do
       %{
         #{%{(jQuery("##{id}")).sortable({update:function(){jQuery.ajax({async:true, data:jQuery(this).sortable('serialize'), dataType:'script', type:'post', url:'#{@template.controller.send("sort_papermill_path")}'})}})} if options[:gallery]}
         new SWFUpload({
           upload_id: "#{id}",
           upload_url: "#{@template.escape_javascript create_url}",
-          file_size_limit: "#{options[:file_size_limit_mb].megabytes}",
           file_types: "#{options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : ''}",
-          file_types_description: "#{options[:thumbnail] ? 'Images' : 'Files'}",
           file_queue_limit: "#{!options[:gallery] ? '1' : '0'}",
           file_queued_handler: Upload.file_queued,
           file_dialog_complete_handler: Upload.file_dialog_complete,
@@ -112,29 +144,10 @@ module ActionView::Helpers::FormTagHelper
           upload_success_handler: Upload.upload_success,
           upload_complete_handler: Upload.upload_complete,
           button_placeholder_id : "browse_for_#{id}",
-          #{options[:swfupload].map{ |key, value| ["false", "true"].include?(value.to_s) ? "#{key.to_s}: #{value.to_s}" : "#{key.to_s}: '#{value.to_s}'"  }.compact.join(", ")}
+          #{options[:swfupload].map{ |key, value| (["false", "true"].include?(value.to_s) ? "#{key.to_s}: #{value.to_s}" : "#{key.to_s}: '#{value.to_s}'") if value  }.compact.join(", ")}
         });
       }
   	end
-  	html.reverse! if options[:button_after_container]
-	  %{<div class="papermill">#{html.join("\n")}</div>}
-  end
-end
-
-
-class ActionView::Helpers::FormBuilder
-  include ActionView::Helpers::FormTagHelper
-  
-  def assets_upload(key = nil, options = {})
-    papermill_upload_tag key, { :thumbnail => false }.update(options)
-  end
-  def asset_upload(key = nil, options = {})
-    papermill_upload_tag key, { :gallery => false, :thumbnail => false }.update(options)
-  end
-  def images_upload(key = nil, options = {})
-    papermill_upload_tag key, options
-  end
-  def image_upload(key = nil, options = {})
-    papermill_upload_tag key, { :gallery => false }.update(options)
+	  %{<div class="papermill">#{@timestamp_field.to_s + options[:form_helper_elements].map{|element| html[element] || ""}.join("\n")}</div>}
   end
 end

data/lib/papermill/papermill.rb

@@ -0,0 +1,70 @@
+module Papermill
+  PAPERCLIP_INTERPOLATION_STRING = ":id_partition/:style/:escaped_basename.:extension"
+  
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  
+  def self.options
+    defined?(OPTIONS) ? OPTIONS : {}
+  end
+  
+
+  module ClassMethods
+    attr_reader :papermill_associations
+    
+    def papermill(*args)
+      assoc_name = (!args.first.is_a?(Hash) && args.shift.try(:to_sym) || Papermill::options[:base_association_name])
+      options = args.first || {}
+      
+      (@papermill_associations ||= {}).merge!({ assoc_name => {
+          :class => (class_name = options.delete(:class_name)) && class_name.to_s.constantize || PapermillAsset, 
+          :options => Papermill::options.deep_merge(options)
+      }})
+      
+      include Papermill::InstanceMethods
+      before_destroy :destroy_assets
+      after_create :rebase_assets
+      has_many :papermill_assets, :as => "Assetable"
+
+      define_method assoc_name do |*options|
+        scope = PapermillAsset.scoped(:conditions => {:assetable_id => self.id, :assetable_type => self.class.base_class.name})
+        if assoc_name != Papermill::options[:base_association_name]
+          scope = scope.scoped(:conditions => { :assetable_key => assoc_name.to_s })
+        elsif options.first && !options.first.is_a?(Hash)
+          scope = scope.scoped(:conditions => { :assetable_key => options.shift.to_s.nie })
+        end
+        scope = scope.scoped(options.shift) if options.first
+        scope
+      end
+    end
+    
+    def inherited(subclass)
+      subclass.instance_variable_set("@papermill_associations", @papermill_associations)
+      super
+    end
+  end
+
+  module InstanceMethods
+    attr_writer :timestamp
+    def timestamp
+      @timestamp ||= "-#{(Time.now.to_f * 1000).to_i.to_s[4..-1]}"
+    end
+    
+    private
+    
+    def destroy_assets
+      papermill_assets.each &:destroy
+    end
+    
+    def rebase_assets
+      PapermillAsset.all(:conditions => { :assetable_id => self.timestamp, :assetable_type => self.class.base_class.name }).each do |asset|
+        if asset.created_at < 2.hours.ago
+          asset.destroy
+        else
+          asset.update_attribute(:assetable_id, self.id)
+        end
+      end
+    end
+  end
+end

data/lib/papermill/papermill_asset.rb

@@ -1,37 +1,53 @@
-require 'paperclip'
-
 class PapermillAsset < ActiveRecord::Base
-  belongs_to :assetable, :polymorphic => true
+  
   before_destroy :destroy_files
-
+  before_create :set_position
+  
+  has_attached_file :file, 
+    :path => "#{Papermill::options[:public_root]}/#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}",
+    :url => "/#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}"
+  
   Paperclip.interpolates :escaped_basename do |attachment, style|
     Paperclip::Interpolations[:basename].call(attachment, style).to_url
   end
   
-  has_attached_file :file, 
-    :path => "#{Papermill::PAPERMILL_DEFAULTS[:public_root]}/#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}",
-    :url => "/#{Papermill::PAPERMILL_DEFAULTS[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}"
   validates_attachment_presence :file
-
-  def swfupload_file=(data)
-    data.content_type = data.get_content_type
+  
+  belongs_to :assetable, :polymorphic => true
+  default_scope :order => 'position'
+  
+  def Filedata=(data)
     self.file = data
+    self.file_content_type = data.get_content_type
+  end
+  
+  def Filename=(name)
+    self.title = name
+  end
+  
+  def create_thumb_file(style_name)
+    FileUtils.mkdir_p File.dirname(file.path(style_name))
+    FileUtils.mv(Paperclip::Thumbnail.make(file, self.class.compute_style(style_name)).path, file.path(style_name))
   end
   
   def id_partition
     ("%09d" % self.id).scan(/\d{3}/).join("/")
   end
   
+  def self.find_by_id_partition(params)
+    self.find((params[:id0] + params[:id1] + params[:id2]).to_i)
+  end
+  
   def name
     file_file_name
   end
   
   def width
-    image? && Paperclip::Geometry.from_file(file).width
+    Paperclip::Geometry.from_file(file).width
   end
   
   def height
-    image? && Paperclip::Geometry.from_file(file).height
+    Paperclip::Geometry.from_file(file).height
   end
   
   def size
@@ -51,11 +67,37 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def image?
-    content_type && content_type.split("/")[0] == "image" && (content_type.split("/")[1] || "unknown")
+    content_type.split("/")[0] == "image"
+  end
+  
+  def save(*params)
+    if super(*params)
+      if params.last.is_a?(Hash) && params.last[:unique] && assetable_key
+        PapermillAsset.find(:all, :conditions => {:assetable_id => assetable_id, :assetable_type => assetable_type, :assetable_key => assetable_key }).each do |asset|
+          asset.destroy unless asset == self
+        end
+      end
+      true
+    else
+      false
+    end
+  end
+  
+  def self.cleanup
+    PapermillAsset.all(:conditions => ["id < 0 AND created_at < ?", DateTime.now.yesterday]).each &:destroy
+  end
+  
+  private
+  def set_position
+    self.position ||= PapermillAsset.first(:conditions => {:assetable_key => assetable_key, :assetable_type => assetable_type, :assetable_id => assetable_id}, :order => "position DESC" ).try(:position).to_i + 1
   end
   
   def destroy_files
-    FileUtils.rm_r "#{Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}, ':id_partition')}/"
-    true
+    FileUtils.rm_r(File.dirname(path).chomp("original")) rescue true
   end
+  
+  def self.compute_style(style, compatibility_mode = nil)
+    style = Papermill::options[:aliases][style.to_sym] || Papermill::options[:aliases][style.to_s] || !Papermill::options[:alias_only] && style
+    [Symbol, String].include?(style.class) ? {:geometry => style.to_s} : style
+  end  
 end