actionpack 3.2.19 → 4.0.0

data/lib/action_view/template.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/kernel/singleton_class'
 require 'thread'
@@ -82,8 +80,7 @@ module ActionView
     # problems with converting the user's data to
     # the <tt>default_internal</tt>.
     #
-    # To do so, simply raise the raise +WrongEncodingError+
-    # as follows:
+    # To do so, simply raise +WrongEncodingError+ as follows:
     #
     #     raise WrongEncodingError.new(
     #       problematic_string,
@@ -94,6 +91,7 @@ module ActionView
       autoload :Error
       autoload :Handlers
       autoload :Text
+      autoload :Types
     end
 
     extend Template::Handlers
@@ -123,7 +121,7 @@ module ActionView
       @locals            = details[:locals] || []
       @virtual_path      = details[:virtual_path]
       @updated_at        = details[:updated_at] || Time.now
-      @formats = Array.wrap(format).map { |f| f.is_a?(Mime::Type) ? f.ref : f }
+      @formats           = Array(format).map { |f| f.respond_to?(:ref) ? f.ref : f  }
       @compile_mutex     = Mutex.new
     end
 
@@ -140,7 +138,7 @@ module ActionView
     # we use a bang in this instrumentation because you don't want to
     # consume this in production. This is only slow if it's being listened to.
     def render(view, locals, buffer=nil, &block)
-      ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
+      ActiveSupport::Notifications.instrument("!render_template.action_view", virtual_path: @virtual_path, identifier: @identifier) do
         compile!(view)
         view.send(method_name, locals, buffer, &block)
       end
@@ -149,9 +147,15 @@ module ActionView
     end
 
     def mime_type
+      message = 'Template#mime_type is deprecated and will be removed in Rails 4.1. Please use type method instead.'
+      ActiveSupport::Deprecation.warn message
       @mime_type ||= Mime::Type.lookup_by_extension(@formats.first.to_s) if @formats.first
     end
 
+    def type
+      @type ||= Types[@formats.first] if @formats.first
+    end
+
     # Receives a view object and return a template similar to self by using @virtual_path.
     #
     # This method is useful if you have a template object but it does not contain its source
@@ -186,7 +190,7 @@ module ActionView
     # before passing the source on to the template engine, leaving a
     # blank line in its stead.
     def encode!
-      return unless source.encoding_aware? && source.encoding == Encoding::BINARY
+      return unless source.encoding == Encoding::BINARY
 
       # Look for # encoding: *. If we find one, we'll encode the
       # String in that encoding, otherwise, we'll use the
@@ -277,20 +281,18 @@ module ActionView
           end
         end_src
 
-        if source.encoding_aware?
-          # Make sure the source is in the encoding of the returned code
-          source.force_encoding(code.encoding)
+        # Make sure the source is in the encoding of the returned code
+        source.force_encoding(code.encoding)
 
-          # In case we get back a String from a handler that is not in
-          # BINARY or the default_internal, encode it to the default_internal
-          source.encode!
+        # In case we get back a String from a handler that is not in
+        # BINARY or the default_internal, encode it to the default_internal
+        source.encode!
 
-          # Now, validate that the source we got back from the template
-          # handler is valid in the default_internal. This is for handlers
-          # that handle encoding but screw up
-          unless source.valid_encoding?
-            raise WrongEncodingError.new(@source, Encoding.default_internal)
-          end
+        # Now, validate that the source we got back from the template
+        # handler is valid in the default_internal. This is for handlers
+        # that handle encoding but screw up
+        unless source.valid_encoding?
+          raise WrongEncodingError.new(@source, Encoding.default_internal)
         end
 
         begin
@@ -303,7 +305,7 @@ module ActionView
             logger.debug "Backtrace: #{e.backtrace.join("\n")}"
           end
 
-          raise ActionView::Template::Error.new(self, {}, e)
+          raise ActionView::Template::Error.new(self, e)
         end
       end
 
@@ -312,18 +314,18 @@ module ActionView
           e.sub_template_of(self)
           raise e
         else
-          assigns  = view.respond_to?(:assigns) ? view.assigns : {}
           template = self
           unless template.source
             template = refresh(view)
             template.encode!
           end
-          raise Template::Error.new(template, assigns, e)
+          raise Template::Error.new(template, e)
         end
       end
 
       def locals_code #:nodoc:
-        @locals.map { |key| "#{key} = local_assigns[:#{key}];" }.join
+        # Double assign to suppress the dreaded 'assigned but unused variable' warning
+        @locals.map { |key| "#{key} = #{key} = local_assigns[:#{key}];" }.join
       end
 
       def method_name #:nodoc:

data/lib/action_view/test_case.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/remove_method'
 require 'action_controller'
 require 'action_controller/test_case'
@@ -40,10 +38,13 @@ module ActionView
       include ActionView::Context
 
       include ActionDispatch::Routing::PolymorphicRoutes
-      include ActionController::RecordIdentifier
 
       include AbstractController::Helpers
       include ActionView::Helpers
+      include ActionView::RecordIdentifier
+      include ActionView::RoutingUrlFor
+
+      include ActiveSupport::Testing::ConstantLookup
 
       delegate :lookup_context, :to => :controller
       attr_accessor :controller, :output_buffer, :rendered
@@ -59,10 +60,9 @@ module ActionView
         end
 
         def determine_default_helper_class(name)
-          mod = name.sub(/Test$/, '').constantize
-          mod.is_a?(Class) ? nil : mod
-        rescue NameError
-          nil
+          determine_constant_from_test_name(name) do |constant|
+            Module === constant && !(Class === constant)
+          end
         end
 
         def helper_method(*methods)
@@ -116,8 +116,33 @@ module ActionView
         output
       end
 
-      def locals
-        @locals ||= {}
+      def rendered_views
+        @_rendered_views ||= RenderedViewsCollection.new
+      end
+
+      class RenderedViewsCollection
+        def initialize
+          @rendered_views ||= Hash.new { |hash, key| hash[key] = [] }
+        end
+
+        def add(view, locals)
+          @rendered_views[view] ||= []
+          @rendered_views[view] << locals
+        end
+
+        def locals_for(view)
+          @rendered_views[view]
+        end
+
+        def rendered_views
+          @rendered_views.keys
+        end
+
+        def view_rendered?(view, expected_locals)
+          locals_for(view).any? do |actual_locals|
+            expected_locals.all? {|key, value| value == actual_locals[key] }
+          end
+        end
       end
 
       included do
@@ -153,18 +178,18 @@ module ActionView
       end
 
       module Locals
-        attr_accessor :locals
+        attr_accessor :rendered_views
 
         def render(options = {}, local_assigns = {})
           case options
           when Hash
             if block_given?
-              locals[options[:layout]] = options[:locals]
+              rendered_views.add options[:layout], options[:locals]
             elsif options.key?(:partial)
-              locals[options[:partial]] = options[:locals]
+              rendered_views.add options[:partial], options[:locals]
             end
           else
-            locals[options] = local_assigns
+            rendered_views.add options, local_assigns
           end
 
           super
@@ -177,7 +202,7 @@ module ActionView
           view = @controller.view_context
           view.singleton_class.send :include, _helpers
           view.extend(Locals)
-          view.locals = self.locals
+          view.rendered_views = self.rendered_views
           view.output_buffer = self.output_buffer
           view
         end
@@ -185,32 +210,34 @@ module ActionView
 
       alias_method :_view, :view
 
-      INTERNAL_IVARS = %w{
-        @__name__
-        @__io__
-        @_assertion_wrapped
-        @_assertions
-        @_result
-        @_routes
-        @controller
-        @layouts
-        @locals
-        @method_name
-        @output_buffer
-        @partials
-        @passed
-        @rendered
-        @request
-        @routes
-        @templates
-        @options
-        @test_passed
-        @view
-        @view_context_class
-      }
+      INTERNAL_IVARS = [
+        :@__name__,
+        :@__io__,
+        :@_assertion_wrapped,
+        :@_assertions,
+        :@_result,
+        :@_routes,
+        :@controller,
+        :@_layouts,
+        :@_files,
+        :@_rendered_views,
+        :@method_name,
+        :@output_buffer,
+        :@_partials,
+        :@passed,
+        :@rendered,
+        :@request,
+        :@routes,
+        :@tagged_logger,
+        :@_templates,
+        :@options,
+        :@test_passed,
+        :@view,
+        :@view_context_class
+      ]
 
       def _user_defined_ivars
-        instance_variables.map(&:to_s) - INTERNAL_IVARS
+        instance_variables - INTERNAL_IVARS
       end
 
       # Returns a Hash of instance variables and their values, as defined by
@@ -218,8 +245,8 @@ module ActionView
       # rendered. This is generally intended for internal use and extension
       # frameworks.
       def view_assigns
-        Hash[_user_defined_ivars.map do |var|
-          [var[1, var.length].to_sym, instance_variable_get(var)]
+        Hash[_user_defined_ivars.map do |ivar|
+          [ivar[1..-1].to_sym, instance_variable_get(ivar)]
         end]
       end
 
@@ -236,10 +263,8 @@ module ActionView
           super
         end
       end
-
     end
 
     include Behavior
-
   end
 end

data/lib/{action_controller → action_view}/vendor/html-scanner/html/node.rb

@@ -383,32 +383,32 @@ module HTML #:nodoc:
     # Usage:
     #
     #   # test if the node is a "span" tag
-    #   node.match :tag => "span"
+    #   node.match tag: "span"
     #
     #   # test if the node's parent is a "div"
-    #   node.match :parent => { :tag => "div" }
+    #   node.match parent: { tag: "div" }
     #
     #   # test if any of the node's ancestors are "table" tags
-    #   node.match :ancestor => { :tag => "table" }
+    #   node.match ancestor: { tag: "table" }
     #
     #   # test if any of the node's immediate children are "em" tags
-    #   node.match :child => { :tag => "em" }
+    #   node.match child: { tag: "em" }
     #
     #   # test if any of the node's descendants are "strong" tags
-    #   node.match :descendant => { :tag => "strong" }
+    #   node.match descendant: { tag: "strong" }
     #
     #   # test if the node has between 2 and 4 span tags as immediate children
-    #   node.match :children => { :count => 2..4, :only => { :tag => "span" } }
+    #   node.match children: { count: 2..4, only: { tag: "span" } }
     #
     #   # get funky: test to see if the node is a "div", has a "ul" ancestor
     #   # and an "li" parent (with "class" = "enum"), and whether or not it has
     #   # a "span" descendant that contains # text matching /hello world/:
-    #   node.match :tag => "div",
-    #              :ancestor => { :tag => "ul" },
-    #              :parent => { :tag => "li",
-    #                           :attributes => { :class => "enum" } },
-    #              :descendant => { :tag => "span",
-    #                               :child => /hello world/ }
+    #   node.match tag: "div",
+    #              ancestor: { tag: "ul" },
+    #              parent: { tag: "li",
+    #                           attributes: { class: "enum" } },
+    #              descendant: { tag: "span",
+    #                               child: /hello world/ }
     def match(conditions)
       conditions = validate_conditions(conditions)
       # check content of child nodes

data/lib/{action_controller → action_view}/vendor/html-scanner/html/sanitizer.rb

@@ -1,10 +1,11 @@
 require 'set'
 require 'cgi'
-require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module HTML
   class Sanitizer
     def sanitize(text, options = {})
+      validate_options(options)
       return text unless sanitizeable?(text)
       tokenize(text, options).join
     end
@@ -27,6 +28,16 @@ module HTML
     def process_node(node, result, options)
       result << node.to_s
     end
+
+    def validate_options(options)
+      if options[:tags] && !options[:tags].is_a?(Enumerable)
+        raise ArgumentError, "You should pass :tags as an Enumerable"
+      end
+
+      if options[:attributes] && !options[:attributes].is_a?(Enumerable)
+        raise ArgumentError, "You should pass :attributes as an Enumerable"
+      end
+    end
   end
 
   class FullSanitizer < Sanitizer
@@ -88,7 +99,7 @@ module HTML
     self.allowed_protocols      = Set.new(%w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto
       feed svn urn aim rsync tag ssh sftp rtsp afs))
 
-    # Specifies the default Set of acceptable css keywords that #sanitize and #sanitize_css will accept.
+    # Specifies the default Set of acceptable css properties that #sanitize and #sanitize_css will accept.
     self.allowed_css_properties = Set.new(%w(azimuth background-color border-bottom-color border-collapse
       border-color border-left-color border-right-color border-top-color clear color cursor direction display
       elevation float font font-family font-size font-style font-variant font-weight height letter-spacing line-height

data/lib/{action_controller → action_view}/vendor/html-scanner/html/selector.rb

@@ -160,7 +160,7 @@ module HTML
   # * <tt>:not(selector)</tt> -- Match the element only if the element does not
   #   match the simple selector.
   #
-  # As you can see, <tt>:nth-child<tt> pseudo class and its variant can get quite
+  # As you can see, <tt>:nth-child</tt> pseudo class and its variant can get quite
   # tricky and the CSS specification doesn't do a much better job explaining it.
   # But after reading the examples and trying a few combinations, it's easy to
   # figure out.
@@ -537,7 +537,7 @@ module HTML
       # Get identifier, class, attribute name, pseudo or negation.
       while true
         # Element identifier.
-        next if statement.sub!(/^#(\?|[\w\-]+)/) do |match|
+        next if statement.sub!(/^#(\?|[\w\-]+)/) do
           id = $1
           if id == "?"
             id = values.shift
@@ -549,7 +549,7 @@ module HTML
         end
 
         # Class name.
-        next if statement.sub!(/^\.([\w\-]+)/) do |match|
+        next if statement.sub!(/^\.([\w\-]+)/) do
           class_name = $1
           @source << ".#{class_name}"
           class_name = Regexp.new("(^|\s)#{Regexp.escape(class_name)}($|\s)") unless class_name.is_a?(Regexp)
@@ -558,7 +558,7 @@ module HTML
         end
 
         # Attribute value.
-        next if statement.sub!(/^\[\s*([[:alpha:]][\w\-:]*)\s*((?:[~|^$*])?=)?\s*('[^']*'|"[^*]"|[^\]]*)\s*\]/) do |match|
+        next if statement.sub!(/^\[\s*([[:alpha:]][\w\-:]*)\s*((?:[~|^$*])?=)?\s*('[^']*'|"[^*]"|[^\]]*)\s*\]/) do
           name, equality, value = $1, $2, $3
           if value == "?"
             value = values.shift
@@ -575,7 +575,7 @@ module HTML
         end
 
         # Root element only.
-        next if statement.sub!(/^:root/) do |match|
+        next if statement.sub!(/^:root/) do
           pseudo << lambda do |element|
             element.parent.nil? || !element.parent.tag?
           end
@@ -611,7 +611,7 @@ module HTML
           "" # Remove
         end
         # First/last child (of type).
-        next if statement.sub!(/^:(first|last)-(child|of-type)/) do |match|
+        next if statement.sub!(/^:(first|last)-(child|of-type)/) do
           reverse = $1 == "last"
           of_type = $2 == "of-type"
           pseudo << nth_child(0, 1, of_type, reverse)
@@ -619,7 +619,7 @@ module HTML
           "" # Remove
         end
         # Only child (of type).
-        next if statement.sub!(/^:only-(child|of-type)/) do |match|
+        next if statement.sub!(/^:only-(child|of-type)/) do
           of_type = $1 == "of-type"
           pseudo << only_child(of_type)
           @source << ":only-#{$1}"
@@ -628,7 +628,7 @@ module HTML
 
         # Empty: no child elements or meaningful content (whitespaces
         # are ignored).
-        next if statement.sub!(/^:empty/) do |match|
+        next if statement.sub!(/^:empty/) do
           pseudo << lambda do |element|
             empty = true
             for child in element.children
@@ -644,7 +644,7 @@ module HTML
         end
         # Content: match the text content of the element, stripping
         # leading and trailing spaces.
-        next if statement.sub!(/^:content\(\s*(\?|'[^']*'|"[^"]*"|[^)]*)\s*\)/) do |match|
+        next if statement.sub!(/^:content\(\s*(\?|'[^']*'|"[^"]*"|[^)]*)\s*\)/) do
           content = $1
           if content == "?"
             content = values.shift

data/lib/{action_controller → action_view}/vendor/html-scanner/html/tokenizer.rb

@@ -23,7 +23,7 @@ module HTML #:nodoc:
 
     # Create a new Tokenizer for the given text.
     def initialize(text)
-      text.encode! if text.encoding_aware?
+      text.encode!
       @scanner = StringScanner.new(text)
       @position = 0
       @line = 0

data/lib/action_view/vendor/html-scanner.rb

@@ -0,0 +1,20 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/html-scanner"
+
+module HTML
+  extend ActiveSupport::Autoload
+
+  eager_autoload do
+    autoload :CDATA, 'html/node'
+    autoload :Document, 'html/document'
+    autoload :FullSanitizer, 'html/sanitizer'
+    autoload :LinkSanitizer, 'html/sanitizer'
+    autoload :Node, 'html/node'
+    autoload :Sanitizer, 'html/sanitizer'
+    autoload :Selector, 'html/selector'
+    autoload :Tag, 'html/node'
+    autoload :Text, 'html/node'
+    autoload :Tokenizer, 'html/tokenizer'
+    autoload :Version, 'html/version'
+    autoload :WhiteListSanitizer, 'html/sanitizer'
+  end
+end

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