actionpack 3.2.22.5 → 4.0.0.beta1

data/lib/action_view.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2013 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,24 +21,24 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_support/ruby/shim'
-require 'active_support/core_ext/class/attribute_accessors'
-
+require 'active_support'
+require 'active_support/rails'
 require 'action_pack'
 
 module ActionView
   extend ActiveSupport::Autoload
 
   eager_autoload do
-    autoload :AssetPaths
     autoload :Base
     autoload :Context
     autoload :CompiledTemplates, "action_view/context"
+    autoload :Digestor
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
+    autoload :RecordIdentifier
+    autoload :RoutingUrlFor
     autoload :Template
-    autoload :TestCase
 
     autoload_under "renderer" do
       autoload :Renderer
@@ -70,15 +70,24 @@ module ActionView
       autoload :MissingTemplate
       autoload :ActionViewError
       autoload :EncodingError
+      autoload :MissingRequestError
       autoload :TemplateError
       autoload :WrongEncodingError
     end
   end
 
+  autoload :TestCase
+
   ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
+
+  def self.eager_load!
+    super
+    ActionView::Template.eager_load!
+  end
 end
 
-require 'active_support/i18n'
 require 'active_support/core_ext/string/output_safety'
 
-I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
+end

data/lib/action_view/base.rb

@@ -1,15 +1,12 @@
 require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/ordered_options'
 require 'action_view/log_subscriber'
-require 'active_support/core_ext/module/deprecation'
 
 module ActionView #:nodoc:
   # = Action View Base
   #
-  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb
+  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERB
   # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used.
   #
   # == ERB
@@ -58,7 +55,7 @@ module ActionView #:nodoc:
   #
   # You can pass local variables to sub templates by using a hash with the variable names as keys and the objects as values:
   #
-  #   <%= render "shared/header", { :headline => "Welcome", :person => person } %>
+  #   <%= render "shared/header", { headline: "Welcome", person: person } %>
   #
   # These can now be accessed in <tt>shared/header</tt> with:
   #
@@ -141,14 +138,22 @@ module ActionView #:nodoc:
     # How to complete the streaming when an exception occurs.
     # This is our best guess: first try to close the attribute, then the tag.
     cattr_accessor :streaming_completion_on_exception
-    @@streaming_completion_on_exception = %("><script type="text/javascript">window.location = "/500.html"</script></html>)
+    @@streaming_completion_on_exception = %("><script>window.location = "/500.html"</script></html>)
+
+    # Specify whether rendering within namespaced controllers should prefix
+    # the partial paths for ActiveModel objects with the namespace.
+    # (e.g., an Admin::PostsController would render @post using /admin/posts/_post.erb)
+    cattr_accessor :prefix_partial_path_with_controller_namespace
+    @@prefix_partial_path_with_controller_namespace = true
+
+    # Specify default_formats that can be rendered.
+    cattr_accessor :default_formats
 
-    class_attribute :helpers
     class_attribute :_routes
+    class_attribute :logger
 
     class << self
       delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
-      delegate :logger, :to => 'ActionController::Base', :allow_nil => true
 
       def cache_template_loading
         ActionView::Resolver.caching?
@@ -158,31 +163,9 @@ module ActionView #:nodoc:
         ActionView::Resolver.caching = value
       end
 
-      def process_view_paths(value)
-        value.is_a?(PathSet) ?
-          value.dup : ActionView::PathSet.new(Array.wrap(value))
-      end
-      deprecate :process_view_paths
-
       def xss_safe? #:nodoc:
         true
       end
-
-      # This method receives routes and helpers from the controller
-      # and return a subclass ready to be used as view context.
-      def prepare(routes, helpers) #:nodoc:
-        Class.new(self) do
-          if routes
-            include routes.url_helpers
-            include routes.mounted_helpers
-          end
-
-          if helpers
-            include helpers
-            self.helpers = helpers
-          end
-        end
-      end
     end
 
     attr_accessor :view_renderer
@@ -198,11 +181,9 @@ module ActionView #:nodoc:
     def initialize(context = nil, assigns = {}, controller = nil, formats = nil) #:nodoc:
       @_config = ActiveSupport::InheritableOptions.new
 
-      # Handle all these for backwards compatibility.
-      # TODO Provide a new API for AV::Base and deprecate this one.
       if context.is_a?(ActionView::Renderer)
         @view_renderer = context
-      elsif
+      else
         lookup_context = context.is_a?(ActionView::LookupContext) ?
           context : ActionView::LookupContext.new(context)
         lookup_context.formats  = formats if formats

data/lib/action_view/buffers.rb

@@ -4,7 +4,7 @@ module ActionView
   class OutputBuffer < ActiveSupport::SafeBuffer #:nodoc:
     def initialize(*)
       super
-      encode! if encoding_aware?
+      encode!
     end
 
     def <<(value)

data/lib/action_view/context.rb

@@ -5,7 +5,7 @@ module ActionView
 
   # = Action View Context
   #
-  # Action View contexts are supplied to Action Controller to render template.
+  # Action View contexts are supplied to Action Controller to render a template.
   # The default Action View context is ActionView::Base.
   #
   # In order to work with ActionController, a Context must just include this module.
@@ -25,12 +25,12 @@ module ActionView
     end
 
     # Encapsulates the interaction with the view flow so it
-    # returns the correct buffer on yield. This is usually
-    # overwriten by helpers to add more behavior.
+    # returns the correct buffer on +yield+. This is usually
+    # overwritten by helpers to add more behavior.
     # :api: plugin
     def _layout_for(name=nil)
       name ||= :layout
       view_flow.get(name).html_safe
     end
   end
-end
+end

data/lib/action_view/dependency_tracker.rb

@@ -0,0 +1,91 @@
+require 'thread_safe'
+
+module ActionView
+  class DependencyTracker
+    @trackers = ThreadSafe::Cache.new
+
+    def self.find_dependencies(name, template)
+      tracker = @trackers[template.handler]
+
+      if tracker.present?
+        tracker.call(name, template)
+      else
+        []
+      end
+    end
+
+    def self.register_tracker(extension, tracker)
+      handler = Template.handler_for_extension(extension)
+      @trackers[handler] = tracker
+    end
+
+    def self.remove_tracker(handler)
+      @trackers.delete(handler)
+    end
+
+    class ERBTracker
+      EXPLICIT_DEPENDENCY = /# Template Dependency: (\S+)/
+
+      # Matches:
+      #   render partial: "comments/comment", collection: commentable.comments
+      #   render "comments/comments"
+      #   render 'comments/comments'
+      #   render('comments/comments')
+      #
+      #   render(@topic)         => render("topics/topic")
+      #   render(topics)         => render("topics/topic")
+      #   render(message.topics) => render("topics/topic")
+      RENDER_DEPENDENCY = /
+        render\s*                     # render, followed by optional whitespace
+        \(?                           # start an optional parenthesis for the render call
+        (partial:|:partial\s+=>)?\s*  # naming the partial, used with collection -- 1st capture
+        ([@a-z"'][@a-z_\/\."']+)      # the template name itself -- 2nd capture
+      /x
+
+      def self.call(name, template)
+        new(name, template).dependencies
+      end
+
+      def initialize(name, template)
+        @name, @template = name, template
+      end
+
+      def dependencies
+        render_dependencies + explicit_dependencies
+      end
+
+      private
+        attr_reader :name, :template
+
+        def source
+          template.source
+        end
+
+        def directory
+          name.split("/")[0..-2].join("/")
+        end
+
+        def render_dependencies
+          source.scan(RENDER_DEPENDENCY).
+            collect(&:second).uniq.
+
+            # render(@topic)         => render("topics/topic")
+            # render(topics)         => render("topics/topic")
+            # render(message.topics) => render("topics/topic")
+            collect { |name| name.sub(/\A@?([a-z]+\.)*([a-z_]+)\z/) { "#{$2.pluralize}/#{$2.singularize}" } }.
+
+            # render("headline") => render("message/headline")
+            collect { |name| name.include?("/") ? name : "#{directory}/#{name}" }.
+
+            # replace quotes from string renders
+            collect { |name| name.gsub(/["']/, "") }
+        end
+
+        def explicit_dependencies
+          source.scan(EXPLICIT_DEPENDENCY).flatten.uniq
+        end
+    end
+
+    register_tracker :erb, ERBTracker
+  end
+end

data/lib/action_view/digestor.rb

@@ -0,0 +1,85 @@
+require 'thread_safe'
+require 'action_view/dependency_tracker'
+
+module ActionView
+  class Digestor
+    cattr_reader(:cache)
+    @@cache = ThreadSafe::Cache.new
+
+    def self.digest(name, format, finder, options = {})
+      cache_key = [name, format] + Array.wrap(options[:dependencies])
+      @@cache[cache_key.join('.')] ||= begin
+        klass = options[:partial] || name.include?("/_") ? PartialDigestor : Digestor
+        klass.new(name, format, finder, options).digest
+      end
+    end
+
+    attr_reader :name, :format, :finder, :options
+
+    def initialize(name, format, finder, options={})
+      @name, @format, @finder, @options = name, format, finder, options
+    end
+
+    def digest
+      Digest::MD5.hexdigest("#{source}-#{dependency_digest}").tap do |digest|
+        logger.try :info, "Cache digest for #{name}.#{format}: #{digest}"
+      end
+    rescue ActionView::MissingTemplate
+      logger.try :error, "Couldn't find template for digesting: #{name}.#{format}"
+      ''
+    end
+
+    def dependencies
+      DependencyTracker.find_dependencies(name, template)
+    rescue ActionView::MissingTemplate
+      [] # File doesn't exist, so no dependencies
+    end
+
+    def nested_dependencies
+      dependencies.collect do |dependency|
+        dependencies = PartialDigestor.new(dependency, format, finder).nested_dependencies
+        dependencies.any? ? { dependency => dependencies } : dependency
+      end
+    end
+
+    private
+
+      def logger
+        ActionView::Base.logger
+      end
+
+      def logical_name
+        name.gsub(%r|/_|, "/")
+      end
+
+      def partial?
+        false
+      end
+
+      def template
+        @template ||= finder.find(logical_name, [], partial?, formats: [ format ])
+      end
+
+      def source
+        template.source
+      end
+
+      def dependency_digest
+        template_digests = dependencies.collect do |template_name|
+          Digestor.digest(template_name, format, finder, partial: true)
+        end
+
+        (template_digests + injected_dependencies).join("-")
+      end
+
+      def injected_dependencies
+        Array.wrap(options[:dependencies])
+      end
+  end
+
+  class PartialDigestor < Digestor # :nodoc:
+    def partial?
+      true
+    end
+  end
+end

data/lib/action_view/flows.rb

@@ -22,11 +22,8 @@ module ActionView
     def append(key, value)
       @content[key] << value
     end
+    alias_method :append!, :append
 
-    # Called by provide
-    def append!(key, value)
-      @content[key] << value
-    end
   end
 
   class StreamingFlow < OutputFlow #:nodoc:

data/lib/action_view/helpers.rb

@@ -6,6 +6,7 @@ module ActionView #:nodoc:
 
     autoload :ActiveModelHelper
     autoload :AssetTagHelper
+    autoload :AssetUrlHelper
     autoload :AtomFeedHelper
     autoload :CacheHelper
     autoload :CaptureHelper
@@ -29,13 +30,10 @@ module ActionView #:nodoc:
 
     extend ActiveSupport::Concern
 
-    included do
-      extend SanitizeHelper::ClassMethods
-    end
-
     include ActiveSupport::Benchmarkable
     include ActiveModelHelper
     include AssetTagHelper
+    include AssetUrlHelper
     include AtomFeedHelper
     include CacheHelper
     include CaptureHelper

data/lib/action_view/helpers/active_model_helper.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/object/blank'
 
 module ActionView
   # = Active Model Helpers
@@ -16,8 +15,8 @@ module ActionView
         end
       end
 
-      %w(content_tag to_date_select_tag to_datetime_select_tag to_time_select_tag).each do |meth|
-        module_eval "def #{meth}(*) error_wrapping(super) end", __FILE__, __LINE__
+      def content_tag(*)
+        error_wrapping(super)
       end
 
       def tag(type, options, *)
@@ -39,7 +38,7 @@ module ActionView
       private
 
       def object_has_errors?
-        object.respond_to?(:errors) && object.errors.respond_to?(:full_messages) && error_message.any?
+        object.respond_to?(:errors) && object.errors.respond_to?(:[]) && error_message.present?
       end
 
       def tag_generate_errors?(options)

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -1,6 +1,6 @@
-require 'action_view/helpers/asset_tag_helpers/javascript_tag_helpers'
-require 'action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers'
-require 'action_view/helpers/asset_tag_helpers/asset_paths'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/hash/keys'
+require 'action_view/helpers/asset_url_helper'
 require 'action_view/helpers/tag_helper'
 
 module ActionView
@@ -11,192 +11,100 @@ module ActionView
     # the assets exist before linking to them:
     #
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="/assets/rails.png" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="/assets/application.css?body=1" media="screen" rel="stylesheet" />
     #
-    # === Using asset hosts
-    #
-    # By default, Rails links to these assets on the current host in the public
-    # folder, but you can direct Rails to link to assets from a dedicated asset
-    # server by setting ActionController::Base.asset_host in the application
-    # configuration, typically in <tt>config/environments/production.rb</tt>.
-    # For example, you'd define <tt>assets.example.com</tt> to be your asset
-    # host this way:
-    #
-    #   ActionController::Base.asset_host = "assets.example.com"
-    #
-    # Helpers take that into account:
-    #
-    #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets.example.com/images/rails.png?1230601161" />
-    #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
-    #
-    # Browsers typically open at most two simultaneous connections to a single
-    # host, which means your assets often have to wait for other assets to finish
-    # downloading. You can alleviate this by using a <tt>%d</tt> wildcard in the
-    # +asset_host+. For example, "assets%d.example.com". If that wildcard is
-    # present Rails distributes asset requests among the corresponding four hosts
-    # "assets0.example.com", ..., "assets3.example.com". With this trick browsers
-    # will open eight simultaneous connections rather than two.
-    #
-    #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets0.example.com/images/rails.png?1230601161" />
-    #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets2.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
-    #
-    # To do this, you can either setup four actual hosts, or you can use wildcard
-    # DNS to CNAME the wildcard to a single asset host. You can read more about
-    # setting up your DNS CNAME records from your ISP.
-    #
-    # Note: This is purely a browser performance optimization and is not meant
-    # for server load balancing. See http://www.die.net/musings/page_load_time/
-    # for background.
-    #
-    # Alternatively, you can exert more control over the asset host by setting
-    # +asset_host+ to a proc like this:
-    #
-    #   ActionController::Base.asset_host = Proc.new { |source|
-    #     "http://assets#{Digest::MD5.hexdigest(source).to_i(16) % 2 + 1}.example.com"
-    #   }
-    #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets1.example.com/images/rails.png?1230601161" />
-    #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets2.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
-    #
-    # The example above generates "http://assets1.example.com" and
-    # "http://assets2.example.com". This option is useful for example if
-    # you need fewer/more than four hosts, custom host names, etc.
-    #
-    # As you see the proc takes a +source+ parameter. That's a string with the
-    # absolute path of the asset with any extensions and timestamps in place,
-    # for example "/images/rails.png?1230601161".
-    #
-    #    ActionController::Base.asset_host = Proc.new { |source|
-    #      if source.starts_with?('/images')
-    #        "http://images.example.com"
-    #      else
-    #        "http://assets.example.com"
-    #      end
-    #    }
-    #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://images.example.com/images/rails.png?1230601161" />
-    #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
-    #
-    # Alternatively you may ask for a second parameter +request+. That one is
-    # particularly useful for serving assets from an SSL-protected page. The
-    # example proc below disables asset hosting for HTTPS connections, while
-    # still sending assets for plain HTTP requests from asset hosts. If you don't
-    # have SSL certificates for each of the asset hosts this technique allows you
-    # to avoid warnings in the client about mixed media.
-    #
-    #   ActionController::Base.asset_host = Proc.new { |source, request|
-    #     if request.ssl?
-    #       "#{request.protocol}#{request.host_with_port}"
-    #     else
-    #       "#{request.protocol}assets.example.com"
-    #     end
-    #   }
-    #
-    # You can also implement a custom asset host object that responds to +call+
-    # and takes either one or two parameters just like the proc.
-    #
-    #   config.action_controller.asset_host = AssetHostingWithMinimumSsl.new(
-    #     "http://asset%d.example.com", "https://asset1.example.com"
-    #   )
-    #
-    # === Customizing the asset path
-    #
-    # By default, Rails appends asset's timestamps to all asset paths. This allows
-    # you to set a cache-expiration date for the asset far into the future, but
-    # still be able to instantly invalidate it by simply updating the file (and
-    # hence updating the timestamp, which then updates the URL as the timestamp
-    # is part of that, which in turn busts the cache).
-    #
-    # It's the responsibility of the web server you use to set the far-future
-    # expiration date on cache assets that you need to take advantage of this
-    # feature. Here's an example for Apache:
-    #
-    #   # Asset Expiration
-    #   ExpiresActive On
-    #   <FilesMatch "\.(ico|gif|jpe?g|png|js|css)$">
-    #     ExpiresDefault "access plus 1 year"
-    #   </FilesMatch>
-    #
-    # Also note that in order for this to work, all your application servers must
-    # return the same timestamps. This means that they must have their clocks
-    # synchronized. If one of them drifts out of sync, you'll see different
-    # timestamps at random and the cache won't work. In that case the browser
-    # will request the same assets over and over again even thought they didn't
-    # change. You can use something like Live HTTP Headers for Firefox to verify
-    # that the cache is indeed working.
-    #
-    # This strategy works well enough for most server setups and requires the
-    # least configuration, but if you deploy several application servers at
-    # different times - say to handle a temporary spike in load - then the
-    # asset time stamps will be out of sync. In a setup like this you may want
-    # to set the way that asset paths are generated yourself.
-    #
-    # Altering the asset paths that Rails generates can be done in two ways.
-    # The easiest is to define the RAILS_ASSET_ID environment variable. The
-    # contents of this variable will always be used in preference to
-    # calculated timestamps. A more complex but flexible way is to set
-    # <tt>ActionController::Base.config.asset_path</tt> to a proc
-    # that takes the unmodified asset path and returns the path needed for
-    # your asset caching to work. Typically you'd do something like this in
-    # <tt>config/environments/production.rb</tt>:
-    #
-    #   # Normally you'd calculate RELEASE_NUMBER at startup.
-    #   RELEASE_NUMBER = 12345
-    #   config.action_controller.asset_path = proc { |asset_path|
-    #     "/release-#{RELEASE_NUMBER}#{asset_path}"
-    #   }
-    #
-    # This example would cause the following behavior on all servers no
-    # matter when they were deployed:
-    #
-    #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="/release-12345/images/rails.png" />
-    #   stylesheet_link_tag("application")
-    #   # => <link href="/release-12345/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
-    #
-    # Changing the asset_path does require that your web servers have
-    # knowledge of the asset template paths that you rewrite to so it's not
-    # suitable for out-of-the-box use. To use the example given above you
-    # could use something like this in your Apache VirtualHost configuration:
-    #
-    #   <LocationMatch "^/release-\d+/(images|javascripts|stylesheets)/.*$">
-    #     # Some browsers still send conditional-GET requests if there's a
-    #     # Last-Modified header or an ETag header even if they haven't
-    #     # reached the expiry date sent in the Expires header.
-    #     Header unset Last-Modified
-    #     Header unset ETag
-    #     FileETag None
-    #
-    #     # Assets requested using a cache-busting filename should be served
-    #     # only once and then cached for a really long time. The HTTP/1.1
-    #     # spec frowns on hugely-long expiration times though and suggests
-    #     # that assets which never expire be served with an expiration date
-    #     # 1 year from access.
-    #     ExpiresActive On
-    #     ExpiresDefault "access plus 1 year"
-    #   </LocationMatch>
-    #
-    #   # We use cached-busting location names with the far-future expires
-    #   # headers to ensure that if a file does change it can force a new
-    #   # request. The actual asset filenames are still the same though so we
-    #   # need to rewrite the location from the cache-busting location to the
-    #   # real asset location so that we can serve it.
-    #   RewriteEngine On
-    #   RewriteRule ^/release-\d+/(images|javascripts|stylesheets)/(.*)$ /$1/$2 [L]
     module AssetTagHelper
+      extend ActiveSupport::Concern
+
+      include AssetUrlHelper
       include TagHelper
-      include JavascriptTagHelpers
-      include StylesheetTagHelpers
+
+      # Returns an HTML script tag for each of the +sources+ provided.
+      #
+      # Sources may be paths to JavaScript files. Relative paths are assumed to be relative
+      # to <tt>assets/javascripts</tt>, full paths are assumed to be relative to the document
+      # root. Relative paths are idiomatic, use absolute paths only when needed.
+      #
+      # When passing paths, the ".js" extension is optional.
+      #
+      # You can modify the HTML attributes of the script tag by passing a hash as the
+      # last argument.
+      #
+      # When the Asset Pipeline is enabled, you can pass the name of your manifest as
+      # source, and include other JavaScript or CoffeeScript files inside the manifest.
+      #
+      #   javascript_include_tag "xmlhr"
+      #   # => <script src="/assets/xmlhr.js?1284139606"></script>
+      #
+      #   javascript_include_tag "xmlhr.js"
+      #   # => <script src="/assets/xmlhr.js?1284139606"></script>
+      #
+      #   javascript_include_tag "common.javascript", "/elsewhere/cools"
+      #   # => <script src="/assets/common.javascript?1284139606"></script>
+      #   #    <script src="/elsewhere/cools.js?1423139606"></script>
+      #
+      #   javascript_include_tag "http://www.example.com/xmlhr"
+      #   # => <script src="http://www.example.com/xmlhr"></script>
+      #
+      #   javascript_include_tag "http://www.example.com/xmlhr.js"
+      #   # => <script src="http://www.example.com/xmlhr.js"></script>
+      #
+      def javascript_include_tag(*sources)
+        options = sources.extract_options!.stringify_keys
+        path_options = options.extract!('protocol').symbolize_keys
+
+        sources.uniq.map { |source|
+          tag_options = {
+            "src" => path_to_javascript(source, path_options)
+          }.merge(options)
+          content_tag(:script, "", tag_options)
+        }.join("\n").html_safe
+      end
+
+      # Returns a stylesheet link tag for the sources specified as arguments. If
+      # you don't specify an extension, <tt>.css</tt> will be appended automatically.
+      # You can modify the link attributes by passing a hash as the last argument.
+      # For historical reasons, the 'media' attribute will always be present and defaults
+      # to "screen", so you must explicitely set it to "all" for the stylesheet(s) to
+      # apply to all media types.
+      #
+      #   stylesheet_link_tag "style"
+      #   # => <link href="/assets/style.css" media="screen" rel="stylesheet" />
+      #
+      #   stylesheet_link_tag "style.css"
+      #   # => <link href="/assets/style.css" media="screen" rel="stylesheet" />
+      #
+      #   stylesheet_link_tag "http://www.example.com/style.css"
+      #   # => <link href="http://www.example.com/style.css" media="screen" rel="stylesheet" />
+      #
+      #   stylesheet_link_tag "style", media: "all"
+      #   # => <link href="/assets/style.css" media="all" rel="stylesheet" />
+      #
+      #   stylesheet_link_tag "style", media: "print"
+      #   # => <link href="/assets/style.css" media="print" rel="stylesheet" />
+      #
+      #   stylesheet_link_tag "random.styles", "/css/stylish"
+      #   # => <link href="/assets/random.styles" media="screen" rel="stylesheet" />
+      #   #    <link href="/css/stylish.css" media="screen" rel="stylesheet" />
+      #
+      def stylesheet_link_tag(*sources)
+        options = sources.extract_options!.stringify_keys
+        path_options = options.extract!('protocol').symbolize_keys
+
+        sources.uniq.map { |source|
+          tag_options = {
+            "rel" => "stylesheet",
+            "media" => "screen",
+            "href" => path_to_stylesheet(source, path_options)
+          }.merge(options)
+          tag(:link, tag_options)
+        }.join("\n").html_safe
+      end
+
       # Returns a link tag that browsers and news readers can use to auto-detect
-      # an RSS or ATOM feed. The +type+ can either be <tt>:rss</tt> (default) or
+      # an RSS or Atom feed. The +type+ can either be <tt>:rss</tt> (default) or
       # <tt>:atom</tt>. Control the link options in url_for format using the
       # +url_options+. You can modify the LINK tag itself in +tag_options+.
       #
@@ -205,20 +113,27 @@ module ActionView
       # * <tt>:type</tt>  - Override the auto-generated mime type
       # * <tt>:title</tt>  - Specify the title of the link, defaults to the +type+
       #
-      # ==== Examples
-      #  auto_discovery_link_tag # =>
-      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" />
-      #  auto_discovery_link_tag(:atom) # =>
-      #     <link rel="alternate" type="application/atom+xml" title="ATOM" href="http://www.currenthost.com/controller/action" />
-      #  auto_discovery_link_tag(:rss, {:action => "feed"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/feed" />
-      #  auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="My RSS" href="http://www.currenthost.com/controller/feed" />
-      #  auto_discovery_link_tag(:rss, {:controller => "news", :action => "feed"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/news/feed" />
-      #  auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {:title => "Example RSS"}) # =>
-      #     <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed" />
+      #   auto_discovery_link_tag
+      #   # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" />
+      #   auto_discovery_link_tag(:atom)
+      #   # => <link rel="alternate" type="application/atom+xml" title="ATOM" href="http://www.currenthost.com/controller/action" />
+      #   auto_discovery_link_tag(:rss, {action: "feed"})
+      #   # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/feed" />
+      #   auto_discovery_link_tag(:rss, {action: "feed"}, {title: "My RSS"})
+      #   # => <link rel="alternate" type="application/rss+xml" title="My RSS" href="http://www.currenthost.com/controller/feed" />
+      #   auto_discovery_link_tag(:rss, {controller: "news", action: "feed"})
+      #   # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/news/feed" />
+      #   auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {title: "Example RSS"})
+      #   # => <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed" />
       def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {})
+        if !(type == :rss || type == :atom) && tag_options[:type].blank?
+          message = "You have passed type other than :rss or :atom to auto_discovery_link_tag and haven't supplied " +
+                    "the :type option key. This behavior is deprecated and will be remove in Rails 4.1. You should pass " +
+                    ":type option explicitly if you want to use other types, for example: " +
+                    "auto_discovery_link_tag(:xml, '/feed.xml', :type => 'application/xml')"
+          ActiveSupport::Deprecation.warn message
+        end
+
         tag(
           "link",
           "rel"   => tag_options[:rel] || "alternate",
@@ -228,29 +143,25 @@ module ActionView
         )
       end
 
-      #   <%= favicon_link_tag %>
-      #
-      # generates
-      #
-      #   <link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
-      #
-      # You may specify a different file in the first argument:
+      # Returns a link loading a favicon file. You may specify a different file
+      # in the first argument. The helper accepts an additional options hash where
+      # you can override "rel" and "type".
       #
-      #   <%= favicon_link_tag '/myicon.ico' %>
-      #
-      # That's passed to +path_to_image+ as is, so it gives
-      #
-      #   <link href="/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      # ==== Options
+      # * <tt>:rel</tt>   - Specify the relation of this link, defaults to 'shortcut icon'
+      # * <tt>:type</tt>  - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon'
       #
-      # The helper accepts an additional options hash where you can override "rel" and "type".
+      #   favicon_link_tag '/myicon.ico'
+      #   # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
-      # For example, Mobile Safari looks for a different LINK tag, pointing to an image that
+      # Mobile Safari looks for a different <link> tag, pointing to an image that
       # will be used if you add the page to the home screen of an iPod Touch, iPhone, or iPad.
       # The following call would generate such a tag:
       #
-      #   <%= favicon_link_tag 'mb-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
+      #   favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png'
+      #   # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" />
       #
-      def favicon_link_tag(source='/favicon.ico', options={})
+      def favicon_link_tag(source='favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
           :type => 'image/vnd.microsoft.icon',
@@ -258,70 +169,8 @@ module ActionView
         }.merge(options.symbolize_keys))
       end
 
-      # Computes the path to an image asset in the public images directory.
-      # Full paths from the document root will be passed through.
-      # Used internally by +image_tag+ to build the image path:
-      #
-      #   image_path("edit")                                         # => "/images/edit"
-      #   image_path("edit.png")                                     # => "/images/edit.png"
-      #   image_path("icons/edit.png")                               # => "/images/icons/edit.png"
-      #   image_path("/icons/edit.png")                              # => "/icons/edit.png"
-      #   image_path("http://www.example.com/img/edit.png")          # => "http://www.example.com/img/edit.png"
-      #
-      # If you have images as application resources this method may conflict with their named routes.
-      # The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and
-      # plugin authors are encouraged to do so.
-      def image_path(source)
-        source.present? ? asset_paths.compute_public_path(source, 'images') : ""
-      end
-      alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
-
-      # Computes the path to a video asset in the public videos directory.
-      # Full paths from the document root will be passed through.
-      # Used internally by +video_tag+ to build the video path.
-      #
-      # ==== Examples
-      #   video_path("hd")                                            # => /videos/hd
-      #   video_path("hd.avi")                                        # => /videos/hd.avi
-      #   video_path("trailers/hd.avi")                               # => /videos/trailers/hd.avi
-      #   video_path("/trailers/hd.avi")                              # => /trailers/hd.avi
-      #   video_path("http://www.example.com/vid/hd.avi")             # => http://www.example.com/vid/hd.avi
-      def video_path(source)
-        asset_paths.compute_public_path(source, 'videos')
-      end
-      alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
-
-      # Computes the path to an audio asset in the public audios directory.
-      # Full paths from the document root will be passed through.
-      # Used internally by +audio_tag+ to build the audio path.
-      #
-      # ==== Examples
-      #   audio_path("horse")                                            # => /audios/horse
-      #   audio_path("horse.wav")                                        # => /audios/horse.wav
-      #   audio_path("sounds/horse.wav")                                 # => /audios/sounds/horse.wav
-      #   audio_path("/sounds/horse.wav")                                # => /sounds/horse.wav
-      #   audio_path("http://www.example.com/sounds/horse.wav")          # => http://www.example.com/sounds/horse.wav
-      def audio_path(source)
-        asset_paths.compute_public_path(source, 'audios')
-      end
-      alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
-
-      # Computes the path to a font asset in the public fonts directory.
-      # Full paths from the document root will be passed through.
-      #
-      # ==== Examples
-      #   font_path("font")                                           # => /fonts/font
-      #   font_path("font.ttf")                                       # => /fonts/font.ttf
-      #   font_path("dir/font.ttf")                                   # => /fonts/dir/font.ttf
-      #   font_path("/dir/font.ttf")                                  # => /dir/font.ttf
-      #   font_path("http://www.example.com/dir/font.ttf")            # => http://www.example.com/dir/font.ttf
-      def font_path(source)
-        asset_paths.compute_public_path(source, 'fonts')
-      end
-      alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
-
-      # Returns an html image tag for the +source+. The +source+ can be a full
-      # path or a file that exists in your public images directory.
+      # Returns an HTML image tag for the +source+. The +source+ can be a full
+      # path or a file.
       #
       # ==== Options
       # You can add HTML attributes using the +options+. The +options+ supports
@@ -329,32 +178,26 @@ module ActionView
       #
       # * <tt>:alt</tt>  - If no alt text is given, the file name part of the
       #   +source+ is used (capitalized and without the extension)
-      # * <tt>:size</tt> - Supplied as "{Width}x{Height}", so "30x45" becomes
-      #   width="30" and height="45". <tt>:size</tt> will be ignored if the
-      #   value is not in the correct format.
-      # * <tt>:mouseover</tt> - Set an alternate image to be used when the onmouseover
-      #   event is fired, and sets the original image to be replaced onmouseout.
-      #   This can be used to implement an easy image toggle that fires on onmouseover.
+      # * <tt>:size</tt> - Supplied as "{Width}x{Height}" or "{Number}", so "30x45" becomes
+      #   width="30" and height="45", and "50" becomes width="50" and height="50".
+      #   <tt>:size</tt> will be ignored if the value is not in the correct format.
       #
       # ==== Examples
-      #  image_tag("icon")  # =>
-      #    <img src="/images/icon" alt="Icon" />
-      #  image_tag("icon.png")  # =>
-      #    <img src="/images/icon.png" alt="Icon" />
-      #  image_tag("icon.png", :size => "16x10", :alt => "Edit Entry")  # =>
-      #    <img src="/images/icon.png" width="16" height="10" alt="Edit Entry" />
-      #  image_tag("/icons/icon.gif", :size => "16x16")  # =>
-      #    <img src="/icons/icon.gif" width="16" height="16" alt="Icon" />
-      #  image_tag("/icons/icon.gif", :height => '32', :width => '32') # =>
-      #    <img alt="Icon" height="32" src="/icons/icon.gif" width="32" />
-      #  image_tag("/icons/icon.gif", :class => "menu_icon") # =>
-      #    <img alt="Icon" class="menu_icon" src="/icons/icon.gif" />
-      #  image_tag("mouse.png", :mouseover => "/images/mouse_over.png") # =>
-      #    <img src="/images/mouse.png" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" alt="Mouse" />
-      #  image_tag("mouse.png", :mouseover => image_path("mouse_over.png")) # =>
-      #    <img src="/images/mouse.png" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" alt="Mouse" />
-      def image_tag(source, options = {})
-        options.symbolize_keys!
+      #
+      #   image_tag("icon")
+      #   # => <img alt="Icon" src="/assets/icon" />
+      #   image_tag("icon.png")
+      #   # => <img alt="Icon" src="/assets/icon.png" />
+      #   image_tag("icon.png", size: "16x10", alt: "Edit Entry")
+      #   # => <img src="/assets/icon.png" width="16" height="10" alt="Edit Entry" />
+      #   image_tag("/icons/icon.gif", size: "16")
+      #   # => <img src="/icons/icon.gif" width="16" height="16" alt="Icon" />
+      #   image_tag("/icons/icon.gif", height: '32', width: '32')
+      #   # => <img alt="Icon" height="32" src="/icons/icon.gif" width="32" />
+      #   image_tag("/icons/icon.gif", class: "menu_icon")
+      #   # => <img alt="Icon" class="menu_icon" src="/icons/icon.gif" />
+      def image_tag(source, options={})
+        options = options.symbolize_keys
 
         src = options[:src] = path_to_image(source)
 
@@ -363,19 +206,32 @@ module ActionView
         end
 
         if size = options.delete(:size)
-          options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
-        end
-
-        if mouseover = options.delete(:mouseover)
-          options[:onmouseover] = "this.src='#{path_to_image(mouseover)}'"
-          options[:onmouseout]  = "this.src='#{src}'"
+          options[:width], options[:height] = size.split("x") if size =~ %r{\A\d+x\d+\z}
+          options[:width] = options[:height] = size if size =~ %r{\A\d+\z}
         end
 
         tag("img", options)
       end
 
+      # Returns a string suitable for an html image tag alt attribute.
+      # The +src+ argument is meant to be an image file path.
+      # The method removes the basename of the file path and the digest,
+      # if any. It also removes hyphens and underscores from file names and
+      # replaces them with spaces, returning a space-separated, titleized
+      # string.
+      #
+      # ==== Examples
+      #
+      #   image_tag('rails.png')
+      #   # => <img alt="Rails" src="/assets/rails.png" />
+      #
+      #   image_tag('hyphenated-file-name.png')
+      #   # => <img alt="Hyphenated file name" src="/assets/hyphenated-file-name.png" />
+      #
+      #   image_tag('underscored_file_name.png')
+      #   # => <img alt="Underscored file name" src="/assets/underscored_file_name.png" />
       def image_alt(src)
-        File.basename(src, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize
+        File.basename(src, '.*').sub(/-[[:xdigit:]]{32}\z/, '').tr('-_', ' ').capitalize
       end
 
       # Returns an html video tag for the +sources+. If +sources+ is a string,
@@ -394,63 +250,65 @@ module ActionView
       #   width="30" and height="45". <tt>:size</tt> will be ignored if the
       #   value is not in the correct format.
       #
-      # ==== Examples
-      #  video_tag("trailer")  # =>
-      #    <video src="/videos/trailer" />
-      #  video_tag("trailer.ogg")  # =>
-      #    <video src="/videos/trailer.ogg" />
-      #  video_tag("trailer.ogg", :controls => true, :autobuffer => true)  # =>
-      #    <video autobuffer="autobuffer" controls="controls" src="/videos/trailer.ogg" />
-      #  video_tag("trailer.m4v", :size => "16x10", :poster => "screenshot.png")  # =>
-      #    <video src="/videos/trailer.m4v" width="16" height="10" poster="/images/screenshot.png" />
-      #  video_tag("/trailers/hd.avi", :size => "16x16")  # =>
-      #    <video src="/trailers/hd.avi" width="16" height="16" />
-      #  video_tag("/trailers/hd.avi", :height => '32', :width => '32') # =>
-      #    <video height="32" src="/trailers/hd.avi" width="32" />
-      #  video_tag(["trailer.ogg", "trailer.flv"]) # =>
-      #    <video><source src="trailer.ogg" /><source src="trailer.ogg" /><source src="trailer.flv" /></video>
-      #  video_tag(["trailer.ogg", "trailer.flv"] :size => "160x120") # =>
-      #    <video height="120" width="160"><source src="trailer.ogg" /><source src="trailer.flv" /></video>
-      def video_tag(sources, options = {})
-        options.symbolize_keys!
-
-        options[:poster] = path_to_image(options[:poster]) if options[:poster]
+      #   video_tag("trailer")
+      #   # => <video src="/videos/trailer" />
+      #   video_tag("trailer.ogg")
+      #   # => <video src="/videos/trailer.ogg" />
+      #   video_tag("trailer.ogg", controls: true, autobuffer: true)
+      #   # => <video autobuffer="autobuffer" controls="controls" src="/videos/trailer.ogg" />
+      #   video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png")
+      #   # => <video src="/videos/trailer.m4v" width="16" height="10" poster="/assets/screenshot.png" />
+      #   video_tag("/trailers/hd.avi", size: "16x16")
+      #   # => <video src="/trailers/hd.avi" width="16" height="16" />
+      #   video_tag("/trailers/hd.avi", height: '32', width: '32')
+      #   # => <video height="32" src="/trailers/hd.avi" width="32" />
+      #   video_tag("trailer.ogg", "trailer.flv")
+      #   # => <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
+      #   video_tag(["trailer.ogg", "trailer.flv"])
+      #   # => <video><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
+      #   video_tag(["trailer.ogg", "trailer.flv"], size: "160x120")
+      #   # => <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
+      def video_tag(*sources)
+        multiple_sources_tag('video', sources) do |options|
+          options[:poster] = path_to_image(options[:poster]) if options[:poster]
 
-        if size = options.delete(:size)
-          options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
-        end
-
-        if sources.is_a?(Array)
-          content_tag("video", options) do
-            sources.map { |source| tag("source", :src => source) }.join.html_safe
+          if size = options.delete(:size)
+            options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
           end
-        else
-          options[:src] = path_to_video(sources)
-          tag("video", options)
         end
       end
 
-      # Returns an html audio tag for the +source+.
+      # Returns an HTML audio tag for the +source+.
       # The +source+ can be full path or file that exists in
       # your public audios directory.
       #
-      # ==== Examples
-      #  audio_tag("sound")  # =>
-      #    <audio src="/audios/sound" />
-      #  audio_tag("sound.wav")  # =>
-      #    <audio src="/audios/sound.wav" />
-      #  audio_tag("sound.wav", :autoplay => true, :controls => true)  # =>
-      #    <audio autoplay="autoplay" controls="controls" src="/audios/sound.wav" />
-      def audio_tag(source, options = {})
-        options.symbolize_keys!
-        options[:src] = path_to_audio(source)
-        tag("audio", options)
+      #   audio_tag("sound")
+      #   # => <audio src="/audios/sound" />
+      #   audio_tag("sound.wav")
+      #   # => <audio src="/audios/sound.wav" />
+      #   audio_tag("sound.wav", autoplay: true, controls: true)
+      #   # => <audio autoplay="autoplay" controls="controls" src="/audios/sound.wav" />
+      #   audio_tag("sound.wav", "sound.mid")
+      #   # => <audio><source src="/audios/sound.wav" /><source src="/audios/sound.mid" /></audio>
+      def audio_tag(*sources)
+        multiple_sources_tag('audio', sources)
       end
 
       private
+        def multiple_sources_tag(type, sources)
+          options = sources.extract_options!.symbolize_keys
+          sources.flatten!
+
+          yield options if block_given?
 
-        def asset_paths
-          @asset_paths ||= AssetTagHelper::AssetPaths.new(config, controller)
+          if sources.size > 1
+            content_tag(type, options) do
+              safe_join sources.map { |source| tag("source", :src => send("path_to_#{type}", source)) }
+            end
+          else
+            options[:src] = send("path_to_#{type}", sources.first)
+            content_tag(type, nil, options)
+          end
         end
     end
   end