fix merge conflict with actionpack changelog

6 files changed, 257 insertions, 51 deletions

diff --git a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
index 32b26206c3..ed10e72953 100644
--- a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
+++ b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
@@ -1,49 +1,49 @@
 require 'active_record_unit'
 
-class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
-  fixtures :developers, :projects, :developers_projects, :topics, :replies, :companies, :mascots
+class RenderPartialWithRecordIdentificationController < ActionController::Base
+  def render_with_has_many_and_belongs_to_association
+    @developer = Developer.find(1)
+    render :partial => @developer.projects
+  end
 
-  class RenderPartialWithRecordIdentificationController < ActionController::Base
-    def render_with_has_many_and_belongs_to_association
-      @developer = Developer.find(1)
-      render :partial => @developer.projects
-    end
-    
-    def render_with_has_many_association
-      @topic = Topic.find(1)
-      render :partial => @topic.replies
-    end
-    
-    def render_with_named_scope
-      render :partial => Reply.base
-    end
-    
-    def render_with_has_many_through_association
-      @developer = Developer.find(:first)
-      render :partial => @developer.topics
-    end
-    
-    def render_with_has_one_association
-      @company = Company.find(1)
-      render :partial => @company.mascot
-    end
-    
-    def render_with_belongs_to_association
-      @reply = Reply.find(1)
-      render :partial => @reply.topic
-    end
-    
-    def render_with_record
-      @developer = Developer.find(:first)
-      render :partial => @developer
-    end
-    
-    def render_with_record_collection
-      @developers = Developer.find(:all)
-      render :partial => @developers
-    end
+  def render_with_has_many_association
+    @topic = Topic.find(1)
+    render :partial => @topic.replies
+  end
+
+  def render_with_named_scope
+    render :partial => Reply.base
+  end
+
+  def render_with_has_many_through_association
+    @developer = Developer.find(:first)
+    render :partial => @developer.topics
+  end
+
+  def render_with_has_one_association
+    @company = Company.find(1)
+    render :partial => @company.mascot
+  end
+
+  def render_with_belongs_to_association
+    @reply = Reply.find(1)
+    render :partial => @reply.topic
   end
-  RenderPartialWithRecordIdentificationController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
+
+  def render_with_record
+    @developer = Developer.find(:first)
+    render :partial => @developer
+  end
+
+  def render_with_record_collection
+    @developers = Developer.find(:all)
+    render :partial => @developers
+  end
+end
+RenderPartialWithRecordIdentificationController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
+
+class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
+  fixtures :developers, :projects, :developers_projects, :topics, :replies, :companies, :mascots
   
   def setup
     @controller = RenderPartialWithRecordIdentificationController.new
@@ -84,3 +84,108 @@ class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
     assert_equal mascot.name, @response.body
   end
 end
+
+class RenderPartialWithRecordIdentificationController < ActionController::Base
+  def render_with_has_many_and_belongs_to_association
+    @developer = Developer.find(1)
+    render :partial => @developer.projects
+  end
+
+  def render_with_has_many_association
+    @topic = Topic.find(1)
+    render :partial => @topic.replies
+  end
+
+  def render_with_has_many_through_association
+    @developer = Developer.find(:first)
+    render :partial => @developer.topics
+  end
+
+  def render_with_belongs_to_association
+    @reply = Reply.find(1)
+    render :partial => @reply.topic
+  end
+
+  def render_with_record
+    @developer = Developer.find(:first)
+    render :partial => @developer
+  end
+
+  def render_with_record_collection
+    @developers = Developer.find(:all)
+    render :partial => @developers
+  end
+end
+RenderPartialWithRecordIdentificationController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
+
+class Game < Struct.new(:name, :id)
+  def to_param
+    id.to_s
+  end
+end
+
+module Fun
+  class NestedController < ActionController::Base
+    def render_with_record_in_nested_controller
+      render :partial => Game.new("Pong")
+    end
+
+    def render_with_record_collection_in_nested_controller
+      render :partial => [ Game.new("Pong"), Game.new("Tank") ]
+    end
+  end
+  NestedController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
+
+  module Serious
+    class NestedDeeperController < ActionController::Base
+      def render_with_record_in_deeper_nested_controller
+        render :partial => Game.new("Chess")
+      end
+
+      def render_with_record_collection_in_deeper_nested_controller
+        render :partial => [ Game.new("Chess"), Game.new("Sudoku"), Game.new("Solitaire") ]
+      end
+    end
+    NestedDeeperController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
+  end
+end
+
+class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveRecordTestCase
+  def setup
+    @controller = Fun::NestedController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    super
+  end
+
+  def test_render_with_record_in_nested_controller
+    get :render_with_record_in_nested_controller
+    assert_template 'fun/games/_game'
+  end
+
+  def test_render_with_record_collection_in_nested_controller
+    get :render_with_record_collection_in_nested_controller
+    assert_template 'fun/games/_game'
+  end
+
+end
+
+class RenderPartialWithRecordIdentificationAndNestedDeeperControllersTest < ActiveRecordTestCase
+  def setup
+    @controller = Fun::Serious::NestedDeeperController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    super
+  end
+
+  def test_render_with_record_in_deeper_nested_controller
+    get :render_with_record_in_deeper_nested_controller
+    assert_template 'fun/serious/games/_game'
+  end
+
+  def test_render_with_record_collection_in_deeper_nested_controller
+    get :render_with_record_collection_in_deeper_nested_controller
+    assert_template 'fun/serious/games/_game'
+  end
+
+end
\ No newline at end of file
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 8e39057f55..6e2c6d90c6 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -246,6 +246,10 @@ class NewRenderTestController < ActionController::Base
   def accessing_logger_in_template
     render :inline =>  "<%= logger.class %>"
   end
+  
+  def accessing_action_name_in_template
+    render :inline =>  "<%= action_name %>"
+  end
 
   def accessing_params_in_template_with_layout
     render :layout => nil, :inline =>  "Hello: <%= params[:name] %>"
@@ -545,6 +549,11 @@ class NewRenderTest < Test::Unit::TestCase
     get :accessing_logger_in_template
     assert_equal "Logger", @response.body
   end
+  
+  def test_access_to_action_name_in_view
+    get :accessing_action_name_in_template
+    assert_equal "accessing_action_name_in_template", @response.body
+  end
 
   def test_render_xml
     get :render_xml_hello
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb
index def8613215..12c1eaea69 100644
--- a/actionpack/test/controller/record_identifier_test.rb
+++ b/actionpack/test/controller/record_identifier_test.rb
@@ -57,6 +57,18 @@ class RecordIdentifierTest < Test::Unit::TestCase
     assert_equal expected, partial_path(Comment)
   end
 
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
+
   def test_dom_class
     assert_equal @singular, dom_class(@record)
   end
@@ -100,4 +112,28 @@ class NestedRecordIdentifierTest < RecordIdentifierTest
     assert_equal expected, partial_path(@record)
     assert_equal expected, partial_path(Comment::Nested)
   end
+
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_deeper_namespaced_controller_path
+    expected = "deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "deeper/admin/posts")
+  end
+
+  def test_partial_path_with_even_deeper_namespaced_controller_path
+    expected = "even/more/deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "even/more/deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "even/more/deeper/admin/posts")
+  end
+
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
 end
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index b138cee29f..0d089d0f23 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -226,6 +226,28 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_member_when_changed_default_restful_actions_and_path_names_not_specified
+    default_path_names = ActionController::Base.resources_path_names
+    ActionController::Base.resources_path_names = {:new => 'nuevo', :edit => 'editar'}
+
+    with_restful_routing :messages do
+      new_options = { :action => 'new', :controller => 'messages' }
+      new_path = "/messages/nuevo"
+      edit_options = { :action => 'edit', :id => '1', :controller => 'messages' }
+      edit_path = "/messages/1/editar"
+
+      assert_restful_routes_for :messages do |options|
+        assert_recognizes(options.merge(new_options), :path => new_path, :method => :get)
+      end
+
+      assert_restful_routes_for :messages do |options|
+        assert_recognizes(options.merge(edit_options), :path => edit_path, :method => :get)
+      end
+    end
+  ensure
+    ActionController::Base.resources_path_names = default_path_names
+  end
+
   def test_with_two_member_actions_with_same_method
     [:put, :post].each do |method|
       with_restful_routing :messages, :member => { :mark => method, :unmark => method } do
@@ -691,11 +713,11 @@ class ResourcesTest < Test::Unit::TestCase
       options[:options] ||= {}
       options[:options][:controller] = options[:controller] || controller_name.to_s
 
-      new_action    = "new"
-      edit_action   = "edit"
+      new_action    = ActionController::Base.resources_path_names[:new] || "new"
+      edit_action   = ActionController::Base.resources_path_names[:edit] || "edit"
       if options[:path_names]
-        new_action  = options[:path_names][:new]  || "new"
-        edit_action = options[:path_names][:edit] || "edit"
+        new_action  = options[:path_names][:new] if options[:path_names][:new]
+        edit_action = options[:path_names][:edit] if options[:path_names][:edit]
       end
 
       collection_path            = "/#{options[:path_prefix]}#{options[:as] || controller_name}"
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 640afd58f8..b28f7bcdff 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -25,7 +25,7 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
     ActionController::Routing.use_controllers! ['controller']
     @set = ActionController::Routing::RouteSet.new
     @set.draw do |map|
-      map.connect ':controller/:action/:variable'
+      map.connect ':controller/:action/:variable/*additional'
     end
 
     safe, unsafe = %w(: @ & = + $ , ;), %w(^ / ? # [ ])
@@ -36,17 +36,19 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   end
 
   def test_route_generation_escapes_unsafe_path_characters
-    assert_equal "/contr#{@segment}oller/act#{@escaped}ion/var#{@escaped}iable",
+    assert_equal "/contr#{@segment}oller/act#{@escaped}ion/var#{@escaped}iable/add#{@escaped}itional-1/add#{@escaped}itional-2",
       @set.generate(:controller => "contr#{@segment}oller",
                     :action => "act#{@segment}ion",
-                    :variable => "var#{@segment}iable")
+                    :variable => "var#{@segment}iable",
+                    :additional => ["add#{@segment}itional-1", "add#{@segment}itional-2"])
   end
 
   def test_route_recognition_unescapes_path_components
     options = { :controller => "controller",
                 :action => "act#{@segment}ion",
-                :variable => "var#{@segment}iable" }
-    assert_equal options, @set.recognize_path("/controller/act#{@escaped}ion/var#{@escaped}iable")
+                :variable => "var#{@segment}iable",
+                :additional => ["add#{@segment}itional-1", "add#{@segment}itional-2"] }
+    assert_equal options, @set.recognize_path("/controller/act#{@escaped}ion/var#{@escaped}iable/add#{@escaped}itional-1/add#{@escaped}itional-2")
   end
 end
 
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 2373600bfe..ae83c7bf47 100755
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -950,6 +950,15 @@ class DateHelperTest < ActionView::TestCase
       expects(:select_minute).with(time, anything, anything).returns('')
       select_time
     end
+    
+    def test_select_date_uses_date_current_as_default
+      date = stub(:year => 2004, :month => 6, :day => 15)
+      Date.expects(:current).returns date
+      expects(:select_year).with(date, anything, anything).returns('')
+      expects(:select_month).with(date, anything, anything).returns('')
+      expects(:select_day).with(date, anything, anything).returns('')
+      select_date
+    end
   end
 
   def test_date_select
@@ -1699,4 +1708,27 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", {}, :class => 'selector')
   end
 
+  uses_mocha 'TestInstanceTagDefaultTimeFromOptions' do
+    def test_instance_tag_default_time_from_options_uses_time_current_as_default_when_hash_passed_as_arg
+      dummy_instance_tag = ActionView::Helpers::InstanceTag.new(1,2,3)
+      Time.expects(:current).returns Time.now
+      dummy_instance_tag.send!(:default_time_from_options, :hour => 2)
+    end
+
+    def test_instance_tag_default_time_from_options_respects_hash_arg_settings_when_time_falls_in_system_local_dst_spring_gap
+      with_env_tz('US/Central') do
+        dummy_instance_tag = ActionView::Helpers::InstanceTag.new(1,2,3)
+        Time.stubs(:now).returns Time.local(2006, 4, 2, 1)
+        assert_equal 2, dummy_instance_tag.send!(:default_time_from_options, :hour => 2).hour
+      end
+    end
+  end
+  
+  protected
+    def with_env_tz(new_tz = 'US/Eastern')
+      old_tz, ENV['TZ'] = ENV['TZ'], new_tz
+      yield
+    ensure
+      old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
+    end  
 end