From a04a849d155997d0c3a6fcae4688a45c421e7a00 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 12 Feb 2006 00:22:24 +0000 Subject: Clean up style around form_for and friends a bit git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3573 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/form_helper.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_view/helpers/form_helper.rb') diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 81f6fec827..ab387b7bf8 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -121,9 +121,10 @@ module ActionView # end # def form_for(object_name, object, options = {}, &proc) - concat form_tag(options, options.delete(:html) || {}), proc.binding + raise ArgumentError, "Missing block" unless block_given? + concat(form_tag(options, options.delete(:html) || {}), proc.binding) fields_for(object_name, object, options, &proc) - concat '', proc.binding + concat('', proc.binding) end # Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes @@ -141,10 +142,8 @@ module ActionView # Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base. # Like collection_select and datetime_select. def fields_for(object_name, object, options = {}, &proc) - raise ArgumentError, "fields_for requires a block!" unless block_given? - builder_klass = options[:builder] || FormBuilder - form_builder = builder_klass.new(object_name, object, self, options, proc) - yield form_builder + raise ArgumentError, "Missing block" unless block_given? + yield (options[:builder] || FormBuilder).new(object_name, object, self, options, proc) end # Returns an input tag of the "text" type tailored for accessing a specified attribute (identified by +method+) on an object -- cgit v1.2.3