papermill 1.3.2 → 1.3.3

data/README.rdoc

@@ -17,7 +17,7 @@
 * Formtastic          # use :as => :[image|asset](s)_upload
 * JGrowl              # for notifications (included)
 * FaceBox             # for popups (included)
-* Stringex            # (or any String#to_url) for filename generation
+* Stringex            # (or any String#to_url) for asset filename/url generation
 
 === Navigator minimal requirements: 
 
@@ -33,7 +33,7 @@ Check your audience.
 * Rails 2.3.4 min (rail's I18n, engine. older 2.3.x have issues with CRSF or try to check for CRSF stamp against AJAX request, useless with AJAX same origin policy, fixed with 2.3.4)
 * Paperclip 2.3 branch (installed by default as a gem dependency, will be loaded internally if needed => You can require your own version of Paperclip if you want to)
 * Front web server serving static assets if present, and forwarding demand to rails if not. (Usually a no-brainer on any classic installation. Works with Webrick)
-
+ 
 == Features
 
 === Ajax uploading form helpers through SWFUpload => [image|asset](s)_upload

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/app/controllers/papermill_controller.rb

@@ -2,6 +2,8 @@ class PapermillController < ApplicationController
   prepend_before_filter :load_asset,  :only => [ "show", "destroy", "update", "edit", "crop" ]
   prepend_before_filter :load_assets, :only => [ "sort", "mass_delete", "mass_edit", "mass_thumbnail_reset" ]
   
+  skip_before_filter :verify_authenticity_token, :only => [:create] # not needed (Flash same origin policy)
+  
   def show
     # first escaping is done by rails prior to route recognition, need to do a second one on MSWIN systems to get original one.
     params[:style] = CGI::unescape(params[:style]) if RUBY_PLATFORM =~ /win/

data/lib/papermill/form_builder.rb

@@ -43,8 +43,12 @@ module ActionView::Helpers::FormTagHelper
     end
     
     assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
+    
+    raise PapermillException.new("Your form instance object is not @#{@object_name}, and therefor cannot be found. \nPlease provide your object name in your form_for initialization. \nform_for :my_object_name, @my_object_name, :url => { :action => 'create'/'update'}") if @object_name && !assetable
+    
     assetable_id = assetable && (assetable.id || assetable.timestamp) || nil
     assetable_type = assetable && assetable.class.base_class.name || nil
+    
     options = PapermillAsset.papermill_options(assetable && assetable.class.name, key).deep_merge(options)
     dom_id = "papermill_#{assetable_type}_#{assetable_id}_#{key}"
     
@@ -116,8 +120,7 @@ module ActionView::Helpers::FormTagHelper
       %{
         new SWFUpload({
           post_params: {
-            "#{ ActionController::Base.session_options[:key] }": "#{ @template.cookies[ActionController::Base.session_options[:key]] }",
-            "authenticity_token": "#{ @template.form_authenticity_token }"
+            "#{ ActionController::Base.session_options[:key] }": "#{ @template.cookies[ActionController::Base.session_options[:key]] }"
           },
           upload_id: "#{ dom_id }",
           upload_url: "#{ @template.escape_javascript create_url }",

data/lib/papermill/papermill_asset.rb

@@ -123,8 +123,9 @@ class PapermillAsset < ActiveRecord::Base
   def create_thumb_file(style_name, style = nil)
     destroy_thumbnails if style_name.to_s == "original"
     style = self.class.compute_style(style_name) unless style.is_a?(Hash)
-    FileUtils.mkdir_p File.dirname(file.path(style_name))
-    FileUtils.cp((tmp_path = Paperclip::PapermillPaperclipProcessor.make(file, style).path), file.path(style_name))
+    FileUtils.mkdir_p File.dirname(new_path = file.path(style_name))
+    FileUtils.cp((tmp_path = Paperclip::PapermillPaperclipProcessor.make(file, style).path), new_path)
+    FileUtils.chmod(0644, new_path) unless Papermill::MSWIN
     File.delete(tmp_path)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +01:00
+date: 2010-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency