From 58d3b9042302d41f90fc129f12787d83f7bdade9 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Tue, 31 Aug 2010 20:33:28 +0900
Subject: Speed up form_for by specializing extract_options! (at asakusa.rb)
---
actionpack/lib/action_view/helpers/form_helper.rb | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ed83658140..6c3d2cf1b8 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -519,16 +519,18 @@ module ActionView
# Delete: <%= project_fields.check_box :_destroy %>
# <% end %>
# <% end %>
- def fields_for(record_or_name_or_array, *args, &block)
+ def fields_for(record, record_object = nil, options = nil, &block)
raise ArgumentError, "Missing block" unless block_given?
- options = args.extract_options!
- case record_or_name_or_array
+ options, record_object = record_object, nil if record_object.is_a?(Hash)
+ options ||= {}
+
+ case record
when String, Symbol
- object_name = record_or_name_or_array
- object = args.first
+ object = record_object
+ object_name = record
else
- object = record_or_name_or_array
+ object = record
object_name = ActiveModel::Naming.singular(object)
end
--
cgit v1.2.3