papermill 0.13.2 → 0.14.0

data/README.rdoc

@@ -21,6 +21,7 @@ Asset management made easy.
 
   papermill my_option_hash                                # in your papermilled assetable model
   assets_upload(:my_key, my_option_hash)                  # form helper call
+  f.input :my_key, :as => :assets_upload, my_option_hash  # if you are using formtastic
   @assetable.assets(:my_key)                              # data access in your view
 
 === Association specific declaration
@@ -64,7 +65,7 @@ See papermill_module.rb for the complete list of options.
           :height => 100
         },
         :aliases => {
-          :big => "500x500>"
+          :big => "500x500>",
           :small => "100x100>"
         },
         :public_root => ":rails_root/public",         # already a default

data/TODO.txt

@@ -1,6 +1,5 @@
 * non-regression tests
+* write rake task to delete all forgotten images.
 Edit views :
-* better CSS 
-* use forms
 * use Jcrop
 * try Picnic API

data/VERSION

@@ -1 +1 @@
-0.13.2
+0.14.0

data/app/controllers/papermill_controller.rb

@@ -1,24 +1,28 @@
 class PapermillController < ApplicationController
   # Create is protected because of the Ajax same origin policy. 
-  # Yet SwfUpload doesn't send the right header for request.xhr? to be true and thus failed to disable verify_authenticity_token automatically.
+  # 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]
   
   def show
-    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
+    begin
+      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
     
-    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
-      redirect_to asset.url
+      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
+        redirect_to asset.url
+      end
+    rescue
+      render :text => t('papermill.not-found'), :status => "404"
     end
   end
 
@@ -29,7 +33,7 @@ class PapermillController < ApplicationController
         page << "jQuery('#papermill_asset_#{params[:id]}').remove()"
       else
         page << "jQuery('#papermill_asset_#{params[:id]}').show()"
-        page << %{ notify("#{t((@asset && "not-deleted" || "not-found"), :ressource => @asset.name, :scope => "papermill")}", "error") }
+        page << %{ notify("#{t((@asset && "papermill.not-deleted" || "papermill.not-found"), :ressource => @asset.name)}", "error") }
       end
     end
   end
@@ -38,9 +42,9 @@ class PapermillController < ApplicationController
     @asset = PapermillAsset.find_by_id(params[:id])
     render :update do |page|
       if @asset && @asset.update_attributes(params[:papermill_asset])
-        page << %{ notify("#{t("updated", :ressource => @asset.name, :scope => "papermill")}", "notice") }
+        page << %{ notify("#{t("papermill.updated", :ressource => @asset.name)}", "notice") }
       else
-        page << %{ notify("#{@asset && @asset.errors.full_messages.to_sentence || t("not-found", :ressource => params[:id].to_s, :scope => "papermill")}", "warning") }
+        page << %{ notify("#{@asset && @asset.errors.full_messages.to_sentence || t("papermill.not-found", :ressource => params[:id].to_s)}", "warning") }
       end
     end
   end
@@ -65,7 +69,7 @@ class PapermillController < ApplicationController
       @old_asset.destroy if @old_asset
       render :partial => "papermill/asset", :object => @asset, :locals => {:gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style]}
     else
-      render :text => message, :status => "500"
+      render :text => @asset.errors.full_messages.join('<br />'), :status => "500"
     end
   end
   

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

@@ -1,7 +1,7 @@
 <%- dom_id = "papermill_asset_#{asset.id}" -%>
-<%- delete_link = %{<a onclick="if(confirm('#{escape_javascript I18n.t("delete-confirmation", :scope => :papermill, :resource => asset.name)}')){ $.ajax({async:true, beforeSend:function(request){$('##{dom_id}').hide();}, dataType:'script', error:function(request){$('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("delete", :scope => "papermill", :ressource => 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)}')){ $.ajax({async:true, beforeSend:function(request){$('##{dom_id}').hide();}, dataType:'script', error:function(request){$('##{dom_id}').show();}, type:'delete', url:'#{papermill_url(asset)}'})}; return false;" href="#" class="delete"><img title="#{escape_javascript t("papermill.delete", :ressource => asset.name)}" src="/papermill/images/delete.png" alt="delete"/></a>} %>
 
-<li id="<%= dom_id %>" title="<%= t("#{thumbnail_style ? "thumbnail-" : ""}edit-title", :scope => "papermill", :ressource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>">
+<li id="<%= dom_id %>" title="<%= t("papermill.#{thumbnail_style ? "thumbnail-" : ""}edit-title", :ressource => asset.name) %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>">
 	<%= delete_link %>
 	<%- if thumbnail_style -%>
 	  <%= render :partial => "papermill/thumbnail_asset", :object => asset, :locals => {:thumbnail_style => thumbnail_style} %>

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

@@ -1,13 +1,13 @@
 <p>
-  <%= form.label :title, I18n.t("title", :scope => 'papermill') %><br />
+  <%= form.label :title, t("papermill.title") %><br />
   <%= form.text_field :title, :class => "text_field" %>
 </p>
 <p>
-  <%= form.label :copyright, I18n.t("copyright", :scope => 'papermill') %><br />
+  <%= form.label :copyright, t("papermill.copyright") %><br />
   <%= form.text_field :copyright, :class => "text_field" %>
 </p>
 <p>
-  <%= form.label :description, I18n.t("description", :scope => 'papermill') %><br />
+  <%= form.label :description, t("papermill.description") %><br />
   <%= form.text_area :description %>
 </p>
-<%= submit_tag I18n.t('save', :scope => 'papermill') %>
+<%= submit_tag t('papermill.save') %>

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

@@ -1,23 +1,23 @@
 <div id="papermill-box">
   <div id="left">
-    <%= link_to(@asset.image? ? image_tag(@asset.url("400x#{Papermill::PAPERMILL_DEFAULTS[:max_height]}>")) : I18n.t("file_type", :type => @asset.content_type, :scope => 'papermill'), @asset.url, :popup => true) %>
+    <%= link_to(@asset.image? ? image_tag(@asset.url("400x#{Papermill::PAPERMILL_DEFAULTS[:max_height]}>")) : t("file_type", :type => @asset.content_type, :scope => 'papermill'), @asset.url, :popup => true) %>
   </div>
   <div id="right">
     <div id="read-only">
       <table border="0">
-        <tr><td class="left-cell"><%= I18n.t("name", :scope => 'papermill') %>        </td><td><%= @asset.name %></td></tr>
-        <tr><td class="left-cell"><%= I18n.t("content_type", :scope => 'papermill') %></td><td><%= @asset.content_type %></td></tr>
-        <tr><td class="left-cell"><%= I18n.t("size", :scope => 'papermill') %>        </td><td><%= number_to_human_size(@asset.size.to_i) %></td></tr>
+        <tr><td class="left-cell"><%= t("papermill.name") %>        </td><td><%= @asset.name %></td></tr>
+        <tr><td class="left-cell"><%= t("papermill.content_type") %></td><td><%= @asset.content_type %></td></tr>
+        <tr><td class="left-cell"><%= t("papermill.size") %>        </td><td><%= number_to_human_size(@asset.size.to_i) %></td></tr>
         <% if @asset.image? %>                                                                
-        <tr><td class="left-cell"><%= I18n.t("width", :scope => 'papermill') %>       </td><td><%= @asset.width.to_i %>px</td></tr>
-        <tr><td class="left-cell"><%= I18n.t("height", :scope => 'papermill') %>      </td><td><%= @asset.height.to_i %>px</td></tr>
+        <tr><td class="left-cell"><%= t("papermill.width") %>       </td><td><%= @asset.width.to_i %>px</td></tr>
+        <tr><td class="left-cell"><%= t("papermill.height") %>      </td><td><%= @asset.height.to_i %>px</td></tr>
         <% end %>                                                                             
-        <tr><td class="left-cell"><%= I18n.t("created_at", :scope => 'papermill') %>  </td><td><%= I18n.l(@asset.created_at) %></td></tr>
-        <tr><td class="left-cell"><%= I18n.t("updated_at", :scope => 'papermill') %>  </td><td><%= I18n.l(@asset.updated_at) %></td></tr>
+        <tr><td class="left-cell"><%= t("papermill.created_at") %>  </td><td><%= I18n.l(@asset.created_at) %></td></tr>
+        <tr><td class="left-cell"><%= t("papermill.updated_at") %>  </td><td><%= I18n.l(@asset.updated_at) %></td></tr>
       </table>
     </div>
     <div id="read-write">
-      <form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); return false;" method="post" action="/papermill/76">
+      <form onsubmit="jQuery.ajax({data:jQuery.param(jQuery(this).serializeArray()), dataType:'script', type:'post', url:'/papermill/<%= @asset.id %>'}); return false;" method="post" action="/papermill/<%= @asset.id %>">
         <input type="hidden" value="put" name="_method"/>
         <% fields_for :papermill_asset, @asset do |form| %>
           <%= render :partial => 'form', :object => form %>
@@ -27,7 +27,7 @@
   </div>
   <div style="clear:both;"></div>
   <p id="footer">
-    <%= I18n.t("location", :scope => 'papermill') +  @asset.file.path %><br />
-    <%= I18n.t("url", :scope => 'papermill') +  @asset.url %>
+    <%= t("papermill.location") +  @asset.file.path %><br />
+    <%= t("papermill.url") +  @asset.url %>
   </p>
 </div>

data/config/locales/papermill.yml

@@ -42,7 +42,7 @@ fr:
     SWFUPLOAD_LOADING: "Chargement..."
     SWFUPLOAD_ERROR: "Une erreur est survenue pendant le chargement de"
     file_type: "Fichier {{type}}"
-    name: "Nom : "
+    name: "Nom"
     content_type: "Content-type"
     size: "Taille du fichier"
     class_name: "Type d'asset"

data/lib/papermill/form_builder.rb

@@ -91,7 +91,7 @@ module ActionView::Helpers::FormTagHelper
     collection = asset_class.find(: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 => "papermill #{(options[:thumbnail] ? "papermill-thumb-container" : "papermill-asset-container")} #{(options[:gallery] ? "papermill-multiple-items" : "papermill-unique-item")}") {
+    html << @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]) }
     }
     @template.content_for :papermill_inline_js do
@@ -117,7 +117,7 @@ module ActionView::Helpers::FormTagHelper
       }
   	end
   	html.reverse! if options[:button_after_container]
-	  html.join("\n")
+	  %{<div class="papermill">#{html.join("\n")}</div>}
   end
 end
 
@@ -137,4 +137,13 @@ class ActionView::Helpers::FormBuilder
   def image_upload(key = nil, options = {})
     papermill_upload_tag key, { :gallery => false }.update(options)
   end
-end
+end
+
+class Formtastic::SemanticFormBuilder
+  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
+    self.label(method, options_for_label(options)) +
+    self.send(input_type, method, options)
+  end
+end

data/lib/papermill/papermill_helper.rb

@@ -14,7 +14,7 @@ module PapermillHelper
     end
     html << %{<script type="text/javascript">}
     ["SWFUPLOAD_PENDING", "SWFUPLOAD_LOADING", "SWFUPLOAD_ERROR"].each do |js_constant|
-      html << %{var #{js_constant} = "#{I18n.t(js_constant, :scope => "papermill")}";}
+      html << %{var #{js_constant} = "#{t("papermill.#{js_constant}")}";}
     end
     html << %{</script>}
     html << javascript_include_tag("/papermill/papermill", "/papermill/swfupload")

data/lib/papermill/papermill_module.rb

@@ -44,7 +44,7 @@ module Papermill
       :button_width     => 61,
       :button_height    => 22,
       # Wording and CSS processed through an Adobe Flash styler. Result is terrible. Feel free to put a CSS button overlayed directly on the SWF button. See swfupload website.
-      :button_text => %{<span class="button-text">#{I18n.t("upload-button-wording", :scope => :papermill)}</span>},
+      :button_text => %{<span class="button-text">#{I18n.t("papermill.upload-button-wording")}</span>},
     	:button_text_style => %{.button-text { color: red; font-size: 12pt; font-weight: bold; }},
     	:button_disabled => "false",
       :button_text_top_padding => 4,

data/public/papermill/papermill.css

@@ -12,37 +12,41 @@
 #papermill-box .right-cell {}
 #papermill-box .left-cell {font-weight:bold; padding-right:10px; text-align:right;}
 
+.papermill { overflow:hidden; }
 .papermill a:hover { background:none; color:inherit; }
 .papermill a img { border:0px; }
 .papermill li:hover { border-color:blue; }
-.papermill li a { display:block; }
+.papermill li a { display:block;  }
 .papermill .progress { display:block; border:1px solid #C2E3EF; text-align:left; height:6px; }
 .papermill .progress span { background:#7BB963; height:6px; width:0; display:block; }
 
-.papermill-thumb-container li { border:0px solid transparent; min-height:25px; min-width:25px; }
-.papermill-thumb-container { position:relative; border:5px solid #EEE; padding:4px; overflow-x:hidden; }
-.papermill-thumb-container li { display:block; float:left; position:relative; }
-.papermill-thumb-container .delete { position:absolute; bottom:5px; right:5px;  }
-.papermill-thumb-container  span { display:block; }
-.papermill-thumb-container .name { font-size:10px; overflow:hidden; font-weight:bold; }
-.papermill-thumb-container .infos { font-size:8px; overflow:hidden; }
-.papermill-thumb-container .status { margin-bottom:10px; }
+.papermill-thumb-container { position:relative; border:5px solid #EEE; padding:4px; overflow:hidden; }	
+.papermill-thumb-container li { border:0px solid transparent; min-height:25px; min-width:25px; display:block; float:left; position:relative; }
+.papermill-thumb-container li span { display:block; }
+.papermill-thumb-container li .delete { position:absolute; bottom:5px; right:5px;  }
+.papermill-thumb-container li .name { font-size:10px; overflow:hidden; font-weight:bold; }
+.papermill-thumb-container li .infos { font-size:8px; overflow:hidden; }
+.papermill-thumb-container li .status { margin-bottom:10px; }
 
 .papermill-asset-container {  border:1px solid #EEE; padding:3px; }
 .papermill-asset-container li { display:block; height:22px; }
-.papermill-asset-container .swfupload .name { margin-left:21px; }
-.papermill-asset-container .name { float:left; }
-.papermill-asset-container .status { margin-left:5px; float:left; }
-.papermill-asset-container .progress { float:left; margin-top:6px; margin-left:5px; width:100px; }
-.papermill-asset-container .delete { float:left; margin-top:2px; margin-right:5px; }
+.papermill-asset-container li .swfupload .name { margin-left:21px; }
+.papermill-asset-container li .name { float:left; }
+.papermill-asset-container li .status { margin-left:5px; float:left; }
+.papermill-asset-container li .progress { float:left; margin-top:6px; margin-left:5px; width:100px; }
+.papermill-asset-container li .delete { float:left; margin-top:2px; margin-right:5px; }
 
 .papermill-asset-container.papermill-multiple-items { padding-left:10px; border-left:5px solid #EEE; min-height:44px; }
 .papermill-asset-container.papermill-multiple-items li { cursor:row-resize; }
 .papermill-thumb-container.papermill-multiple-items li { cursor:move; }
 .papermill-asset-container.papermill-unique-item { padding-left:5px; min-height:22px; }
 
+/* Using formtastic? Move this to your formtastic_changes.css to make it cleaner : */
+form.formtastic .papermill ul li {
+	margin-bottom:0;
+}
+
 /* Need some backgrounds?
 .papermill li { background:transparent url(images/background.png) repeat top left; }
 .papermill-thumb-container { background:transparent url(images/container-background.jpg) repeat top left; }
 */
-

data/public/papermill/papermill.js

@@ -33,7 +33,7 @@ popup = function(url) {
 */
 
 notify = function(message, type) {
-	alert(type + ": " + message)
+	if(type != "notice") { alert(type + ": " + message) }
 }
 /*
 If you have a notification library, override notify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +02:00
+date: 2009-10-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,8 +71,6 @@ files:
 - public/papermill/swfupload.swf
 - rails/init.rb
 - tasks/papermill_tasks.rake
-- test/papermill_test.rb
-- test/test_helper.rb
 - uninstall.rb
 has_rdoc: true
 homepage: http://github.com/bbenezech/papermill
@@ -98,10 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Paperclip Swfupload UploadHelper wrapper
-test_files: 
-- test/papermill_test.rb
-- test/test_helper.rb
+test_files: []
+

data/test/papermill_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class PapermillTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-
-  test "the truth" do
-    assert true
-  end
-end

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-require 'rubygems'
-require 'active_support'
-require 'active_support/test_case'