RubyGems - actionpack - Versions diffs - 1.11.2 → 1.12.0 - Mend

actionpack 1.11.2 → 1.12.0

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (149) hide show

data/CHANGELOG +392 -5
data/lib/action_controller.rb +8 -4
data/lib/action_controller/assertions.rb +9 -10
data/lib/action_controller/base.rb +177 -88
data/lib/action_controller/benchmarking.rb +5 -5
data/lib/action_controller/caching.rb +44 -36
data/lib/action_controller/cgi_ext/cgi_methods.rb +71 -6
data/lib/action_controller/cgi_ext/cookie_performance_fix.rb +1 -1
data/lib/action_controller/cgi_process.rb +36 -24
data/lib/action_controller/components.rb +152 -52
data/lib/action_controller/dependencies.rb +1 -1
data/lib/action_controller/deprecated_redirects.rb +2 -2
data/lib/action_controller/deprecated_request_methods.rb +34 -0
data/lib/action_controller/filters.rb +59 -19
data/lib/action_controller/flash.rb +53 -47
data/lib/action_controller/helpers.rb +2 -2
data/lib/action_controller/integration.rb +524 -0
data/lib/action_controller/layout.rb +58 -23
data/lib/action_controller/mime_responds.rb +163 -0
data/lib/action_controller/mime_type.rb +142 -0
data/lib/action_controller/pagination.rb +13 -7
data/lib/action_controller/request.rb +59 -56
data/lib/action_controller/rescue.rb +1 -1
data/lib/action_controller/routing.rb +29 -10
data/lib/action_controller/scaffolding.rb +8 -0
data/lib/action_controller/session/active_record_store.rb +21 -10
data/lib/action_controller/session/mem_cache_store.rb +18 -12
data/lib/action_controller/session_management.rb +30 -11
data/lib/action_controller/templates/rescues/_trace.rhtml +1 -1
data/lib/action_controller/templates/scaffolds/layout.rhtml +4 -4
data/lib/action_controller/templates/scaffolds/list.rhtml +1 -1
data/lib/action_controller/test_process.rb +189 -118
data/lib/action_controller/vendor/html-scanner/html/node.rb +20 -1
data/lib/action_controller/vendor/html-scanner/html/tokenizer.rb +3 -0
data/lib/action_controller/vendor/html-scanner/html/version.rb +1 -1
data/lib/action_controller/vendor/xml_node.rb +97 -0
data/lib/action_controller/verification.rb +2 -0
data/lib/action_pack/version.rb +3 -3
data/lib/action_view.rb +0 -2
data/lib/action_view/base.rb +109 -36
data/lib/action_view/compiled_templates.rb +1 -1
data/lib/action_view/helpers/active_record_helper.rb +4 -2
data/lib/action_view/helpers/asset_tag_helper.rb +6 -7
data/lib/action_view/helpers/capture_helper.rb +49 -12
data/lib/action_view/helpers/date_helper.rb +14 -4
data/lib/action_view/helpers/form_helper.rb +136 -20
data/lib/action_view/helpers/form_options_helper.rb +29 -7
data/lib/action_view/helpers/form_tag_helper.rb +22 -20
data/lib/action_view/helpers/java_script_macros_helper.rb +29 -9
data/lib/action_view/helpers/javascript_helper.rb +50 -446
data/lib/action_view/helpers/javascripts/controls.js +95 -30
data/lib/action_view/helpers/javascripts/dragdrop.js +161 -21
data/lib/action_view/helpers/javascripts/effects.js +310 -211
data/lib/action_view/helpers/javascripts/prototype.js +228 -28
data/lib/action_view/helpers/number_helper.rb +9 -9
data/lib/action_view/helpers/pagination_helper.rb +1 -1
data/lib/action_view/helpers/prototype_helper.rb +900 -0
data/lib/action_view/helpers/scriptaculous_helper.rb +135 -0
data/lib/action_view/helpers/text_helper.rb +7 -6
data/lib/action_view/helpers/url_helper.rb +23 -14
data/lib/action_view/partials.rb +12 -4
data/rakefile +13 -5
data/test/abstract_unit.rb +4 -3
data/test/active_record_unit.rb +88 -0
data/test/{controller → activerecord}/active_record_assertions_test.rb +7 -50
data/test/{controller → activerecord}/active_record_store_test.rb +27 -4
data/test/activerecord/pagination_test.rb +161 -0
data/test/controller/action_pack_assertions_test.rb +18 -15
data/test/controller/base_test.rb +31 -42
data/test/controller/benchmark_test.rb +8 -11
data/test/controller/capture_test.rb +33 -1
data/test/controller/cgi_test.rb +33 -0
data/test/controller/custom_handler_test.rb +8 -0
data/test/controller/fake_controllers.rb +9 -17
data/test/controller/filters_test.rb +32 -3
data/test/controller/flash_test.rb +26 -41
data/test/controller/fragment_store_setting_test.rb +1 -1
data/test/controller/layout_test.rb +73 -0
data/test/controller/mime_responds_test.rb +257 -0
data/test/controller/mime_type_test.rb +24 -0
data/test/controller/new_render_test.rb +157 -1
data/test/controller/redirect_test.rb +23 -0
data/test/controller/render_test.rb +54 -56
data/test/controller/request_test.rb +25 -0
data/test/controller/routing_test.rb +74 -66
data/test/controller/test_test.rb +66 -1
data/test/controller/verification_test.rb +3 -1
data/test/controller/webservice_test.rb +255 -0
data/test/fixtures/companies.yml +24 -0
data/test/fixtures/company.rb +9 -0
data/test/fixtures/db_definitions/sqlite.sql +42 -0
data/test/fixtures/developer.rb +7 -0
data/test/fixtures/developers.yml +21 -0
data/test/fixtures/developers_projects.yml +13 -0
data/test/fixtures/layout_tests/layouts/controller_name_space/nested.rhtml +1 -0
data/test/fixtures/layout_tests/layouts/item.rhtml +1 -0
data/test/fixtures/layout_tests/layouts/layout_test.rhtml +1 -0
data/test/fixtures/layout_tests/layouts/third_party_template_library.mab +1 -0
data/test/fixtures/layout_tests/views/hello.rhtml +1 -0
data/test/fixtures/multipart/mona_lisa.jpg +0 -0
data/test/fixtures/project.rb +3 -0
data/test/fixtures/projects.yml +7 -0
data/test/fixtures/replies.yml +13 -0
data/test/fixtures/reply.rb +5 -0
data/test/fixtures/respond_to/all_types_with_layout.rhtml +1 -0
data/test/fixtures/respond_to/all_types_with_layout.rjs +1 -0
data/test/fixtures/respond_to/layouts/standard.rhtml +1 -0
data/test/fixtures/respond_to/using_defaults.rhtml +1 -0
data/test/fixtures/respond_to/using_defaults.rjs +1 -0
data/test/fixtures/respond_to/using_defaults.rxml +1 -0
data/test/fixtures/respond_to/using_defaults_with_type_list.rhtml +1 -0
data/test/fixtures/respond_to/using_defaults_with_type_list.rjs +1 -0
data/test/fixtures/respond_to/using_defaults_with_type_list.rxml +1 -0
data/test/fixtures/test/block_content_for.rhtml +2 -0
data/test/fixtures/test/delete_with_js.rjs +2 -0
data/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml +1 -0
data/test/fixtures/test/enum_rjs_test.rjs +6 -0
data/test/fixtures/test/erb_content_for.rhtml +2 -0
data/test/fixtures/test/hello_world.rxml +3 -0
data/test/fixtures/test/hello_world_with_layout_false.rhtml +1 -0
data/test/fixtures/test/non_erb_block_content_for.rxml +4 -0
data/test/fixtures/topic.rb +3 -0
data/test/fixtures/topics.yml +22 -0
data/test/template/active_record_helper_test.rb +4 -0
data/test/template/asset_tag_helper_test.rb +7 -2
data/test/template/date_helper_test.rb +39 -2
data/test/template/form_helper_test.rb +238 -5
data/test/template/form_options_helper_test.rb +78 -0
data/test/template/form_tag_helper_test.rb +11 -0
data/test/template/java_script_macros_helper_test.rb +51 -6
data/test/template/javascript_helper_test.rb +7 -153
data/test/template/number_helper_test.rb +14 -13
data/test/template/prototype_helper_test.rb +423 -0
data/test/template/scriptaculous_helper_test.rb +90 -0
data/test/template/text_helper_test.rb +12 -9
data/test/template/url_helper_test.rb +31 -15
metadata +291 -246
data/lib/action_controller/cgi_ext/multipart_progress.rb +0 -169
data/lib/action_controller/upload_progress.rb +0 -473
data/lib/action_controller/vendor/html-scanner/html/node.rb.rej +0 -17
data/lib/action_view/helpers/upload_progress_helper.rb +0 -433
data/lib/action_view/vendor/builder.rb +0 -13
data/lib/action_view/vendor/builder/blankslate.rb +0 -53
data/lib/action_view/vendor/builder/xmlbase.rb +0 -143
data/lib/action_view/vendor/builder/xmlevents.rb +0 -63
data/lib/action_view/vendor/builder/xmlmarkup.rb +0 -308
data/test/controller/multipart_progress_testx.rb +0 -365
data/test/controller/upload_progress_testx.rb +0 -89
data/test/template/upload_progress_helper_testx.rb +0 -136

data/test/fixtures/respond_to/all_types_with_layout.rhtml ADDED

	@@ -0,0 +1 @@
1	+ HTML for all_types_with_layout

data/test/fixtures/respond_to/all_types_with_layout.rjs ADDED

	@@ -0,0 +1 @@
1	+ page << "RJS for all_types_with_layout"

data/test/fixtures/respond_to/layouts/standard.rhtml ADDED

	@@ -0,0 +1 @@
1	+ <html><%= @content_for_layout %></html>

data/test/fixtures/respond_to/using_defaults.rhtml ADDED

	@@ -0,0 +1 @@
1	+ Hello world!

data/test/fixtures/respond_to/using_defaults.rjs ADDED

	@@ -0,0 +1 @@
1	+ page[:body].visual_effect :highlight

data/test/fixtures/respond_to/using_defaults.rxml ADDED

	@@ -0,0 +1 @@
1	+ xml.p "Hello world!"

data/test/fixtures/respond_to/using_defaults_with_type_list.rhtml ADDED

	@@ -0,0 +1 @@
1	+ Hello world!

data/test/fixtures/respond_to/using_defaults_with_type_list.rjs ADDED

	@@ -0,0 +1 @@
1	+ page[:body].visual_effect :highlight

data/test/fixtures/respond_to/using_defaults_with_type_list.rxml ADDED

	@@ -0,0 +1 @@
1	+ xml.p "Hello world!"

data/test/fixtures/test/block_content_for.rhtml ADDED

	@@ -0,0 +1,2 @@
1	+ <% block_content_for :title do 'Putting stuff in the title!' end %>
2	+ Great stuff!

data/test/fixtures/test/delete_with_js.rjs ADDED

	@@ -0,0 +1,2 @@
1	+ page.remove 'person'
2	+ page.visual_effect :highlight, "project-#{@project_id}"

data/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml ADDED

	@@ -0,0 +1 @@
1	+ The secret is <%= @secret %>

data/test/fixtures/test/enum_rjs_test.rjs ADDED

@@ -0,0 +1,6 @@
+page.select('.product').each do |value|
+  page.visual_effect :highlight
+  page.visual_effect :highlight, value
+  page.sortable(value, :url => { :action => "order" })
+  page.draggable(value)
+end

data/test/fixtures/test/erb_content_for.rhtml ADDED

	@@ -0,0 +1,2 @@
1	+ <% erb_content_for :title do %>Putting stuff in the title!<% end %>
2	+ Great stuff!

data/test/fixtures/test/hello_world.rxml ADDED

@@ -0,0 +1,3 @@
+xml.html do
+  xml.p "Hello"
+end

data/test/fixtures/test/hello_world_with_layout_false.rhtml ADDED

	@@ -0,0 +1 @@
1	+ Hello world!

data/test/fixtures/test/non_erb_block_content_for.rxml ADDED

@@ -0,0 +1,4 @@
+content_for :title do
+  'Putting stuff in the title!'
+end
+xml << "\nGreat stuff!"

data/test/fixtures/topic.rb ADDED

@@ -0,0 +1,3 @@
+class Topic < ActiveRecord::Base
+  has_many :replies, :include => [:user], :dependent => true
+end

data/test/fixtures/topics.yml ADDED

@@ -0,0 +1,22 @@
+futurama:
+  id: 1
+  title: Isnt futurama awesome?
+  subtitle: It really is, isnt it.
+  content: I like futurama
+  created_at: <%= 1.day.ago.to_s(:db) %>
+  updated_at:
+harvey_birdman:
+  id: 2
+  title: Harvey Birdman is the king of all men
+  subtitle: yup
+  content: It really is
+  created_at: <%= 2.hours.ago.to_s(:db) %>
+  updated_at:
+rails:
+  id: 3
+  title: Rails is nice
+  subtitle: It makes me happy
+  content: except when I have to hack internals to fix pagination. even then really.
+  created_at: <%= 20.minutes.ago.to_s(:db) %>

data/test/template/active_record_helper_test.rb CHANGED

@@ -119,6 +119,10 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post")
     assert_equal %(<div class="errorDeathByClass" id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => "errorDeathById", :header_tag => "h1")
   end
+  def test_error_messages_for_handles_nil
+    assert_equal "", error_messages_for("notthere")
+  end
   def test_form_with_string_multipart
     assert_dom_equal(

data/test/template/asset_tag_helper_test.rb CHANGED

@@ -49,7 +49,9 @@ class AssetTagHelperTest < Test::Unit::TestCase
     %(javascript_include_tag("xmlhr")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
     %(javascript_include_tag("xmlhr", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/xmlhr.js" type="text/javascript"></script>),
     %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>),
-     %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>)
+    %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>),
+    %(javascript_include_tag(:defaults, "test")) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/test.js" type="text/javascript"></script>),
+    %(javascript_include_tag("test", :defaults)) => %(<script src="/javascripts/test.js" type="text/javascript"></script>\n<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>)
   }
   StylePathToTag = {
@@ -74,6 +76,8 @@ class AssetTagHelperTest < Test::Unit::TestCase
     %(image_tag("xml")) => %(<img alt="Xml" src="/images/xml.png" />),
     %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.png" />),
     %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
+    %(image_tag("symbolize", "size" => "45x70")) => %(<img alt="Symbolize" height="70" src="/images/symbolize.png" width="45" />),
+    %(image_tag("http://www.rubyonrails.com/images/rails")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />)
   }
   def test_auto_discovery
@@ -94,7 +98,7 @@ class AssetTagHelperTest < Test::Unit::TestCase
     ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'lib1', '/elsewhere/blub/lib2'
     assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/slider.js" type="text/javascript"></script>\n<script src="/javascripts/lib1.js" type="text/javascript"></script>\n<script src="/elsewhere/blub/lib2.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
   end
   def test_style_path
     StylePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
@@ -174,6 +178,7 @@ class AssetTagHelperNonVhostTest < Test::Unit::TestCase
     %(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/calloboration/hieraki/images/rss.png" />),
     %(image_tag("gold", :size => "45x70")) => %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />),
     %(image_tag("http://www.example.com/images/icon.gif")) => %(<img alt="Icon" src="http://www.example.com/images/icon.gif" />),
+    %(image_tag("symbolize", "size" => "45x70")) => %(<img alt="Symbolize" height="70" src="/calloboration/hieraki/images/symbolize.png" width="45" />)
   }
   def test_auto_discovery

data/test/template/date_helper_test.rb CHANGED

@@ -1,9 +1,13 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
 require File.dirname(__FILE__) + "/../abstract_unit"
 class DateHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::DateHelper
+  include ActionView::Helpers::FormHelper
+  silence_warnings do
+    Post = Struct.new("Post", :written_on, :updated_at)
+  end
   def test_distance_in_words
     from = Time.mktime(2004, 3, 6, 21, 41, 18)
@@ -497,6 +501,38 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal expected, select_date(0, :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
   end
+  def test_date_select_within_fields_for
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+    _erbout = ''
+    fields_for :post, @post do |f|
+      _erbout.concat f.date_select(:written_on)
+    end
+    expected = "<select name='post[written_on(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n" +
+    "<select name='post[written_on(2i)]'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n" +
+    "<select name='post[written_on(3i)]'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n"
+    assert_dom_equal(expected, _erbout)
+  end
+  def test_datetime_select_within_fields_for
+    @post = Post.new
+    @post.updated_at = Time.local(2004, 6, 15, 16, 35)
+    _erbout = ''
+    fields_for :post, @post do |f|
+      _erbout.concat f.datetime_select(:updated_at)
+    end
+    expected = "<select name='post[updated_at(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n<select name='post[updated_at(2i)]'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n<select name='post[updated_at(3i)]'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n &mdash; <select name='post[updated_at(4i)]'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option selected='selected' value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n</select>\n : <select name='post[updated_at(5i)]'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n<option value='32'>32</option>\n<option value='33'>33</option>\n<option value='34'>34</option>\n<option selected='selected' value='35'>35</option>\n<option value='36'>36</option>\n<option value='37'>37</option>\n<option value='38'>38</option>\n<option value='39'>39</option>\n<option value='40'>40</option>\n<option value='41'>41</option>\n<option value='42'>42</option>\n<option value='43'>43</option>\n<option value='44'>44</option>\n<option value='45'>45</option>\n<option value='46'>46</option>\n<option value='47'>47</option>\n<option value='48'>48</option>\n<option value='49'>49</option>\n<option value='50'>50</option>\n<option value='51'>51</option>\n<option value='52'>52</option>\n<option value='53'>53</option>\n<option value='54'>54</option>\n<option value='55'>55</option>\n<option value='56'>56</option>\n<option value='57'>57</option>\n<option value='58'>58</option>\n<option value='59'>59</option>\n</select>\n"
+    assert_dom_equal(expected, _erbout)
+  end
   def test_date_select_with_zero_value_and_no_start_year
     expected =  %(<select name="date[first][year]">\n)
     (Date.today.year-5).upto(Date.today.year+1) { |y| expected << %(<option value="#{y}">#{y}</option>\n) }
@@ -516,7 +552,8 @@ class DateHelperTest < Test::Unit::TestCase
   def test_date_select_with_zero_value_and_no_end_year
     expected =  %(<select name="date[first][year]">\n)
-    2003.upto(2010) { |y| expected << %(<option value="#{y}">#{y}</option>\n) }
+    last_year = Time.now.year + 5
+    2003.upto(last_year) { |y| expected << %(<option value="#{y}">#{y}</option>\n) }
     expected << "</select>\n"
     expected << %(<select name="date[first][month]">\n)

data/test/template/form_helper_test.rb CHANGED

@@ -1,10 +1,11 @@
-require 'test/unit'
-require 'erb'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_helper'
-require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/hash' #for stringify keys
+require File.dirname(__FILE__) + '/../abstract_unit'
 class FormHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
   silence_warnings do
     Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on, :cost)
@@ -27,6 +28,15 @@ class FormHelperTest < Test::Unit::TestCase
     @post.body        = "Back to the hill and over it again!"
     @post.secret      = 1
     @post.written_on  = Date.new(2004, 6, 15)
+    @controller = Class.new do
+      attr_reader :url_for_options
+      def url_for(options, *parameters_for_method_reference)
+        @url_for_options = options
+        "http://www.example.com"
+      end
+    end
+    @controller = @controller.new
   end
   def test_text_field
@@ -60,6 +70,13 @@ class FormHelperTest < Test::Unit::TestCase
     assert_dom_equal expected, text_field("post", "title", :maxlength => 35)
   end
+  def test_text_field_doesnt_change_param_values
+    object_name = 'post[]'
+    expected = '<input id="post_123_title" name="post[123][title]" size="30" type="text" value="Hello World" />'
+    assert_equal expected, text_field(object_name, "title")
+    assert_equal object_name, "post[]"
+  end
   def test_check_box
     assert_dom_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
@@ -118,7 +135,14 @@ class FormHelperTest < Test::Unit::TestCase
       text_area("post", "body")
     )
   end
+  def test_text_area_with_alternate_value
+    assert_dom_equal(
+      '<textarea cols="40" id="post_body" name="post[body]" rows="20">Testing alternate values.</textarea>',
+      text_area("post", "body", :value => 'Testing alternate values.')
+    )
+  end
   def test_date_selects
     assert_dom_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
@@ -187,4 +211,213 @@ class FormHelperTest < Test::Unit::TestCase
       radio_button("post[]", "title", "Goodbye World")
     )
   end
+  def test_form_for
+    _erbout = ''
+    form_for(:post, @post, :html => { :id => 'create-post' }) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    expected =
+      "<form action='http://www.example.com' id='create-post' method='post'>" +
+      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "</form>"
+    assert_dom_equal expected, _erbout
+  end
+  def test_form_for_without_object
+    _erbout = ''
+    form_for(:post, :html => { :id => 'create-post' }) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    expected =
+      "<form action='http://www.example.com' id='create-post' method='post'>" +
+      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "</form>"
+    assert_dom_equal expected, _erbout
+  end
+  def test_fields_for
+    _erbout = ''
+    fields_for(:post, @post) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    expected =
+      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' />"
+    assert_dom_equal expected, _erbout
+  end
+  def test_fields_for_without_object
+    _erbout = ''
+    fields_for(:post) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    expected =
+      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' />"
+    assert_dom_equal expected, _erbout
+  end
+  def test_form_builder_does_not_have_form_for_method
+    assert ! ActionView::Helpers::FormBuilder.instance_methods.include?('form_for')
+  end
+  def test_form_for_and_fields_for
+    _erbout = ''
+    form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form|
+      _erbout.concat post_form.text_field(:title)
+      _erbout.concat post_form.text_area(:body)
+      fields_for(:parent_post, @post) do |parent_fields|
+        _erbout.concat parent_fields.check_box(:secret)
+      end
+    end
+    expected =
+      "<form action='http://www.example.com' id='create-post' method='post'>" +
+      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />" +
+      "<input name='parent_post[secret]' type='hidden' value='0' />" +
+      "</form>"
+    assert_dom_equal expected, _erbout
+  end
+  class LabelledFormBuilder < ActionView::Helpers::FormBuilder
+    (field_helpers - %w(hidden_field)).each do |selector|
+      src = <<-END_SRC
+        def #{selector}(field, *args, &proc)
+          "<label for='\#{field}'>\#{field.to_s.humanize}:</label> " + super + "<br/>"
+        end
+      END_SRC
+      class_eval src, __FILE__, __LINE__
+    end
+  end
+  def test_form_for_with_labelled_builder
+    _erbout = ''
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    expected =
+      "<form action='http://www.example.com' method='post'>" +
+      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+      "</form>"
+    assert_dom_equal expected, _erbout
+  end
+  # Perhaps this test should be moved to prototype helper tests.
+  def test_remote_form_for_with_labelled_builder
+    self.extend ActionView::Helpers::PrototypeHelper
+     _erbout = ''
+     remote_form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+       _erbout.concat f.text_field(:title)
+       _erbout.concat f.text_area(:body)
+       _erbout.concat f.check_box(:secret)
+     end
+     expected =
+       %(<form action="http://www.example.com" onsubmit="new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" method="post">) +
+       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
+       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
+       "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+       "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+       "</form>"
+     assert_dom_equal expected, _erbout
+  end
+  def test_fields_for_with_labelled_builder
+    _erbout = ''
+    fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+    expected =
+      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
+      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
+      "<input name='post[secret]' type='hidden' value='0' /><br/>"
+    assert_dom_equal expected, _erbout
+  end
+  def test_form_for_with_html_options_adds_options_to_form_tag
+    _erbout = ''
+    form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
+    expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\"></form>"
+    assert_dom_equal expected, _erbout
+  end
+  def test_form_for_with_string_url_option
+    _erbout = ''
+    form_for(:post, @post, :url => 'http://www.otherdomain.com') do |f| end
+    assert_equal 'http://www.otherdomain.com', @controller.url_for_options
+  end
+  def test_form_for_with_hash_url_option
+    _erbout = ''
+    form_for(:post, @post, :url => {:controller => 'controller', :action => 'action'}) do |f| end
+    assert_equal 'controller', @controller.url_for_options[:controller]
+    assert_equal 'action', @controller.url_for_options[:action]
+  end
+  def test_remote_form_for_with_html_options_adds_options_to_form_tag
+    self.extend ActionView::Helpers::PrototypeHelper
+    _erbout = ''
+    remote_form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
+    expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\" onsubmit=\"new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"></form>"
+    assert_dom_equal expected, _erbout
+  end
 end