papermill 0.6.1 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/papermill/form_builder.rb

@@ -1,25 +1,25 @@
-class ActionView::Helpers::FormBuilder
+module ActionView::Helpers::FormTagHelper
   
-  def assets_upload(key = nil, options = {})
-    papermill_upload_field key, { :thumbnail => false }.update(options)
+  def assets_upload_tag(assetable, key = nil, options = {})
+    papermill_upload_field_tag key, { :thumbnail => false, :assetable => assetable }.update(options)
   end
-  def asset_upload(key = nil, options = {})
-    papermill_upload_field key, { :gallery => false, :thumbnail => false }.update(options)
+  def asset_upload_tag(assetable, key = nil, options = {})
+    papermill_upload_field_tag key, { :gallery => false, :thumbnail => false, :assetable => assetable }.update(options)
   end
-  def images_upload(key = nil, options = {})
-    papermill_upload_field key, options
+  def images_upload_tag(assetable, key = nil, options = {})
+    papermill_upload_field_tag key, { :assetable => assetable }.update(options)
   end
-  def image_upload(key = nil, options = {})
-    papermill_upload_field key, { :gallery => false }.update(options)
+  def image_upload_tag(assetable, key = nil, options = {})
+    papermill_upload_field_tag key, { :gallery => false, :assetable => assetable }.update(options)
   end
-
+  
   private
-  def papermill_upload_field(key, options = {})
+  def papermill_upload_field_tag(key, options)
     if key.is_a? Hash
       options = key
       key = nil
     end
-    assetable = @template.instance_variable_get("@#{@object_name}")
+    assetable = options[:assetable] || @template.instance_variable_get("@#{@object_name}")
     options = if assetable && (association = (assetable.class.papermill_associations[key] || assetable.class.papermill_associations[:papermill_assets]))
       association[:options].deep_merge(options)
     else
@@ -64,7 +64,7 @@ class ActionView::Helpers::FormBuilder
     asset_class = options[:class_name] && options[:class_name].to_s.constantize || association && association[:class] || PapermillAsset
     create_url = @template.url_for(:controller => "/papermill", :action => "create", :escape => false, :asset_class => asset_class.to_s, :assetable_key => key, :assetable_id => assetable_id, :assetable_type => assetable_type, :gallery => (options[:gallery] != false), :thumbnail_style => (options[:thumbnail] && options[:thumbnail][:style]))
     if assetable && assetable.new_record? && !@timestamped
-      html << self.hidden_field(:timestamp, :value => assetable.timestamp)
+      html << @template.hidden_field(assetable.class.to_s.underscore, :timestamp, :value => assetable.timestamp)
       @timestamped = true
     end
     collection = asset_class.find(:all, :conditions => conditions, :order => "position")
@@ -98,4 +98,22 @@ class ActionView::Helpers::FormBuilder
   	html.reverse! if options[:button_after_container]
 	  html.join("\n")
   end
+end
+
+
+class ActionView::Helpers::FormBuilder
+  include ActionView::Helpers::FormTagHelper
+  
+  def assets_upload(key = nil, options = {})
+    papermill_upload_field_tag key, { :thumbnail => false }.update(options)
+  end
+  def asset_upload(key = nil, options = {})
+    papermill_upload_field_tag key, { :gallery => false, :thumbnail => false }.update(options)
+  end
+  def images_upload(key = nil, options = {})
+    papermill_upload_field_tag key, options
+  end
+  def image_upload(key = nil, options = {})
+    papermill_upload_field_tag key, { :gallery => false }.update(options)
+  end
 end

data/papermill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{papermill}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   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-16}
+  s.date = %q{2009-09-17}
   s.description = %q{Paperclip Swfupload UploadHelper wrapper}
   s.email = %q{benoit.benezech@gmail.com}
   s.extra_rdoc_files = [

metadata

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