actionpack 3.0.1 → 3.0.2

data/lib/action_view/render/partials.rb

@@ -26,6 +26,36 @@ module ActionView
   # 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.
   #
+  # == The :as and :object options
+  #
+  # By default PartialRenderer uses the template name for the local name of the object passed into the template.
+  # These examples are effectively the same:
+  #
+  #   <%= render :partial => "contract", :locals => { :contract  => @contract } %>
+  #
+  #   <%= render :partial => "contract" %>
+  #
+  # By specifying the :as option we can change the way the local variable is namedin the template.
+  # These examples are effectively the same:
+  #
+  #   <%= render :partial => "contract", :as => :agreement
+  #
+  #   <%= render :partial => "contract", :locals => { :agreement => @contract }
+  #
+  # The :object option can be used to directly specify which object is rendered into the partial.
+  #
+  # Revisiting a previous example we could have written this code.
+  #
+  #   <%= render :partial => "account", :object => @buyer %>
+  #
+  #   <% for ad in @advertisements %>
+  #     <%= render :partial => "ad", :object => ad %>
+  #   <% end %>
+  #
+  # The :object and :as options can be used together. We might have a partial which we have named genericly,
+  # such as 'form'. Using :object and :as together helps us.
+  #
+  #   <%= render :partial => "form", :object => @contract, :as => :contract %>
   # == Rendering a collection of partials
   #
   # The example of partial use describes a familiar pattern where a template needs to iterate over an array and
@@ -39,6 +69,13 @@ module ActionView
   # 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+.
   #
+  # The :as option may be used when rendering partials.
+  #
+  # Also, you can specify a partial which will be render as a spacer between each element by passing partial name to
+  # +:spacer_template+. The following example will render "advertiser/_ad_divider.erb" between each ad partial.
+  #
+  #   <%= render :partial => "ad", :collection => @advertisements, :spacer_template => "ad_divider" %>
+  #
   # 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.
   #
@@ -200,7 +237,7 @@ module ActionView
         else
           @object = partial
 
-          if @collection = collection
+          if @collection = collection_from_object || collection
             paths = @collection_paths = @collection.map { |o| partial_path(o) }
             @path = paths.uniq.size == 1 ? paths.first : nil
           else
@@ -218,13 +255,15 @@ module ActionView
             render_collection
           end
         else
+          block, options, locals = @block, @options, @locals
+
           content = ActiveSupport::Notifications.instrument("render_partial.action_view",
             :identifier => identifier) do
             render_partial
           end
 
-          if !@block && (layout = @options[:layout])
-            content = @view._render_layout(find_template(layout), @locals){ content }
+          if !block && (layout = options[:layout])
+            content = @view._render_layout(find_template(layout), locals){ content }
           end
 
           content
@@ -286,23 +325,28 @@ module ActionView
       end
 
       def render_partial(object = @object)
-        locals, view, template = @locals, @view, @template
+        locals, view, template, block = @locals, @view, @template, @block
 
         object ||= locals[template.variable_name]
         locals[@options[:as] || template.variable_name] = object
 
         template.render(view, locals) do |*name|
-          view._layout_for(*name, &@block)
+          view._layout_for(*name, &block)
         end
       end
 
     private
 
       def collection
+        if @options.key?(:collection)
+          collection = @options[:collection]
+          collection.respond_to?(:to_ary) ? collection.to_ary : []
+        end
+      end
+
+      def collection_from_object
         if @object.respond_to?(:to_ary)
-          @object
-        elsif @options.key?(:collection)
-          @options[:collection] || []
+          @object.to_ary
         end
       end
 

data/lib/action_view/render/rendering.rb

@@ -17,7 +17,7 @@ module ActionView
       case options
       when Hash
         if block_given?
-          _render_partial(options.merge(:partial => options[:layout]), &block)
+          _render_partial(options.merge(:partial => options.delete(:layout)), &block)
         elsif options.key?(:partial)
           _render_partial(options)
         else

data/lib/action_view/template/handlers/erb.rb

@@ -14,6 +14,7 @@ module ActionView
       super(value.to_s)
     end
     alias :append= :<<
+    alias :safe_append= :safe_concat
 
     def append_if_string=(value)
       if value.is_a?(String) && !value.is_a?(NonConcattingString)
@@ -54,7 +55,11 @@ module ActionView
         end
 
         def add_expr_escaped(src, code)
-          src << '@output_buffer.append= ' << escaped_expr(code) << ';'
+          if code =~ BLOCK_EXPR
+            src << "@output_buffer.safe_append= " << code
+          else
+            src << "@output_buffer.safe_concat((" << code << ").to_s);"
+          end
         end
 
         def add_postamble(src)

data/lib/action_view/test_case.rb

@@ -74,6 +74,11 @@ module ActionView
           @helper_class ||= determine_default_helper_class(name)
         end
 
+        def new(*)
+          include_helper_modules!
+          super
+        end
+
       private
 
         def include_helper_modules!
@@ -89,7 +94,6 @@ module ActionView
         @output_buffer = ActiveSupport::SafeBuffer.new
         @rendered = ''
 
-        self.class.send(:include_helper_modules!)
         make_test_case_available_to_view!
         say_no_to_protect_against_forgery!
       end
@@ -99,7 +103,7 @@ module ActionView
       end
 
       def render(options = {}, local_assigns = {}, &block)
-        view.assign(_assigns)
+        view.assign(view_assigns)
         @rendered << output = view.render(options, local_assigns, &block)
         output
       end
@@ -162,15 +166,19 @@ module ActionView
 
       alias_method :_view, :view
 
-      EXCLUDE_IVARS = %w{
+      INTERNAL_IVARS = %w{
+        @__name__
         @_assertion_wrapped
+        @_assertions
         @_result
+        @_routes
         @controller
         @layouts
         @locals
         @method_name
         @output_buffer
         @partials
+        @passed
         @rendered
         @request
         @routes
@@ -180,16 +188,24 @@ module ActionView
         @view_context_class
       }
 
-      def _instance_variables
-        instance_variables.map(&:to_s) - EXCLUDE_IVARS
+      def _user_defined_ivars
+        instance_variables.map(&:to_s) - INTERNAL_IVARS
+      end
+
+      # Returns a Hash of instance variables and their values, as defined by
+      # the user in the test case, which are then assigned to the view being
+      # rendered. This is generally intended for internal use and extension
+      # frameworks.
+      def view_assigns
+        Hash[_user_defined_ivars.map do |var|
+          [var[1..-1].to_sym, instance_variable_get(var)]
+        end]
       end
 
       def _assigns
-        _instance_variables.inject({}) do |hash, var|
-          name = var[1..-1].to_sym
-          hash[name] = instance_variable_get(var)
-          hash
-        end
+        ActiveSupport::Deprecation.warn "ActionView::TestCase#_assigns is deprecated and will be removed in future versions. " <<
+          "Please use view_assigns instead."
+        view_assigns
       end
 
       def _routes

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,44 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +13:00
+date: 2010-11-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 2
+        version: 3.0.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 2
+        version: 3.0.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -63,9 +70,11 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 4
@@ -77,9 +86,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
@@ -91,37 +102,43 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 5
-        - 4
-        version: 0.5.4
+        - 6
+        version: 0.5.6
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-mount
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 6
-        - 12
-        version: 0.6.12
+        - 13
+        version: 0.6.13
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 3
@@ -133,9 +150,11 @@ dependencies:
   name: erubis
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
         - 6
@@ -326,25 +345,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).