BBenezech-papermill 0.5.0 → 0.5.2

data/README.rdoc

@@ -11,6 +11,10 @@ Asset management made easy.
   
   $ sudo gem install sqlite3-ruby
   $ rails -m http://gist.github.com/177714.txt papermill-example
+  $ cd papermill-example
+  $ ./script/server
+  $ GoTo localhost:3000 and try to create an article with assets but without title
+  $ profit
   
 == Papermill comes in 2 flavors:
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.2

data/app/controllers/papermill_controller.rb

@@ -25,32 +25,25 @@ class PapermillController < ApplicationController
   end
 
   def destroy
-    begin
-      @asset = PapermillAsset.find(params[:id])
-      render :update do |page|
-        if @asset.destroy
-          page << "jQuery('#papermill_asset_#{params[:id]}').remove()"
-        else
-          page << "jQuery('#papermill_asset_#{params[:id]}').show()"
-          message = t("not-deleted", :ressource => @asset.name, :scope => "papermill")
-          page << %{ notify("#{message}", error) }
-        end
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :update do |page|
+    @asset = PapermillAsset.find_by_id(params[:id])
+    render :update do |page|
+      if @asset && @asset.destroy
         page << "jQuery('#papermill_asset_#{params[:id]}').remove()"
-        message = t("not-found", :ressource => params[:id].to_s, :scope => "papermill")
-        page << %{ notify("#{message}", "warning") }
+      else
+        page << "jQuery('#papermill_asset_#{params[:id]}').show()"
+        page << %{ notify("#{t((@asset && "not-deleted" || "not-found"), :ressource => @asset.name, :scope => "papermill")}", error) }
       end
     end
   end
   
   def update
-    @asset = PapermillAsset.find params[:id]
-    @asset.update(params)
+    @asset = PapermillAsset.find_by_id(params[:id])
     render :update do |page|
-      message = t("updated", :ressource => @asset.name, :scope => "papermill")
-      page << %{ notify("#{message}", "notice") }
+      if @asset && @asset.update(params)
+        page << %{ notify("#{t("updated", :ressource => @asset.name, :scope => "papermill")}", "notice") }
+      else
+        page << %{ notify("#{@asset && @asset.errors.full_messages.to_sentence || t("not-found", :ressource => params[:id].to_s, :scope => "papermill")}", "warning") }
+      end
     end
   end
   
@@ -72,7 +65,6 @@ 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
-      message = t("not-created", :scope => "papermill")
       render :text => message, :status => "500"
     end
   end

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

@@ -1,7 +1,7 @@
 <%- dom_id = dom_id(asset) -%>
 <%- 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="/images/papermill/delete.png" alt="delete"/></a>} %>
 
-<li id="<%= dom_id %>" rel="<%= edit_papermill_url(asset) %>" title="<%= t("#{thumbnail_style ? "thumbnail-" : ""}edit-title", :scope => "papermill", :ressource => asset.name) %>">
+<li id="<%= dom_id %>" onDblClick="popup(jQuery(this).attr('rel')); return false;" rel="<%= edit_papermill_url(asset) %>" title="<%= t("#{thumbnail_style ? "thumbnail-" : ""}edit-title", :scope => "papermill", :ressource => asset.name) %>">
 	<%= delete_link %>
 	<%- if thumbnail_style -%>
 	  <%= render :partial => "papermill/thumbnail_asset", :object => asset, :locals => {:thumbnail_style => thumbnail_style} %>

data/config/locales/papermill.yml

@@ -3,7 +3,6 @@ en:
     not-processed: "Error/ressource not processed"
     updated: "{{ressource}} updated"
     not-deleted: "{{ressource}} could not be deleted"
-    not-created: "Ressource could not be created"
     not-found: "Asset #{{ressource}} not found"
     edit-title: "" # You can use {{ressource}}
     thumbnail-edit-title: ""
@@ -18,7 +17,6 @@ fr:
     not-processed: "Erreur/ressource non trouvée"
     updated: "{{ressource}} mise à jour"
     not-deleted: "{{ressource}} n'a pas pu être supprimée"
-    not-created: "La ressource n'a pas pu être créée"
     not-found: "Asset #{{ressource}} non trouvé"
     edit-title: ""
     thumbnail-edit-title: ""

data/installation-template.txt

@@ -12,7 +12,7 @@ rake "db:migrate"
 file "app/models/article.rb", <<-END
   class Article < ActiveRecord::Base
     validates_presence_of :title
-    papermill :thumbnail => {:width => 50, :height => 50} # catch-all for non-specified associations
+    papermill :thumbnail => {:width => 100, :height => 75} # catch-all for non-specified associations
     papermill :image_gallery, :class_name => ImageAsset, :images_only => true, :thumbnail => {:width => 75, :height => 100}
     # image_gallery association (set with define_method)
   end
@@ -80,24 +80,24 @@ file "app/views/articles/show.html.erb", <<-END
   <% end %>
 </p>
 <br /><br />
-<b>@article.papermill_assets(:key => :my_other_image).first :</b>
+<b>@article.papermill_assets(:my_other_image).first :</b>
 <p>
-  <% image = @article.papermill_assets(:key => :my_other_image).first %>
+  <% image = @article.papermill_assets(:my_other_image).first %>
   <%= link_to(image_tag(image.url("100x100#")), image.url) if image %>
 </p>
 <br /><br />
-<b>@article.papermill_assets(:key => :my_assets).each :</b>
+<b>@article.papermill_assets(:my_assets).each :</b>
 <p>
   <ul>
-    <% @article.papermill_assets(:key => :my_assets).each do |asset| %>
+    <% @article.papermill_assets(:my_assets).each do |asset| %>
       <li><%= link_to asset.name, asset.url %></li>
     <% end %>
   </ul>
 </p>
 <br /><br />
-<b>@article.papermill_assets(:key => :my_other_asset).first :</b>
+<b>@article.papermill_assets(:my_other_asset).first :</b>
 <p>
-  <% asset = @article.papermill_assets(:key => :my_other_asset).first %>
+  <% asset = @article.papermill_assets(:my_other_asset).first %>
   <%= link_to(asset.name, asset.url) if asset %>
 </p>
 

data/lib/papermill/papermill_asset.rb

@@ -3,9 +3,7 @@ class PapermillAsset < ActiveRecord::Base
   
   belongs_to :assetable, :polymorphic => true
   before_destroy :destroy_files
-  
-  named_scope :key, lambda { |key| { :conditions => { :assetable_key => key } } }
-  
+
   Paperclip::Attachment.interpolations[:escaped_basename] = proc do |attachment, style|
     Paperclip::Attachment.interpolations[:basename].call(attachment, style).to_url
   end
@@ -14,10 +12,7 @@ class PapermillAsset < ActiveRecord::Base
     :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
-  
-  #validates_attachment_content_type :file, :content_type => ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/gif']
-  
-  # Fix the mime types. Make sure to require the mime-types gem
+
   def swfupload_file=(data)
     data.content_type = MIME::Types.type_for(data.original_filename).to_s
     self.file = data
@@ -47,9 +42,8 @@ class PapermillAsset < ActiveRecord::Base
     content_type && content_type.first == "image" && content_type[1]
   end
   
-  # before_filter
   def destroy_files
-    system "rm -rf #{Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}, ':id_partition')}/" if image?
+    system "rm -rf #{Papermill::papermill_interpolated_path({":id_partition" => self.id_partition}, ':id_partition')}/"
     true
   end
 end

data/lib/papermill/papermill_module.rb

@@ -70,7 +70,6 @@ module Papermill
     :papermill_prefix => "system/papermill"
   }.deep_merge( Papermill.const_defined?("OPTIONS") ? Papermill::OPTIONS : {} )
   
-
   PAPERCLIP_INTERPOLATION_STRING = ":id_partition/:style/:escaped_basename.:extension"
   
   def self.included(base)
@@ -174,6 +173,5 @@ module Papermill
         end
       end
     end
-    
   end
 end

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.5.0"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]
-  s.date = %q{2009-09-03}
+  s.date = %q{2009-09-05}
   s.description = %q{Paperclip Swfupload UploadHelper wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/BBenezech/papermill}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Paperclip Swfupload UploadHelper wrapper}
   s.test_files = [
     "test/papermill_test.rb",

data/public/javascripts/papermill.js

@@ -1,26 +1,15 @@
-/*
-	Papermill SWFUpload wrapper
-	You'll need jQuery or a **very** little bit of rewriting for native/prototype
-*/
+popup = function(title1, title) {
+	window.open (title1, title, config='height=700, width=600, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no')
+}
+// override at will
 
 notify = function(message, type) {
-	// wrap with your own javascript alert system (here is the thing for jGrowl)
-	//if(type == "notice") { jQuery.noticeAdd({ text: message, stayTime: 4000, stay: false, type: type }) }
-	//if(type == "warning") {	jQuery.noticeAdd({ text: message, stayTime: 9000, stay: false, type: type }) }
-	//if(type == "error") {	jQuery.noticeAdd({ text: message, stayTime: 20000, stay: false, type: type }) }
-	
-	// or simply
 	alert(type + ": " + message)
 }
-
+// You can override notify later, with your own notification system
 
 var Upload = {
-	// The total number of files queued with SWFUpload
 	files_queued: 0,
-	
-	set_recipient_id: function(dom_id) {
-		this.recipient_id = dom_id
-	},
 	file_dialog_complete: function(num_selected, num_queued)
 	{
 		// SwfUpload doesn't order uploads by name out of the box...
@@ -74,7 +63,12 @@ var Upload = {
 	},
 	upload_success: function(file, data)
 	{
-		jQuery('#' + file.id).replaceWith(jQuery(data));
+		if(jQuery(data).length == 0) {
+			notify(data, "warning");
+			jQuery('#' + file.id).remove();
+		} else {
+			jQuery('#' + file.id).replaceWith(jQuery(data));
+		}
 	},
 	upload_complete: function(file)
 	{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BBenezech-papermill
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency