papermill 1.0.3 → 1.0.4

data/README.rdoc

@@ -2,10 +2,6 @@
 
 Asset management made easy.
 
-== News..
-
-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
@@ -115,8 +111,7 @@ FormTagHelpers
 With generic papermill association, Papermill generates an #assets(:key, *args) named_scope
   @article.assets(:illustrations)
   @article.assets(:illustrations, :order => "created_at DESC")
-  @article.illustrations.red.first
-  @article.assets(:illustrations, :order => "created_at DESC").red.first
+  @article.assets(:illustrations).red.first
   # etc.
   
 With declarative papermill associations, Papermill generates an #<association_key>(*args) named_scope

data/TODO.txt

@@ -1,3 +1,4 @@
 Edit views :
 * use Jcrop
 * try Picnic API
+* trad errors

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/app/controllers/papermill_controller.rb

@@ -27,11 +27,8 @@ class PapermillController < ApplicationController
   
   def update
     render :update do |page|
-      if @asset.update_attributes(params[:papermill_asset])
-        page << %{ notify("#{ escape_javascript t("papermill.updated", :ressource => @asset.name)}", "notice") }
-      else
-        page << %{ notify("#{ escape_javascript @asset.errors.full_messages.to_sentence }", "warning") }
-      end
+      @asset.update_attributes(params[:papermill_asset])
+      page << %{ notify("#{ escape_javascript t("papermill.updated", :ressource => @asset.name)}", "notice") }
     end
   end
   
@@ -41,11 +38,8 @@ 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(:unique => !params[:gallery])
-      render :partial => "papermill/asset", :object => @asset, :locals => {:gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style]}
-    else
-      render :text => @asset.errors.full_messages.join('<br />'), :status => 500
-    end
+    @asset.save(:unique => !params[:gallery])
+    render :partial => "papermill/asset", :object => @asset, :locals => {:gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style]}
   end
   
   def sort
@@ -58,11 +52,8 @@ class PapermillController < ApplicationController
   def mass_delete
     render :update do |page|
       @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') }
-        end
+        asset.destroy
+        page << "jQuery('#papermill_asset_#{asset.id}').remove()"
       end
     end
   end

data/config/locales/papermill.yml

@@ -11,8 +11,7 @@ en:
     delete-confirmation: "Delete '{{resource}}'?"
     SWFUPLOAD_PENDING: "Pending..."
     SWFUPLOAD_LOADING: "Loading..."
-    SWFUPLOAD_ERROR: "File is too big, of unauthorized type, or an error occured on the server."
-    file_type: "{{type.capitalize}} file"
+    file_type: "{{type}} file"
     name: "Name"
     content_type: "Content-type"
     size: "File size"
@@ -44,7 +43,6 @@ fr:
     delete-confirmation: "Êtes-vous sûr de vouloir supprimer '{{resource}}' ?"
     SWFUPLOAD_PENDING: "En attente..."
     SWFUPLOAD_LOADING: "Chargement..."
-    SWFUPLOAD_ERROR: "Fichier trop gros, type de fichier non autorisé ou erreur serveur."
     file_type: "Fichier {{type}}"
     name: "Nom"
     content_type: "Content-type"

data/installation-template.txt

@@ -36,30 +36,18 @@ END
 
 file "app/views/articles/_form.html.erb", <<-END
 <% form_for(@article) do |f| %>
-  <%= f.error_messages %>
-  <p>
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
-  </p>
-  <p>
-    <%= f.label :image_gallery %><br />
-    <%= f.images_upload(:image_gallery) %>
-  </p>
-  <p>
-    <%= f.label :my_other_image %><br />
-    <%= f.image_upload(:my_other_image) %> 
-  </p>
-  <p>
-    <%= f.label :my_assets %><br />
-    <%= f.assets_upload(:my_assets) %>
-  </p>
-  <p>
-    <%= f.label :my_other_asset %><br />
-    <%= f.asset_upload(:my_other_asset) %>
-  </p>
-  <p>
-    <%= f.submit 'Send' %>
-  </p>
+  <%= f.error_messages %><br /><br />
+  <%= f.label :title %><br />
+  <%= f.text_field :title %><br /><br />
+  <%= f.label :image_gallery %><br />
+  <%= f.images_upload(:image_gallery) %><br /><br />
+  <%= f.label :my_other_image %><br />
+  <%= f.image_upload(:my_other_image) %> <br /><br />
+  <%= f.label :my_assets %><br />
+  <%= f.assets_upload(:my_assets) %><br /><br />
+  <%= f.label :my_other_asset %><br />
+  <%= f.asset_upload(:my_other_asset) %><br /><br />
+  <%= f.submit 'Send' %>
 <% end %>
 END
 
@@ -115,8 +103,8 @@ file "app/views/layouts/application.html.erb", <<-END
   </head>
   <body>
   <%= yield %>
-  </body>
   <%= papermill_javascript_tag :with_jquery => true %>
+  </body>
 </html>
 END
 

data/lib/papermill/form_builder.rb

@@ -42,8 +42,8 @@ module ActionView::Helpers::FormTagHelper
  
     assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
     options = (
-      if assetable && (association = (assetable.class.papermill_associations[key] || assetable.class.papermill_associations[Papermill::options[:base_association_name]]))
-        association[:options].deep_merge(options)
+      if assetable && (association = (assetable.class.papermill_associations[key.to_sym] || assetable.class.papermill_associations[Papermill::options[:base_association_name]]))
+        association.deep_merge(options)
       elsif assetable.nil?
         Papermill::options.deep_merge(options)
       else
@@ -83,12 +83,12 @@ module ActionView::Helpers::FormTagHelper
         end
       end
     end
-        
+    
     url_options = {
       :escape => false,
       :controller => "/papermill", 
       :action => "create", 
-      :asset_class => (options[:class_name] && options[:class_name].to_s.constantize || association && association[:class] || PapermillAsset).to_s,
+      :asset_class => (options[:class_name] || PapermillAsset).to_s,
       :gallery => !!options[:gallery], 
       :thumbnail_style => options[:thumbnail] && options[:thumbnail][:style]
     }
@@ -152,6 +152,7 @@ module ActionView::Helpers::FormTagHelper
           file_dialog_complete_handler: Upload.file_dialog_complete,
           upload_start_handler: Upload.upload_start,
           upload_progress_handler: Upload.upload_progress,
+          file_queue_error_handler: Upload.file_queue_error,
           upload_error_handler: Upload.upload_error,
           upload_success_handler: Upload.upload_success,
           upload_complete_handler: Upload.upload_complete,

data/lib/papermill/papermill.rb

@@ -14,13 +14,10 @@ module Papermill
     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)
-      }})
+      assoc_name = (!args.first.is_a?(Hash) && args.shift || Papermill::options[:base_association_name]).to_sym
+      local_options = args.first || {}
+
+      (@papermill_associations ||= {}).merge!( assoc_name => Papermill::options.deep_merge(local_options) )
       
       include Papermill::InstanceMethods
       before_destroy :destroy_assets

data/lib/papermill/papermill_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module PapermillHelper
   
   # Sets all the javascript needed for papermill.
@@ -13,7 +15,7 @@ module PapermillHelper
       html << %{<script type="text/javascript">jQuery.noConflict();</script>} if options[:with_jquery] == "no_conflict"
     end
     html << %{<script type="text/javascript">}
-    ["SWFUPLOAD_PENDING", "SWFUPLOAD_LOADING", "SWFUPLOAD_ERROR"].each do |js_constant|
+    ["SWFUPLOAD_PENDING", "SWFUPLOAD_LOADING"].each do |js_constant|
       html << %{var #{js_constant} = "#{t("papermill.#{js_constant}")}";}
     end
     html << %{</script>}

data/lib/papermill/papermill_options.rb

@@ -96,7 +96,7 @@ module Papermill
       	:button_text_left_padding => 4,
       	:debug => false,
       	:prevent_swf_caching => true,
-        :file_size_limit_mb => 10.megabytes
+        :file_size_limit => "10 MB"
       },
     
       # APPLICATION WIDE PARAMETERS

data/public/papermill/papermill.js

@@ -79,7 +79,7 @@ var Upload = {
 				global_index++;
 			} while (file != null);
 			this.sorted_queue = file_queue.sort(function(a,b){
-				if(b.name < a.name){return (1)}
+				if(b.name < a.name){ return (1) } else { return (-1) }
 			})
 			var self = this;
 			jQuery(this.sorted_queue).each( function(index, file) {
@@ -107,11 +107,20 @@ var Upload = {
 		percent = Math.ceil((bytes / total) * 100);
 		jQuery('#' + file.id + ' .progress span').width(percent + '%');
 	},
-	upload_error: function(file, code, message)
-	{
-		notify(SWFUPLOAD_ERROR + " " + file.name + " (" + message + " [" + code + "])", "error");
-		jQuery('#' + file.id).remove();
-	},
+	upload_error: function(file, errorCode, message) {
+		try {
+			switch (errorCode) {
+			case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+				notify("Too many files selected", "error");
+				return;
+			default:
+				notify("An error occurred while sending the file" + errorCode, "error");
+				return;
+			}
+		} catch (ex) {
+		}
+	}, 
+	
 	upload_success: function(file, data)
 	{
 		if(jQuery(data).length == 0) {
@@ -128,8 +137,28 @@ var Upload = {
 			this.startUpload(this.sorted_queue[this.index++].id)
 		}
 	},
-	file_queue_error: function(file, error_code, message) {
-		upload_error(file, error_code, message)
+	
+	file_queue_error: function(file, errorCode, message)  {
+		try {
+			switch (errorCode) {
+			case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+				notify("Too many files selected", "error");
+				return;
+			case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+				notify("File is too big", "error");
+				return;
+			case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+				notify("File is empty.  Please select another file", "error");
+				return;
+			case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+				notify("File is not an allowed file type", "error");
+				return;
+			default:
+				notify("An error occurred while sending the file" + errorCode, "error");
+				return;
+			}
+		} catch (e) {
+		}
 	}
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency