diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/polymorphic_routes.rb | 64 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/record_identifier.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 29 |
3 files changed, 57 insertions, 38 deletions
diff --git a/actionpack/lib/action_controller/polymorphic_routes.rb b/actionpack/lib/action_controller/polymorphic_routes.rb index c60b533205..6c21bc27c5 100644 --- a/actionpack/lib/action_controller/polymorphic_routes.rb +++ b/actionpack/lib/action_controller/polymorphic_routes.rb @@ -1,31 +1,29 @@ module ActionController module PolymorphicRoutes - def polymorphic_url(record_or_hash, options = {}) - record = extract_record(record_or_hash) - - case - when options[:action] == "new" - send( - action_prefix(options) + RecordIdentifier.singular_class_name(record) + routing_type(options) - ) - - when record.respond_to?(:new_record?) && record.new_record? - send( - action_prefix(options) + RecordIdentifier.plural_class_name(record) + routing_type(options) - ) - - else - send( - action_prefix(options) + RecordIdentifier.singular_class_name(record) + routing_type(options), record_or_hash - ) - end + def polymorphic_url(record_or_hash_or_array, options = {}) + record = extract_record(record_or_hash_or_array) + + args = [] + inflection = + case + when options[:action] == "new" + :singular + when record.respond_to?(:new_record?) && record.new_record? + :plural + else + args = [record_or_hash_or_array] + :singular + end + + named_route = build_named_route_call(record_or_hash_or_array, inflection, options) + send(named_route, *args) end - def polymorphic_path(record_or_hash) - polymorphic_url(record_or_hash, :routing_type => :path) + def polymorphic_path(record_or_hash_or_array) + polymorphic_url(record_or_hash_or_array, :routing_type => :path) end - %w( edit new formatted ).each do |action| + %w(edit new formatted).each do |action| module_eval <<-EOT, __FILE__, __LINE__ def #{action}_polymorphic_url(record_or_hash) polymorphic_url(record_or_hash, :action => "#{action}") @@ -44,11 +42,27 @@ module ActionController end def routing_type(options) - "_#{options[:routing_type] || "url"}" + "#{options[:routing_type] || "url"}" + end + + def build_named_route_call(records, inflection, options = {}) + records = Array.new([extract_record(records)]) unless records.is_a?(Array) + base_segment = "#{RecordIdentifier.send("#{inflection}_class_name", records.pop)}_" + + method_root = records.reverse.inject(base_segment) do |string, name| + segment = "#{RecordIdentifier.send("singular_class_name", name)}_" + segment << string + end + + action_prefix(options) + method_root + routing_type(options) end - def extract_record(record_or_hash) - record_or_hash.is_a?(Hash) ? record_or_hash[:id] : record_or_hash + def extract_record(record_or_hash_or_array) + case record_or_hash_or_array + when Array: record_or_hash_or_array.last + when Hash: record_or_hash_or_array[:id] + else record_or_hash_or_array + end end end end diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb index 1a60becff3..bdf2753a79 100644 --- a/actionpack/lib/action_controller/record_identifier.rb +++ b/actionpack/lib/action_controller/record_identifier.rb @@ -25,7 +25,7 @@ module ActionController # end # end # - # As the example above shows, you can stop caring to a large extend what the actual id of the post is. You just know + # As the example above shows, you can stop caring to a large extent what the actual id of the post is. You just know # that one is being assigned and that the subsequent calls in redirect_to and the RJS expect that same naming # convention and allows you to write less code if you follow it. module RecordIdentifier diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 7325aad398..1a4aa0ca05 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -163,9 +163,14 @@ module ActionView case record_or_name when String, Symbol object_name = record_or_name + when Array + object = record_or_name.last + object_name = ActionController::RecordIdentifier.singular_class_name(object) + apply_form_for_options!(object, options, *record_or_name) + args.unshift object else - object = record_or_name - object_name = ActionController::RecordIdentifier.singular_class_name(record_or_name) + object = record_or_name + object_name = ActionController::RecordIdentifier.singular_class_name(object) apply_form_for_options!(object, options) args.unshift object end @@ -174,18 +179,18 @@ module ActionView fields_for(object_name, *(args << options), &proc) concat('</form>', proc.binding) end - - def apply_form_for_options!(object, options) #:nodoc: - html_options = if object.respond_to?(:new_record?) && object.new_record? - { :class => dom_class(object, :new), :id => dom_id(object), :method => :post } - else - { :class => dom_class(object, :edit), :id => dom_id(object, :edit), :method => :put } - end - + + def apply_form_for_options!(object, options, *nested_objects) #:nodoc: + html_options = + if object.respond_to?(:new_record?) && object.new_record? + { :class => dom_class(object, :new), :id => dom_id(object), :method => :post } + else + { :class => dom_class(object, :edit), :id => dom_id(object, :edit), :method => :put } + end + options[:html] ||= {} options[:html].reverse_merge!(html_options) - - options[:url] ||= polymorphic_path(object) + options[:url] ||= polymorphic_path(object, *nested_objects) end # Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes |