actionpack 3.0.0.beta4 → 3.0.0.rc

data/lib/action_view/helpers/translation_helper.rb

@@ -1,21 +1,28 @@
 require 'action_view/helpers/tag_helper'
 
 module ActionView
+  # = Action View Translation Helpers
   module Helpers
     module TranslationHelper
-      # Delegates to I18n#translate but also performs three additional functions. First, it'll catch MissingTranslationData exceptions
-      # and turn them into inline spans that contains the missing key, such that you can see in a view what is missing where.
+      # Delegates to I18n#translate but also performs three additional functions.
+      # First, it'll catch MissingTranslationData exceptions and turn them into 
+      # inline spans that contains the missing key, such that you can see in a 
+      # view what is missing where.
       #
-      # Second, it'll scope the key by the current partial if the key starts with a period. So if you call translate(".foo") from the
-      # people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo"). This makes it less repetitive
-      # to translate many keys within the same partials and gives you a simple framework for scoping them consistently. If you don't
-      # prepend the key with a period, nothing is converted.
+      # Second, it'll scope the key by the current partial if the key starts 
+      # with a period. So if you call <tt>translate(".foo")</tt> from the 
+      # <tt>people/index.html.erb</tt> template, you'll actually be calling 
+      # <tt>I18n.translate("people.index.foo")</tt>. This makes it less repetitive
+      # to translate many keys within the same partials and gives you a simple framework
+      # for scoping them consistently. If you don't prepend the key with a period, 
+      # nothing is converted.
       #
-      # Third, it’ll mark the translation as safe HTML if the key has the suffix "_html" or the last element of the key is the word
-      # "html". For example, calling translate("footer_html") or translate("footer.html") will return a safe HTML string that won’t
-      # be escaped by other HTML helper methods. This naming convention helps to identify translations that include HTML tags so that
+      # Third, it'll mark the translation as safe HTML if the key has the suffix 
+      # "_html" or the last element of the key is the word "html". For example, 
+      # calling translate("footer_html") or translate("footer.html") will return 
+      # a safe HTML string that won't be escaped by other HTML helper methods. This
+      # naming convention helps to identify translations that include HTML tags so that
       # you know what kind of output to expect when you call translate in a template.
-
       def translate(key, options = {})
         translation = I18n.translate(scope_key_by_partial(key), options.merge!(:raise => true))
         if html_safe_translation_key?(key) && translation.respond_to?(:html_safe)

data/lib/action_view/helpers/url_helper.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext/hash/keys'
 require 'action_dispatch'
 
 module ActionView
+  # = Action View URL Helpers
   module Helpers #:nodoc:
     # Provides a set of methods for making links and getting URLs that
     # depend on the routing subsystem (see ActionDispatch::Routing).
@@ -11,8 +12,8 @@ module ActionView
     # and controllers.
     module UrlHelper
       # This helper may be included in any class that includes the
-      # URL helpers of a router (router.url_helpers). Some methods
-      # provided here will only work in the context of a request
+      # URL helpers of a routes (routes.url_helpers). Some methods
+      # provided here will only work in the4 context of a request
       # (link_to_unless_current, for instance), which must be provided
       # as a method called #request on the context.
 
@@ -37,9 +38,6 @@ module ActionView
       # <tt>:only_path</tt> is <tt>true</tt> so you'll get the relative "/controller/action"
       # instead of the fully qualified URL like "http://example.com/controller/action".
       #
-      # When called from a view, +url_for+ returns an HTML escaped url. If you
-      # need an unescaped url, pass <tt>:escape => false</tt> in the +options+.
-      #
       # ==== Options
       # * <tt>:anchor</tt> - Specifies the anchor name to be appended to the path.
       # * <tt>:only_path</tt> - If true, returns the relative URL (omitting the protocol, host name, and port) (<tt>true</tt> by default unless <tt>:host</tt> is specified).
@@ -49,7 +47,6 @@ module ActionView
       # * <tt>:protocol</tt> - Overrides the default (current) protocol if provided.
       # * <tt>:user</tt> - Inline HTTP authentication (only plucked out if <tt>:password</tt> is also present).
       # * <tt>:password</tt> - Inline HTTP authentication (only plucked out if <tt>:user</tt> is also present).
-      # * <tt>:escape</tt> - Determines whether the returned URL will be HTML escaped or not (<tt>true</tt> by default).
       #
       # ==== Relying on named routes
       #
@@ -71,10 +68,7 @@ module ActionView
       #   <%= url_for(:action => 'play', :anchor => 'player') %>
       #   # => /messages/play/#player
       #
-      #   <%= url_for(:action => 'checkout', :anchor => 'tax&ship') %>
-      #   # => /testing/jump/#tax&amp;ship
-      #
-      #   <%= url_for(:action => 'checkout', :anchor => 'tax&ship', :escape => false) %>
+      #   <%= url_for(:action => 'jump', :anchor => 'tax&ship') %>
       #   # => /testing/jump/#tax&ship
       #
       #   <%= url_for(Workshop.new) %>
@@ -99,21 +93,17 @@ module ActionView
         options ||= {}
         url = case options
         when String
-          escape = true
           options
         when Hash
-          options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
-          escape  = options.key?(:escape) ? options.delete(:escape) : false
+          options = options.symbolize_keys.reverse_merge!(:only_path => options[:host].nil?)
           super
         when :back
-          escape = false
           controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
         else
-          escape = false
           polymorphic_path(options)
         end
 
-        escape ? escape_once(url).html_safe : url
+        url
       end
 
       # Creates a link tag of the given +name+ using a URL created by the set
@@ -253,8 +243,8 @@ module ActionView
             tag_options = nil
           end
 
-          href_attr = "href=\"#{url}\"" unless href
-          "<a #{href_attr}#{tag_options}>#{ERB::Util.h(name || url)}</a>".html_safe
+          href_attr = "href=\"#{html_escape(url)}\"" unless href
+          "<a #{href_attr}#{tag_options}>#{html_escape(name || url)}</a>".html_safe
         end
       end
 
@@ -338,7 +328,7 @@ module ActionView
 
         html_options.merge!("type" => "submit", "value" => name)
 
-        ("<form method=\"#{form_method}\" action=\"#{escape_once url}\" #{"data-remote=\"true\"" if remote} class=\"button_to\"><div>" +
+        ("<form method=\"#{form_method}\" action=\"#{html_escape(url)}\" #{"data-remote=\"true\"" if remote} class=\"button_to\"><div>" +
           method_tag + tag("input", html_options) + request_token_tag + "</div></form>").html_safe
       end
 
@@ -408,7 +398,7 @@ module ActionView
       def link_to_unless(condition, name, options = {}, html_options = {}, &block)
         if condition
           if block_given?
-            block.arity <= 1 ? yield(name) : yield(name, options, html_options)
+            block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
           else
             name
           end
@@ -484,24 +474,27 @@ module ActionView
       #            :subject => "This is an example email"
       #   # => <a href="mailto:me@domain.com?cc=ccaddress@domain.com&subject=This%20is%20an%20example%20email">My email</a>
       def mail_to(email_address, name = nil, html_options = {})
+        email_address = html_escape(email_address)
+
         html_options = html_options.stringify_keys
         encode = html_options.delete("encode").to_s
         cc, bcc, subject, body = html_options.delete("cc"), html_options.delete("bcc"), html_options.delete("subject"), html_options.delete("body")
 
-        string = ''
-        extras = ''
-        extras << "cc=#{Rack::Utils.escape(cc).gsub("+", "%20")}&" unless cc.nil?
-        extras << "bcc=#{Rack::Utils.escape(bcc).gsub("+", "%20")}&" unless bcc.nil?
-        extras << "body=#{Rack::Utils.escape(body).gsub("+", "%20")}&" unless body.nil?
-        extras << "subject=#{Rack::Utils.escape(subject).gsub("+", "%20")}&" unless subject.nil?
-        extras = "?" << extras.gsub!(/&?$/,"") unless extras.empty?
-
-        email_address_obfuscated = html_escape(email_address)
+        extras = []
+        extras << "cc=#{Rack::Utils.escape(cc).gsub("+", "%20")}" unless cc.nil?
+        extras << "bcc=#{Rack::Utils.escape(bcc).gsub("+", "%20")}" unless bcc.nil?
+        extras << "body=#{Rack::Utils.escape(body).gsub("+", "%20")}" unless body.nil?
+        extras << "subject=#{Rack::Utils.escape(subject).gsub("+", "%20")}" unless subject.nil?
+        extras = extras.empty? ? '' : '?' + html_escape(extras.join('&'))
+
+        email_address_obfuscated = email_address.dup
         email_address_obfuscated.gsub!(/@/, html_options.delete("replace_at")) if html_options.has_key?("replace_at")
         email_address_obfuscated.gsub!(/\./, html_options.delete("replace_dot")) if html_options.has_key?("replace_dot")
 
+        string = ''
+
         if encode == "javascript"
-          "document.write('#{content_tag("a", name || email_address_obfuscated.html_safe, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
+          "document.write('#{content_tag("a", name || email_address_obfuscated.html_safe, html_options.merge("href" => "mailto:#{email_address}#{extras}".html_safe))}');".each_byte do |c|
             string << sprintf("%%%x", c)
           end
           "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>".html_safe
@@ -518,9 +511,9 @@ module ActionView
             char = c.chr
             string << (char =~ /\w/ ? sprintf("%%%x", c) : char)
           end
-          content_tag "a", name || email_address_encoded.html_safe, html_options.merge({ "href" => "#{string}#{extras}" })
+          content_tag "a", name || email_address_encoded.html_safe, html_options.merge("href" => "#{string}#{extras}".html_safe)
         else
-          content_tag "a", name || email_address_obfuscated.html_safe, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" })
+          content_tag "a", name || email_address_obfuscated.html_safe, html_options.merge("href" => "mailto:#{email_address}#{extras}".html_safe)
         end
       end
 
@@ -573,7 +566,7 @@ module ActionView
                 "in a #request method"
         end
 
-        url_string = CGI.unescapeHTML(url_for(options))
+        url_string = url_for(options)
 
         # We ignore any extra parameters in the request_uri if the
         # submitted url doesn't have any either.  This lets the function

data/lib/action_view/log_subscriber.rb

@@ -0,0 +1,28 @@
+module ActionView
+  # = Action View Log Subscriber
+  #
+  # Provides functionality so that Rails can output logs from Action View.
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    def render_template(event)
+      message = "Rendered #{from_rails_root(event.payload[:identifier])}"
+      message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
+      message << (" (%.1fms)" % event.duration)
+      info(message)        
+    end
+    alias :render_partial :render_template
+    alias :render_collection :render_template
+
+    # TODO: Ideally, ActionView should have its own logger so it does not depend on AC.logger
+    def logger
+      ActionController::Base.logger if defined?(ActionController::Base)
+    end
+
+  protected
+
+    def from_rails_root(string)
+      string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "")
+    end
+  end
+end
+
+ActionView::LogSubscriber.attach_to :action_view

data/lib/action_view/lookup_context.rb

@@ -2,6 +2,8 @@ require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
 
 module ActionView
+  # = Action View Lookup Context
+  #
   # LookupContext is the object responsible to hold all information required to lookup
   # templates, i.e. view paths and details. The LookupContext is also responsible to
   # generate a key, given to view paths, used in the resolver cache lookup. Since

data/lib/action_view/paths.rb

@@ -1,4 +1,5 @@
 module ActionView #:nodoc:
+  # = Action View PathSet
   class PathSet < Array #:nodoc:
     %w(initialize << concat insert push unshift).each do |method|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1

data/lib/action_view/railtie.rb

@@ -2,11 +2,11 @@ require "action_view"
 require "rails"
 
 module ActionView
+  # = Action View Railtie
   class Railtie < Rails::Railtie
     config.action_view = ActiveSupport::OrderedOptions.new
-
-    require "action_view/railties/log_subscriber"
-    log_subscriber :action_view, ActionView::Railties::LogSubscriber.new
+    config.action_view.stylesheet_expansions = {}
+    config.action_view.javascript_expansions = { :defaults => ['prototype', 'effects', 'dragdrop', 'controls', 'rails'] }
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
@@ -16,6 +16,18 @@ module ActionView
       end
     end
 
+    initializer "action_view.javascript_expansions" do |app|
+      ActiveSupport.on_load(:action_view) do
+        ActionView::Helpers::AssetTagHelper.register_javascript_expansion(
+          app.config.action_view.delete(:javascript_expansions)
+        )
+
+        ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion(
+          app.config.action_view.delete(:stylesheet_expansions)
+        )
+      end
+    end
+
     initializer "action_view.set_configs" do |app|
       ActiveSupport.on_load(:action_view) do
         app.config.action_view.each do |k,v|

data/lib/action_view/render/layouts.rb

@@ -1,4 +1,5 @@
 module ActionView
+  # = Action View Layouts
   module Layouts
     # Returns the contents that are yielded to a layout, given a name or a block.
     #
@@ -55,7 +56,7 @@ module ActionView
     end
 
     # This is the method which actually finds the layout using details in the lookup
-    # context object. If no layout is found, it checkes if at least a layout with
+    # context object. If no layout is found, it checks if at least a layout with
     # the given name exists across all details before raising the error.
     def find_layout(layout)
       begin

data/lib/action_view/render/partials.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/object/blank'
 
 module ActionView
+  # = Action View Partials
+  #
   # 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
@@ -316,7 +318,7 @@ module ActionView
 
           object.class.model_name.partial_path.dup.tap do |partial|
             path = @view.controller_path
-            partial.insert(0, "#{File.dirname(path)}/") if path.include?(?/)
+            partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
           end
         end
       end

data/lib/action_view/render/rendering.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/object/try'
 
 module ActionView
+  # = Action View Rendering
   module Rendering
     # Returns the result of a render that's dictated by the options hash. The primary options are:
     #
@@ -56,7 +57,7 @@ module ActionView
         :identifier => template.identifier, :layout => layout.try(:virtual_path)) do
 
         content = template.render(self, locals) { |*name| _layout_for(*name) }
-        @_content_for[:layout] = content
+        @_content_for[:layout] = content if layout
 
         content = _render_layout(layout, locals) if layout
         content

data/lib/action_view/template.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/kernel/singleton_class'
 
 module ActionView
+  # = Action View Template
   class Template
     extend ActiveSupport::Autoload
 
@@ -155,11 +156,12 @@ module ActionView
     end
 
     def inspect
-      if defined?(Rails.root)
-        identifier.sub("#{Rails.root}/", '')
-      else
-        identifier
-      end
+      @inspect ||=
+        if defined?(Rails.root)
+          identifier.sub("#{Rails.root}/", '')
+        else
+          identifier
+        end
     end
 
     private
@@ -266,9 +268,11 @@ module ActionView
       end
 
       def build_method_name(locals)
-        # TODO: is locals.keys.hash reliably the same?
-        @method_names[locals.keys.hash] ||=
-          "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
+        @method_names[locals.keys.hash] ||= "_#{identifier_method_name}__#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
+      end
+
+      def identifier_method_name
+        @identifier_method_name ||= inspect.gsub(/[^a-z_]/, '_')
       end
   end
 end

data/lib/action_view/template/error.rb

@@ -1,6 +1,7 @@
 require "active_support/core_ext/enumerable"
 
 module ActionView
+  # = Action View Errors
   class ActionViewError < StandardError #:nodoc:
   end
 

data/lib/action_view/template/handlers.rb

@@ -1,4 +1,5 @@
 module ActionView #:nodoc:
+  # = Action View Template Handlers
   class Template
     module Handlers #:nodoc:
       autoload :ERB, 'action_view/template/handlers/erb'

data/lib/action_view/template/resolver.rb

@@ -3,6 +3,7 @@ require "active_support/core_ext/class"
 require "action_view/template"
 
 module ActionView
+  # = Action View Resolver
   class Resolver
     def initialize
       @cached = Hash.new { |h1,k1| h1[k1] =
@@ -98,7 +99,7 @@ module ActionView
     def initialize(path)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
       super()
-      @path = Pathname.new(path).expand_path
+      @path = File.expand_path(path)
     end
 
     def eql?(resolver)

data/lib/action_view/template/text.rb

@@ -1,4 +1,5 @@
 module ActionView #:nodoc:
+  # = Action View Text Template
   class Template
     class Text < String #:nodoc:
       attr_accessor :mime_type

data/lib/action_view/test_case.rb

@@ -4,6 +4,7 @@ require 'action_controller/test_case'
 require 'action_view'
 
 module ActionView
+  # = Action View Test Case
   class TestCase < ActiveSupport::TestCase
     class TestController < ActionController::Base
       include ActionDispatch::TestProcess
@@ -36,7 +37,7 @@ module ActionView
       include ActionController::TemplateAssertions
       include ActionView::Context
 
-      include ActionController::PolymorphicRoutes
+      include ActionDispatch::Routing::PolymorphicRoutes
       include ActionController::RecordIdentifier
 
       include AbstractController::Helpers
@@ -84,6 +85,7 @@ module ActionView
 
       def setup_with_controller
         @controller = ActionView::TestCase::TestController.new
+        @request = @controller.request
         @output_buffer = ActiveSupport::SafeBuffer.new
         @rendered = ''
 
@@ -97,10 +99,15 @@ module ActionView
       end
 
       def render(options = {}, local_assigns = {}, &block)
-        @rendered << output = _view.render(options, local_assigns, &block)
+        view.assign(_assigns)
+        @rendered << output = view.render(options, local_assigns, &block)
         output
       end
 
+      def locals
+        @locals ||= {}
+      end
+
       included do
         setup :setup_with_controller
       end
@@ -130,36 +137,51 @@ module ActionView
         end
       end
 
-      def _view
-        @_view ||= begin
-                     view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+      module Locals
+        attr_accessor :locals
+
+        def _render_partial(options)
+          locals[options[:partial]] = options[:locals]
+          super(options)
+        end
+      end
+
+      # The instance of ActionView::Base that is used by +render+.
+      def view
+        @view ||= begin
+                     view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller)
                      view.singleton_class.send :include, _helpers
-                     view.singleton_class.send :include, @controller._router.url_helpers
+                     view.singleton_class.send :include, @controller._routes.url_helpers
                      view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
+                     view.extend(Locals)
+                     view.locals = self.locals
                      view.output_buffer = self.output_buffer
                      view
                    end
       end
 
+      alias_method :_view, :view
+
       EXCLUDE_IVARS = %w{
+        @_assertion_wrapped
         @_result
+        @controller
+        @layouts
+        @locals
+        @method_name
         @output_buffer
+        @partials
         @rendered
+        @request
+        @routes
         @templates
-        @view_context_class
-        @layouts
-        @partials
-        @controller
-
-        @method_name
-        @fixture_cache
-        @loaded_fixtures
         @test_passed
+        @view
+        @view_context_class
       }
 
       def _instance_variables
-        instance_variables - EXCLUDE_IVARS
-        instance_variables
+        instance_variables.map(&:to_s) - EXCLUDE_IVARS
       end
 
       def _assigns
@@ -170,13 +192,13 @@ module ActionView
         end
       end
 
-      def _router
-        @controller._router if @controller.respond_to?(:_router)
+      def _routes
+        @controller._routes if @controller.respond_to?(:_routes)
       end
 
       def method_missing(selector, *args)
-        if @controller.respond_to?(:_router) &&
-        @controller._router.named_routes.helpers.include?(selector)
+        if @controller.respond_to?(:_routes) &&
+        @controller._routes.named_routes.helpers.include?(selector)
           @controller.__send__(selector, *args)
         else
           super