papermill 2.0.0 → 2.0.1

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/generators/papermill_initializer/papermill_initializer.rb

@@ -28,7 +28,11 @@ module Papermill
       # Helper can generates inline css styling that adapt to your gallery/images placeholder. You can use it to scaffold, then copy the lines you need in your application css and set it to false.
       
       # :inline_css => true,
-    
+      
+      # If you don't want generated CSS and JS to be captured and available through @papermill_inline_css/@papermill_inline_js, and instead directly outputed in the form, set it to false
+      
+      # :use_content_for => true,
+      
       # SwfUpload will only let the user upload images. 
       
       # :images_only => false,

data/lib/papermill/form_builder.rb

@@ -51,16 +51,18 @@ module ActionView::Helpers::FormTagHelper
     options = association_options.deep_merge(options)
     field_name = "#{assetable_name}[papermill_#{method}_ids][]"
     
+    html = {}
+    
     if ot = options[:thumbnail]
       w = ot[:width]  || ot[:height] && ot[:aspect_ratio] && (ot[:height] * ot[:aspect_ratio]).to_i || nil
       h = ot[:height] || ot[:width]  && ot[:aspect_ratio] && (ot[:width] / ot[:aspect_ratio]).to_i || nil
       computed_style = ot[:style] || (w || h) && "#{w}x#{h}>" || "original"
-      set_papermill_inline_css(field_id, w, h, options)
+      html[:css] = set_papermill_inline_css(field_id, w, h, options)
     end
 
-    set_papermill_inline_js(field_id, compute_papermill_url(:create, computed_style, field_name, field_id, options), options)
+    html[:js] = set_papermill_inline_js(field_id, compute_papermill_url(:create, computed_style, field_name, field_id, options), options)
 
-    html = {}
+    
     html[:upload_button] = %{\
       <div id="#{field_id}-button-wrapper" class="papermill-button-wrapper" style="height: #{options[:swfupload][:button_height]}px;">
         <span id="browse_for_#{field_id}" class="swf_button"></span>
@@ -91,7 +93,7 @@ module ActionView::Helpers::FormTagHelper
     # hidden_field needed to empty a list.
 	  %{<div class="papermill">
 	    #{@template.hidden_field("#{assetable_name}[papermill_#{method}_ids]", nil)}
-	    #{options[:form_helper_elements].map{|element| html[element] || ""}.join("\n")}
+	    #{html[:css] + html[:js] + options[:form_helper_elements].map{|element| html[element] || ""}.join("\n")}
 	  </div>}
   end
   
@@ -106,36 +108,44 @@ module ActionView::Helpers::FormTagHelper
   end
   
   def set_papermill_inline_js(field_id, create_url, options)
-    return unless options[:inline_css]
-    @template.content_for :papermill_inline_js do
-      %{ jQuery("##{field_id}").sortable() } if options[:gallery]
-    end
-    @template.content_for :papermill_inline_js do
-      %{
-        new SWFUpload({
-          post_params: { 
-            "#{ ActionController::Base.session_options[:key] }": "#{ @template.cookies[ActionController::Base.session_options[:key]] }"
-          },
-          upload_id: "#{ field_id }",
-          upload_url: "#{ @template.escape_javascript create_url }",
-          file_types: "#{ options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : '' }",
-          file_queue_limit: "#{ !options[:gallery] ? '1' : '0' }",
-          file_queued_handler: Papermill.file_queued,
-          file_dialog_complete_handler: Papermill.file_dialog_complete,
-          upload_start_handler: Papermill.upload_start,
-          upload_progress_handler: Papermill.upload_progress,
-          file_queue_error_handler: Papermill.file_queue_error,
-          upload_error_handler: Papermill.upload_error,
-          upload_success_handler: Papermill.upload_success,
-          upload_complete_handler: Papermill.upload_complete,
-          button_placeholder_id: "browse_for_#{field_id}",
-          #{ options[:swfupload].map { |key, value| "#{key}: #{value}" if value }.compact.join(",\n") }
+    outputed_js = (options[:gallery] ? %{ jQuery("##{field_id}").sortable() } : "") +
+    %{
+      new SWFUpload({
+        post_params: { 
+          "#{ ActionController::Base.session_options[:key] }": "#{ @template.cookies[ActionController::Base.session_options[:key]] }"
+        },
+        upload_id: "#{ field_id }",
+        upload_url: "#{ @template.escape_javascript create_url }",
+        file_types: "#{ options[:images_only] ? '*.jpg;*.jpeg;*.png;*.gif' : '' }",
+        file_queue_limit: "#{ !options[:gallery] ? '1' : '0' }",
+        file_queued_handler: Papermill.file_queued,
+        file_dialog_complete_handler: Papermill.file_dialog_complete,
+        upload_start_handler: Papermill.upload_start,
+        upload_progress_handler: Papermill.upload_progress,
+        file_queue_error_handler: Papermill.file_queue_error,
+        upload_error_handler: Papermill.upload_error,
+        upload_success_handler: Papermill.upload_success,
+        upload_complete_handler: Papermill.upload_complete,
+        button_placeholder_id: "browse_for_#{field_id}",
+        #{ options[:swfupload].map { |key, value| "#{key}: #{value}" if value }.compact.join(",\n") }
+      });
+    }
+    if options[:use_content_for]
+      @template.content_for :papermill_inline_js do
+        outputed_js
+      end
+      ""
+    else
+      %{<script type="text/javascript">
+        $(function() {
+          #{outputed_js}
         });
-      }
+      </script>}
     end
   end
   
   def set_papermill_inline_css(field_id, width, height, options)
+    return unless options[:inline_css]
     html = ["\n"]
     size = [width && "width:#{width}px", height && "height:#{height}px"].compact.join("; ")
     if og = options[:gallery]
@@ -148,8 +158,15 @@ module ActionView::Helpers::FormTagHelper
       html << %{##{field_id}, ##{field_id} .asset { #{size} }}
     end
     html << %{##{field_id} .name { width:#{width || "100"}px; }}
-    @template.content_for :papermill_inline_css do
-      html.join("\n")
+    if options[:use_content_for]
+      @template.content_for :papermill_inline_css do
+        html.join("\n")
+      end
+      ""
+    else
+      %{<style type="text/css">
+        #{html.join("\n")}
+      </style>}
     end
   end
 end

data/lib/papermill/papermill.rb

@@ -54,7 +54,7 @@ module Papermill
       return if assoc_key.to_sym == :default
       unless papermill_options[assoc_key.to_sym][:through]
         self.class_eval %{ 
-          has_many :#{assoc_key}, :as => "assetable", :dependent => :delete_all, :order => :position, :class_name => "PapermillAsset", :conditions => {:assetable_key => '#{assoc_key}'}, :before_add => Proc.new{|a, asset| asset.assetable_key = '#{assoc_key}'}
+          has_many :#{assoc_key}, :as => "assetable", :dependent => :destroy, :order => :position, :class_name => "PapermillAsset", :conditions => {:assetable_key => '#{assoc_key}'}, :before_add => Proc.new{|a, asset| asset.assetable_key = '#{assoc_key}'}
           def papermill_#{assoc_key}_ids=(ids)
             unless (assets_ids = ids.map(&:to_i).select{|i|i>0}) == self.#{assoc_key}.map(&:id)
               assets = PapermillAsset.find(assets_ids)

data/lib/papermill/papermill_options.rb

@@ -3,6 +3,7 @@ module Papermill
     :class_name => "PapermillAsset",
     :through => false,
     :inline_css => true,
+    :use_content_for => true,
     :images_only => false,
     :form_helper_elements => [:upload_button, :container, :browser, :mass_edit],
     :mass_edit => true,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +01:00
+date: 2010-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency