papermill 0.16.0 → 0.16.1

data/README.rdoc

@@ -2,6 +2,10 @@
 
 Asset management made easy. Now in pre-1.0.0 release!
 
+== IE6 Problems
+
+I can't make it work with IE6, there seems to be a jQuery problem. SWFUpload and jQuery should both work fine with it, but anyway, it dies with strange errors that I don't understand. Any help appreciated...
+
 == Install the gems
   
   $ gem source -a http://gemcutter.org

data/VERSION

@@ -1 +1 @@
-0.16.0
+0.16.1

data/app/controllers/papermill_controller.rb

@@ -3,8 +3,10 @@ class PapermillController < ApplicationController
   # Yet SwfUpload doesn't send the right header for request.xhr? to be true and thus fails to disable verify_authenticity_token automatically.
   skip_before_filter :verify_authenticity_token, :only => [:create]
   
+  prepend_before_filter :load_asset, :only => ["show", "destroy", "update", "edit"]
+  prepend_before_filter :load_assets, :only => ["sort", "mass_delete", "mass_edit"]
+  
   def show
-    @asset = PapermillAsset.find_by_id_partition params
     if @asset.create_thumb_file(params[:style])
       redirect_to @asset.url(params[:style])
     else
@@ -13,7 +15,6 @@ class PapermillController < ApplicationController
   end
 
   def destroy
-    @asset = PapermillAsset.find params[:id]
     render :update do |page|
       if @asset.destroy
         page << "jQuery('#papermill_asset_#{params[:id]}').remove()"
@@ -25,7 +26,6 @@ class PapermillController < ApplicationController
   end
   
   def update
-    @asset = PapermillAsset.find params[:id]
     render :update do |page|
       if @asset.update_attributes(params[:papermill_asset])
         page << %{ notify("#{ escape_javascript t("papermill.updated", :ressource => @asset.name)}", "notice") }
@@ -36,7 +36,6 @@ class PapermillController < ApplicationController
   end
   
   def edit
-    @asset = PapermillAsset.find params[:id]
     render :action => "edit", :layout => (params[:layout] || "none")
   end
   
@@ -50,34 +49,40 @@ class PapermillController < ApplicationController
   end
   
   def sort
-    params[:papermill_asset].each_with_index do |id, index|
-      PapermillAsset.find(id).update_attribute(:position, index + 1)
+    @assets.each_with_index do |asset, index|
+      asset.update_attribute(:position, index + 1)
     end
     render :nothing => true
   end
   
   def mass_delete
     render :update do |page|
-      (params[:papermill_asset] || []).each do |id|
-        @asset = PapermillAsset.find(id)
-        if @asset.destroy
-          page << "jQuery('#papermill_asset_#{id}').remove()"
+      @assets.each do |asset|
+        if asset.destroy
+          page << "jQuery('#papermill_asset_#{asset.id}').remove()"
         else
-          page << %{ notify('#{ escape_javascript t("papermill.not-deleted", :ressource => @asset.name)}', 'error') }
+          page << %{ notify('#{ escape_javascript t("papermill.not-deleted", :ressource => asset.name)}', 'error') }
         end
       end
     end
   end
   
   def mass_edit
-    message = []
-    (params[:papermill_asset] || []).each do |id|
-      @asset = PapermillAsset.find(id) 
-      @asset.update_attribute(params[:attribute], params[:value])
-      message << t("papermill.updated", :ressource => @asset.name)
+    @assets.each do |asset|
+      asset.update_attribute(params[:attribute], params[:value])
+      (message ||= []) << t("papermill.updated", :ressource => asset.name)
     end
     render :update do |page|
-      page << %{ notify('#{ escape_javascript message.join("<br />")}', "notice") } unless message.empty?
+      page << %{ notify('#{ escape_javascript message.join("<br />")}', "notice") } if defined?(message)
     end
   end
+  
+  private
+  def load_asset
+    @asset = PapermillAsset.find(params[:id] || (params[:id0] + params[:id1] + params[:id2]).to_i)
+  end
+  
+  def load_assets
+    @assets = (params[:papermill_asset] || []).map{ |id| PapermillAsset.find(id) }
+  end
 end

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

@@ -1,19 +1,16 @@
-<form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); try {jQuery(document).trigger('close.facebox');} catch (e) {}; try{Shadowbox.close();} catch (e) {};  try{self.close();} catch (e) {}; return false;" method="post" action="/papermill/<%= @asset.id %>">
+<form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); close_popup(self); return false;" method="post" action="/papermill/<%= @asset.id %>">
   <input type="hidden" value="put" name="_method"/>
-  
   <% fields_for :papermill_asset, @asset do |form| %>
-    <p>
-      <%= form.label :title, t("papermill.title") %><br />
-      <%= form.text_field :title, :class => "text_field" %>
-    </p>
-    <p>
-      <%= form.label :copyright, t("papermill.copyright") %><br />
-      <%= form.text_field :copyright, :class => "text_field" %>
-    </p>
-    <p>
-      <%= form.label :description, t("papermill.description") %><br />
-      <%= form.text_area :description %>
-    </p>
+    <% PapermillAsset.columns.map{|c| [c.name, c.type] }.reject{ |c| ["slug", "file_file_name", "file_content_type", "file_file_size", "position", "assetable_id", "assetable_type", "assetable_key", "type", "id", "created_at", "updated_at"].include?(c.first) }.each do |c| %>
+      <p>
+        <%= form.label c.first, t("papermill.#{c.first}") %><br />
+        <% if c.last == :text %>
+          <%= form.text_area c.first %>
+        <% else %>
+          <%= form.text_field c.first %>
+        <% end -%>
+      </p>
+    <% end %>
     <%= submit_tag t('papermill.save') %>
   <% end %>
 </form>

data/config/locales/papermill.yml

@@ -21,6 +21,7 @@ en:
     updated_at: "Updated at"
     title: "Title"
     copyright: "Copyright"
+    alt: "Alternative text"
     description: "Description"
     width: "Width"
     height: "Height"
@@ -53,6 +54,7 @@ fr:
     updated_at: "Mise à jour"
     title: "Titre"
     copyright: "Copyright"
+    alt: "Texte alternatif"
     description: "Description"
     width: "Largeur"
     height: "Hauteur"

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

@@ -1,23 +1,26 @@
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :papermill_assets do |t|
-      # mandatory
+    
+      # Paperclip fields (required)
       t.string   :file_file_name
       t.string   :file_content_type
       t.integer  :file_file_size
+      
+      # Papermill fields (required)
       t.integer  :position
       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
+      # Custom fields (optionnals)
+      t.string   :title
       t.string   :alt
+      t.string   :copyright
+      t.text     :description
       t.timestamps
+      
     end
   end
   

data/lib/papermill.rb

@@ -9,7 +9,7 @@ Formtastic::SemanticFormBuilder.send(:include, PapermillFormtasticExtensions) re
 begin
   require File.join(File.dirname(RAILS_ROOT), "config/initializers/papermill.rb")
 rescue LoadError
-  require 'papermill/papermill_options'
+  require 'papermill/papermill_options.rb'
 end
 
 require 'paperclip' unless defined?(Paperclip)

data/lib/papermill/papermill_asset.rb

@@ -3,10 +3,15 @@ class PapermillAsset < ActiveRecord::Base
   before_destroy :destroy_files
   before_create :set_position
   
+  attr_protected :position, :file_file_name
+  
+  
   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}"
   
+  before_post_process :set_real_file_name
+  
   Paperclip.interpolates :escaped_basename do |attachment, style|
     Paperclip::Interpolations[:basename].call(attachment, style).to_url
   end
@@ -22,7 +27,7 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   def Filename=(name)
-    self.title = name
+    @real_file_name = name
   end
   
   def create_thumb_file(style_name)
@@ -34,14 +39,18 @@ class PapermillAsset < ActiveRecord::Base
     ("%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 basename
+    name.gsub(/#{extension}$/, "").strip
+  end
+  
+  def extension
+    File.extname(name)
+  end
+  
   def width
     Paperclip::Geometry.from_file(file).width
   end
@@ -88,6 +97,11 @@ class PapermillAsset < ActiveRecord::Base
   end
   
   private
+  
+  def set_real_file_name
+    self.file_file_name = @real_file_name
+  end
+  
   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

data/lib/papermill/papermill_options.rb

@@ -2,7 +2,6 @@
 # It MUST stand in your RAILS_ROOT/config/initializer folder
 # It is explicitely early-loaded by Papermill
 # Papermill::OPTIONS constant needs to be set before PapermillAsset is loaded, and PapermillAsset cannot be lazy-loaded
-
 module Papermill
 
   # All these options will be used as defaults. You can change them : 
@@ -27,6 +26,7 @@ module Papermill
   # Merges are recursive (for :gallery, :thumbnail and :swfupload sub-hashs)
   
   unless defined?(OPTIONS)
+  
     OPTIONS = {
       # Associated PapermillAsset subclass
       :class_name => "PapermillAsset",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2009-11-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Paperclip Swfupload UploadHelper wrapper