@@ -44,6 +44,8 @@ Note: The 0.3 branch is a complete rewrite of everything, with a similar (but no [REMOVED] The remote_upload_form helper has been removed, for encouraging bad JS practice. It will not be readded. If you need remote uploads, uploading with Flash is much cooler, and can be done in an unobtrusive way. Check out Swiff.js for hints. +[REMOVED] The 'image' helper has been removed, since its functionality is not really useful in any app (hopefully most apps) that uses named routes. + ============================ 0.2.1 CHANGELOG @@ -1,4 +1,4 @@ -module UploadColumnHelper +module UploadColumn::UploadColumnHelper # Returns an input tag of the "file" type tailored for accessing an upload_column field # (identified by method) on an object assigned to the template (identified by object). @@ -12,17 +12,16 @@ module UploadColumnHelper # Note: if you use file_field instead of upload_column_field, the file will not be # stored across form redisplays. def upload_column_field(object, method, options={}) - result = ActionView::Helpers::InstanceTag.new(object, method, self).to_input_field_tag("file", options) - result << ActionView::Helpers::InstanceTag.new(object, method.to_s+"_temp", self).to_input_field_tag("hidden", {}) + file_field(object, method, options) + hidden_field(object, method.to_s + '_temp') end - + # A helper method for creating a form tag to use with uploadng files, # it works exactly like Rails' form_tag, except that :multipart is always true def upload_form_tag(url_for_options = {}, options = {}, *parameters_for_url, &proc) options[:multipart] = true form_tag( url_for_options, options, *parameters_for_url, &proc ) end - + # A helper method for creating a form tag to use with uploadng files, # it works exactly like Rails' form_for, except that :multipart is always true def upload_form_for(*args, &block) @@ -30,37 +29,17 @@ module UploadColumnHelper options[:html] ||= {} options[:html][:multipart] = true args.push(options) - + form_for(*args, &block) end - # Returns an image tag using a URL created by the set of +options+. Accepts the same options - # as ActionController::Base#url_for. It's also possible to pass a string instead of an options - # hash. - # - # Example - # image( :action => "solarize_picture", :id => @user ) - # Use this in conjunction with UploadColumnRenderHelper.render_image to output dynamically - # rendered version of your RMagick manipulated images. - def image(options = {}, html_options = {}) - html_options[:src] = if options.is_a?(String) then options else self.url_for(options) end - html_options[:alt] ||= File.basename(html_options[:src], '.*').split('.').first.capitalize - - if html_options[:size] - html_options[:width], html_options[:height] = html_options[:size].split("x") - html_options.delete :size - end - - tag("img", html_options) - end - end class ActionView::Helpers::FormBuilder #:nodoc: self.field_helpers += ['upload_column_field'] def upload_column_field(method, options = {}) @template.send(:upload_column_field, @object_name, method, options.merge(:object => @object)) - end + end end -ActionView::Base.send(:include, UploadColumnHelper) \ No newline at end of file +ActionView::Base.send(:include, UploadColumn::UploadColumnHelper) \ No newline at end of file lib/upload_column/rails/upload_column_helper.rb 63d2657bc37d74b715acf126d46dbfb0f8671c34 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/jnicklas/uploadcolumn/commit/24266ab9fb1fe22f4ebbd62563f700465c99e76e 24266ab9fb1fe22f4ebbd62563f700465c99e76e 2008-04-09T11:20:10-07:00 2008-04-09T11:20:10-07:00 cleaned up the UploadColumnHelper a bit git-svn-id: http://uploadcolumn.rubyforge.org/svn/trunk@110 02338ee4-8dee-4235-8d26-5b68cf25713b 15c95b2cba16d7b3f6a49ed306141d39db4a0338 Jonas Nicklas jonas.nicklas@gmail.com