actionpack 1.13.6 → 2.0.0

data/lib/action_view/partials.rb

@@ -1,13 +1,13 @@
 module ActionView
-  # There's also a convenience method for rendering sub templates within the current controller that depends on a single object 
-  # (we call this kind of sub templates for partials). It relies on the fact that partials should follow the naming convention of being 
-  # prefixed with an underscore -- as to separate them from regular templates that could be rendered on their own. 
+  # There's also a convenience method for rendering sub templates within the current controller that depends on a single object
+  # (we call this kind of sub templates for partials). It relies on the fact that partials should follow the naming convention of being
+  # prefixed with an underscore -- as to separate them from regular templates that could be rendered on their own.
   #
   # In a template for Advertiser#account:
   #
   #  <%= render :partial => "account" %>
   #
-  # This would render "advertiser/_account.rhtml" and pass the instance variable @account in as a local variable +account+ to 
+  # This would render "advertiser/_account.erb" and pass the instance variable @account in as a local variable +account+ to
   # the template for display.
   #
   # In another template for Advertiser#buy, we could have:
@@ -18,8 +18,8 @@ module ActionView
   #     <%= render :partial => "ad", :locals => { :ad => ad } %>
   #   <% end %>
   #
-  # This would first render "advertiser/_account.rhtml" with @buyer passed in as the local variable +account+, then render 
-  # "advertiser/_ad.rhtml" and pass the local variable +ad+ to the template for display.
+  # This would first render "advertiser/_account.erb" with @buyer passed in as the local variable +account+, then render
+  # "advertiser/_ad.erb" and pass the local variable +ad+ to the template for display.
   #
   # == Rendering a collection of partials
   #
@@ -30,62 +30,131 @@ module ActionView
   #
   #   <%= render :partial => "ad", :collection => @advertisements %>
   #
-  # This will render "advertiser/_ad.rhtml" and pass the local variable +ad+ to the template for display. An iteration counter
-  # will automatically be made available to the template with a name of the form +partial_name_counter+. In the case of the 
+  # This will render "advertiser/_ad.erb" and pass the local variable +ad+ to the template for display. An iteration counter
+  # will automatically be made available to the template with a name of the form +partial_name_counter+. In the case of the
   # example above, the template would be fed +ad_counter+.
   #
   # NOTE: Due to backwards compatibility concerns, the collection can't be one of hashes. Normally you'd also just keep domain objects,
   # like Active Records, in there.
-  # 
+  #
   # == Rendering shared partials
   #
   # Two controllers can share a set of partials and render them like this:
   #
   #   <%= render :partial => "advertisement/ad", :locals => { :ad => @advertisement } %>
   #
-  # This will render the partial "advertisement/_ad.rhtml" regardless of which controller this is being called from.
+  # This will render the partial "advertisement/_ad.erb" regardless of which controller this is being called from.
+  #
+  # == Rendering partials with layouts
+  #
+  # Partials can have their own layouts applied to them. These layouts are different than the ones that are specified globally
+  # for the entire action, but they work in a similar fashion. Imagine a list with two types of users:
+  #
+  #   <%# app/views/users/index.html.erb &>
+  #   Here's the administrator:
+  #   <%= render :partial => "user", :layout => "administrator", :locals => { :user => administrator } %>
+  #
+  #   Here's the editor:
+  #   <%= render :partial => "user", :layout => "editor", :locals => { :user => editor } %>
+  #
+  #   <%# app/views/users/_user.html.erb &>
+  #   Name: <%= user.name %>
+  #
+  #   <%# app/views/users/_administrator.html.erb &>
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     <%= yield %>
+  #   </div>
+  #
+  #   <%# app/views/users/_editor.html.erb &>
+  #   <div id="editor">
+  #     Deadline: $<%= user.deadline %>
+  #     <%= yield %>
+  #   </div>
+  #
+  # ...this will return:
+  #
+  #   Here's the administrator:
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     Name: <%= user.name %>
+  #   </div>
+  #
+  #   Here's the editor:
+  #   <div id="editor">
+  #     Deadline: $<%= user.deadline %>
+  #     Name: <%= user.name %>
+  #   </div>
+  #
+  # You can also apply a layout to a block within any template:
+  #
+  #   <%# app/views/users/_chief.html.erb &>
+  #   <% render(:layout => "administrator", :locals => { :user => chief }) do %>
+  #     Title: <%= chief.title %>
+  #   <% end %>
+  #
+  # ...this will return:
+  #
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     Title: <%= chief.name %>
+  #   </div>
+  #
+  # As you can see, the :locals hash is shared between both the partial and its layout.
   module Partials
-    # Deprecated, use render :partial
-    def render_partial(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
-      path, partial_name = partial_pieces(partial_path)
-      object = extracting_object(partial_name, local_assigns, deprecated_local_assigns)
-      local_assigns = extract_local_assigns(local_assigns, deprecated_local_assigns)
-      local_assigns = local_assigns ? local_assigns.clone : {}
-      add_counter_to_local_assigns!(partial_name, local_assigns)
-      add_object_to_local_assigns!(partial_name, local_assigns, object)
+    private
+      def render_partial(partial_path, object_assigns = nil, local_assigns = nil) #:nodoc:
+        case partial_path
+        when String, Symbol, NilClass
+          path, partial_name = partial_pieces(partial_path)
+          object = extracting_object(partial_name, object_assigns)
+          local_assigns = local_assigns ? local_assigns.clone : {}
+          add_counter_to_local_assigns!(partial_name, local_assigns)
+          add_object_to_local_assigns!(partial_name, local_assigns, object)
 
-      if logger
-        ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do
-          render("#{path}/_#{partial_name}", local_assigns)
+          if logger && logger.debug?
+            ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do
+              render("#{path}/_#{partial_name}", local_assigns)
+            end
+          else
+            render("#{path}/_#{partial_name}", local_assigns)
+          end
+        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Associations::HasManyThroughAssociation
+          if partial_path.any?
+            path       = ActionController::RecordIdentifier.partial_path(partial_path.first)
+            collection = partial_path
+            render_partial_collection(path, collection, nil, object_assigns.value)
+          else
+            ""
+          end
+        else
+          render_partial(
+            ActionController::RecordIdentifier.partial_path(partial_path),
+            object_assigns, local_assigns)
         end
-      else
-        render("#{path}/_#{partial_name}", local_assigns)
       end
-    end
 
-    # Deprecated, use render :partial, :collection
-    def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = nil) #:nodoc:
-      collection_of_partials = Array.new
-      counter_name = partial_counter_name(partial_name)
-      local_assigns = local_assigns ? local_assigns.clone : {}
-      collection.each_with_index do |element, counter|
-        local_assigns[counter_name] = counter
-        collection_of_partials.push(render_partial(partial_name, element, local_assigns))
-      end
+      def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = nil) #:nodoc:
+        collection_of_partials = Array.new
+        counter_name = partial_counter_name(partial_name)
+        local_assigns = local_assigns ? local_assigns.clone : {}
+        collection.each_with_index do |element, counter|
+          local_assigns[counter_name] = counter
+          collection_of_partials.push(render_partial(partial_name, element, local_assigns))
+        end
 
-      return " " if collection_of_partials.empty?
+        return " " if collection_of_partials.empty?
 
-      if partial_spacer_template
-        spacer_path, spacer_name = partial_pieces(partial_spacer_template)
-        collection_of_partials.join(render("#{spacer_path}/_#{spacer_name}"))
-      else
-        collection_of_partials.join
+        if partial_spacer_template
+          spacer_path, spacer_name = partial_pieces(partial_spacer_template)
+          collection_of_partials.join(render("#{spacer_path}/_#{spacer_name}"))
+        else
+          collection_of_partials.join
+        end
       end
-    end
-    
-    alias_method :render_collection_of_partials, :render_partial_collection
-    
-    private
+
+      alias_method :render_collection_of_partials, :render_partial_collection
+
       def partial_pieces(partial_path)
         if partial_path.include?('/')
           return File.dirname(partial_path), File.basename(partial_path)
@@ -95,34 +164,37 @@ module ActionView
       end
 
       def partial_counter_name(partial_name)
-        "#{partial_name.split('/').last}_counter".intern
+        "#{partial_variable_name(partial_name)}_counter".intern
       end
-      
-      def extracting_object(partial_name, local_assigns, deprecated_local_assigns)
-        if local_assigns.is_a?(Hash) || local_assigns.nil?
-          controller.instance_variable_get("@#{partial_name}")
+
+      def partial_variable_name(partial_name)
+        partial_name.split('/').last.split('.').first.intern
+      end
+
+      def extracting_object(partial_name, object_assigns)
+        variable_name = partial_variable_name(partial_name)
+        if object_assigns.nil?
+          controller.instance_variable_get("@#{variable_name}")
         else
-          # deprecated form where object could be passed in as second parameter
-          local_assigns
+          object_assigns
         end
       end
-      
-      def extract_local_assigns(local_assigns, deprecated_local_assigns)
-        local_assigns.is_a?(Hash) ? local_assigns : deprecated_local_assigns
-      end
-      
+
       def add_counter_to_local_assigns!(partial_name, local_assigns)
         counter_name = partial_counter_name(partial_name)
         local_assigns[counter_name] = 1 unless local_assigns.has_key?(counter_name)
       end
 
       def add_object_to_local_assigns!(partial_name, local_assigns, object)
-        local_assigns[partial_name.intern] ||=
-          if object.is_a?(ActionView::Base::ObjectWrapper)
-            object.value
-          else
-            object
-          end || controller.instance_variable_get("@#{partial_name}")
+        variable_name = partial_variable_name(partial_name)
+
+        local_assigns[:object] ||=
+          local_assigns[variable_name] ||=
+            if object.is_a?(ActionView::Base::ObjectWrapper)
+              object.value
+            else
+              object
+            end || controller.instance_variable_get("@#{variable_name}")
       end
   end
 end

data/lib/action_view/template_error.rb

@@ -10,8 +10,6 @@ module ActionView
       @base_path, @assigns, @source, @original_exception =
         base_path, assigns.dup, source, original_exception
       @file_path = file_path
-
-      remove_deprecated_assigns!
     end
 
     def message
@@ -82,16 +80,10 @@ module ActionView
     end
 
     private
-      def remove_deprecated_assigns!
-        ActionController::Base::DEPRECATED_INSTANCE_VARIABLES.each do |ivar|
-          @assigns.delete(ivar)
-        end
-      end
-
       def strip_base_path(path)
-        File.expand_path(path).
-          gsub(/^#{Regexp.escape File.expand_path(RAILS_ROOT)}/, '').
-          gsub(@base_path, "")
+        stripped_path = File.expand_path(path).gsub(@base_path, "")
+        stripped_path.gsub!(/^#{Regexp.escape File.expand_path(RAILS_ROOT)}/, '') if defined?(RAILS_ROOT)
+        stripped_path
       end
 
       def source_location
@@ -106,5 +98,5 @@ end
 
 if defined?(Exception::TraceSubstitutions)
   Exception::TraceSubstitutions << [/:in\s+`_run_(html|xml).*'\s*$/, '']
-  Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}}, '#{RAILS_ROOT}'] if defined?(RAILS_ROOT)
+  Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}/}, ''] if defined?(RAILS_ROOT)
 end

data/lib/actionpack.rb

@@ -0,0 +1 @@
+require 'action_pack'

data/test/abstract_unit.rb

@@ -3,14 +3,34 @@ $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib/active_support')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 
 require 'yaml'
+require 'stringio'
 require 'test/unit'
 require 'action_controller'
-require 'breakpoint'
+require 'action_controller/cgi_ext'
 require 'action_controller/test_process'
 
+begin
+  require 'ruby-debug'
+rescue LoadError
+  # Debugging disabled. `gem install ruby-debug` to enable.
+end
+
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
 ActionController::Base.logger = nil
 ActionController::Base.ignore_missing_templates = false
 ActionController::Routing::Routes.reload rescue nil
+
+
+# Wrap tests that use Mocha and skip if unavailable.
+def uses_mocha(test_name)
+  unless Object.const_defined?(:Mocha)
+    require 'mocha'
+    require 'stubba'
+  end
+  yield
+rescue LoadError => load_error
+  raise unless load_error.message =~ /mocha/i
+  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
+end

data/test/action_view_test.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+require 'test/unit'
+
+class ActionViewTests < Test::Unit::TestCase
+  def test_find_template_extension_from_first_render
+    base = ActionView::Base.new
+
+    assert_nil base.send(:find_template_extension_from_first_render)
+
+    {
+      nil => nil,
+      '' => nil,
+      'foo' => nil,
+      '/foo' => nil,
+      'foo.rb' => 'rb',
+      'foo.bar.rb' => 'bar.rb',
+      'baz/foo.rb' => 'rb',
+      'baz/foo.bar.rb' => 'bar.rb',
+      'baz/foo.o/foo.rb' => 'rb',
+      'baz/foo.o/foo.bar.rb' => 'bar.rb',
+    }.each do |input,expectation|
+      base.instance_variable_set('@first_render', input)
+      assert_equal expectation, base.send(:find_template_extension_from_first_render)
+    end
+  end
+end

data/test/active_record_unit.rb

@@ -51,22 +51,23 @@ class ActiveRecordTestConnector
 
     def setup_connection
       if Object.const_defined?(:ActiveRecord)
+        defaults = { :database => ':memory:' }
         begin
-          connection_options = {:adapter => 'sqlite3', :dbfile => ':memory:'}
-          ActiveRecord::Base.establish_connection(connection_options)
-          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => connection_options } 
+          options = defaults.merge :adapter => 'sqlite3', :timeout => 500
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
           ActiveRecord::Base.connection
         rescue Exception  # errors from establishing a connection
-          $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
-          connection_options = {:adapter => 'sqlite', :dbfile => ':memory:'}
-          ActiveRecord::Base.establish_connection(connection_options)
-          ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => connection_options } 
+          $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
+          options = defaults.merge :adapter => 'sqlite'
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => options }
           ActiveRecord::Base.connection
         end
 
         Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
       else
-        raise "Couldn't locate ActiveRecord."
+        raise "Can't setup connection since ActiveRecord isn't loaded."
       end
     end
 
@@ -83,7 +84,7 @@ class ActiveRecordTestConnector
   end
 end
 
-# Test case for inheiritance
+# Test case for inheritance
 class ActiveRecordTestCase < Test::Unit::TestCase
   # Set our fixture path
   if ActiveRecordTestConnector.able_to_connect
@@ -95,22 +96,13 @@ class ActiveRecordTestCase < Test::Unit::TestCase
     super if ActiveRecordTestConnector.connected
   end
 
-  def setup
-    abort_tests unless ActiveRecordTestConnector.connected
+  def run(*args)
+    super if ActiveRecordTestConnector.connected
   end
 
   # Default so Test::Unit::TestCase doesn't complain
   def test_truth
   end
-
-  private
-    # If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
-    def abort_tests
-      $stderr.puts 'No Active Record connection, aborting tests.'
-      self.class.public_instance_methods.grep(/^test./).each do |method|
-        self.class.class_eval { define_method(method.to_sym){} }
-      end
-    end
 end
 
 ActiveRecordTestConnector.setup

data/test/activerecord/active_record_store_test.rb

@@ -53,7 +53,7 @@ class ActiveRecordStoreTest < ActiveRecordTestCase
     @new_session['foo'] = 'bar'
   end
 
-# this test only applies for eager sesssion saving
+# this test only applies for eager session saving
 #  def test_another_instance
 #    @another = CGI::Session.new(@cgi, 'session_id' => @new_session.session_id, 'database_manager' => CGI::Session::ActiveRecordStore)
 #    assert_equal @new_session.session_id, @another.session_id
@@ -128,7 +128,7 @@ end
 
 class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest
   def session_class
-    unless @session_class
+    unless defined? @session_class
       @session_class = CGI::Session::ActiveRecordStore::SqlBypass
       @session_class.connection = CGI::Session::ActiveRecordStore::Session.connection
     end

data/test/activerecord/render_partial_with_record_identification_test.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/../active_record_unit'
+
+class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
+  fixtures :developers, :projects, :developers_projects, :topics, :replies
+
+  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
+  
+  def setup
+    @controller = RenderPartialWithRecordIdentificationController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    super
+  end
+
+  def test_rendering_partial_with_has_many_and_belongs_to_association
+    get :render_with_has_many_and_belongs_to_association
+    assert_template 'projects/_project'
+  end
+  
+  def test_rendering_partial_with_has_many_association
+    get :render_with_has_many_association
+    assert_template 'replies/_reply'
+  end
+  
+  def test_rendering_partial_with_has_many_association
+    get :render_with_has_many_through_association
+    assert_template 'topics/_topic'
+  end
+  
+  def test_rendering_partial_with_belongs_to_association
+    get :render_with_belongs_to_association
+    assert_template 'topics/_topic'
+  end
+  
+  def test_render_with_record
+    get :render_with_record
+    assert_template 'developers/_developer'
+  end
+  
+  def test_render_with_record_collection
+    get :render_with_record_collection
+    assert_template 'developers/_developer'
+  end
+end