actionpack 3.2.22.5 → 4.0.0.beta1

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

@@ -3,7 +3,7 @@ module ActionView
     class Builder
       # Default format used by Builder.
       class_attribute :default_format
-      self.default_format = Mime::XML
+      self.default_format = :xml
 
       def call(template)
         require_engine

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

@@ -1,5 +1,4 @@
 require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute'
 require 'erubis'
 
 module ActionView
@@ -78,27 +77,23 @@ module ActionView
         end
 
         def call(template)
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
+          # First, convert to BINARY, so in case the encoding is
+          # wrong, we can still find an encoding tag
+          # (<%# encoding %>) inside the String using a regular
+          # expression
+          template_source = template.source.dup.force_encoding(Encoding::ASCII_8BIT)
 
-            erb = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
+          erb = template_source.gsub(ENCODING_TAG, '')
+          encoding = $2
 
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
+          erb.force_encoding valid_encoding(template.source.dup, encoding)
 
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
+          # Always make sure we return a String in the default_internal
+          erb.encode!
 
           self.class.erb_implementation.new(
             erb,
-            :escape => (self.class.escape_whitelist.include? template.mime_type),
+            :escape => (self.class.escape_whitelist.include? template.type),
             :trim => (self.class.erb_trim_mode == "-")
           ).src
         end

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

@@ -0,0 +1,11 @@
+module ActionView
+  module Template::Handlers
+    class Raw
+      def call(template)
+        escaped = template.source.gsub(':', '\:')
+
+        '%q:' + escaped + ':;'
+      end
+    end
+  end
+end

data/lib/action_view/template/resolver.rb

@@ -1,14 +1,15 @@
 require "pathname"
 require "active_support/core_ext/class"
-require "active_support/core_ext/io"
-require "active_support/core_ext/string/starts_ends_with"
+require "active_support/core_ext/class/attribute_accessors"
 require "action_view/template"
+require "thread"
+require "thread_safe"
 
 module ActionView
   # = Action View Resolver
   class Resolver
     # Keeps all information about view path and builds virtual path.
-    class Path < String
+    class Path
       attr_reader :name, :prefix, :partial, :virtual
       alias_method :partial?, :partial
 
@@ -20,8 +21,76 @@ module ActionView
       end
 
       def initialize(name, prefix, partial, virtual)
-        @name, @prefix, @partial = name, prefix, partial
-        super(virtual)
+        @name    = name
+        @prefix  = prefix
+        @partial = partial
+        @virtual = virtual
+      end
+
+      def to_str
+        @virtual
+      end
+      alias :to_s :to_str
+    end
+
+    # Threadsafe template cache
+    class Cache #:nodoc:
+      class SmallCache < ThreadSafe::Cache
+        def initialize(options = {})
+          super(options.merge(:initial_capacity => 2))
+        end
+      end
+
+      # preallocate all the default blocks for performance/memory consumption reasons
+      PARTIAL_BLOCK = lambda {|cache, partial| cache[partial] = SmallCache.new}
+      PREFIX_BLOCK  = lambda {|cache, prefix|  cache[prefix]  = SmallCache.new(&PARTIAL_BLOCK)}
+      NAME_BLOCK    = lambda {|cache, name|    cache[name]    = SmallCache.new(&PREFIX_BLOCK)}
+      KEY_BLOCK     = lambda {|cache, key|     cache[key]     = SmallCache.new(&NAME_BLOCK)}
+
+      # usually a majority of template look ups return nothing, use this canonical preallocated array to safe memory
+      NO_TEMPLATES = [].freeze
+
+      def initialize
+        @data = SmallCache.new(&KEY_BLOCK)
+      end
+
+      # Cache the templates returned by the block
+      def cache(key, name, prefix, partial, locals)
+        if Resolver.caching?
+          @data[key][name][prefix][partial][locals] ||= canonical_no_templates(yield)
+        else
+          fresh_templates  = yield
+          cached_templates = @data[key][name][prefix][partial][locals]
+
+          if templates_have_changed?(cached_templates, fresh_templates)
+            @data[key][name][prefix][partial][locals] = canonical_no_templates(fresh_templates)
+          else
+            cached_templates || NO_TEMPLATES
+          end
+        end
+      end
+
+      def clear
+        @data.clear
+      end
+
+      private
+
+      def canonical_no_templates(templates)
+        templates.empty? ? NO_TEMPLATES : templates
+      end
+
+      def templates_have_changed?(cached_templates, fresh_templates)
+        # if either the old or new template list is empty, we don't need to (and can't)
+        # compare modification times, and instead just check whether the lists are different
+        if cached_templates.blank? || fresh_templates.blank?
+          return fresh_templates.blank? != cached_templates.blank?
+        end
+
+        cached_templates_max_updated_at = cached_templates.map(&:updated_at).max
+
+        # if a template has changed, it will be now be newer than all the cached templates
+        fresh_templates.any? { |t| t.updated_at > cached_templates_max_updated_at }
       end
     end
 
@@ -33,36 +102,29 @@ module ActionView
     end
 
     def initialize
-      @cached = Hash.new { |h1,k1| h1[k1] = Hash.new { |h2,k2|
-        h2[k2] = Hash.new { |h3,k3| h3[k3] = Hash.new { |h4,k4| h4[k4] = {} } } } }
+      @cache = Cache.new
     end
 
     def clear_cache
-      @cached.clear
+      @cache.clear
     end
 
     # Normalizes the arguments and passes it on to find_template.
     def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
       cached(key, [name, prefix, partial], details, locals) do
-        find_templates(name, prefix, partial, details, false)
-      end
-    end
-
-    def find_all_anywhere(name, prefix, partial=false, details={}, key=nil, locals=[])
-      cached(key, [name, prefix, partial], details, locals) do
-        find_templates(name, prefix, partial, details, true)
+        find_templates(name, prefix, partial, details)
       end
     end
 
   private
 
-    delegate :caching?, :to => "self.class"
+    delegate :caching?, to: :class
 
     # This is what child classes implement. No defaults are needed
     # because Resolver guarantees that the arguments are present and
     # normalized.
-    def find_templates(name, prefix, partial, details, outside_app_allowed = false)
-      raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details, outside_app_allowed) method"
+    def find_templates(name, prefix, partial, details)
+      raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details) method"
     end
 
     # Helpers that builds a path. Useful for building virtual paths.
@@ -72,27 +134,18 @@ module ActionView
 
     # Handles templates caching. If a key is given and caching is on
     # always check the cache before hitting the resolver. Otherwise,
-    # it always hits the resolver but check if the resolver is fresher
-    # before returning it.
+    # it always hits the resolver but if the key is present, check if the
+    # resolver is fresher before returning it.
     def cached(key, path_info, details, locals) #:nodoc:
       name, prefix, partial = path_info
       locals = locals.map { |x| x.to_s }.sort!
 
-      if key && caching?
-        @cached[key][name][prefix][partial][locals] ||= decorate(yield, path_info, details, locals)
-      else
-        fresh = decorate(yield, path_info, details, locals)
-        return fresh unless key
-
-        scope = @cached[key][name][prefix][partial]
-        cache = scope[locals]
-        mtime = cache && cache.map(&:updated_at).max
-
-        if !mtime || fresh.empty?  || fresh.any? { |t| t.updated_at > mtime }
-          scope[locals] = fresh
-        else
-          cache
+      if key
+        @cache.cache(key, name, prefix, partial, locals) do
+          decorate(yield, path_info, details, locals)
         end
+      else
+        decorate(yield, path_info, details, locals)
       end
     end
 
@@ -117,21 +170,23 @@ module ActionView
       super()
     end
 
-    cattr_accessor :instance_reader => false, :instance_writer => false
-
     private
 
-    def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+    def find_templates(name, prefix, partial, details)
       path = Path.build(name, prefix, partial)
-      query(path, details, details[:formats], outside_app_allowed)
+      query(path, details, details[:formats])
     end
 
-    def query(path, details, formats, outside_app_allowed)
+    def query(path, details, formats)
       query = build_query(path, details)
 
-      template_paths = find_template_paths query
+      # deals with case-insensitive file systems.
+      sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
 
-      template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
+      template_paths = Dir[query].reject { |filename|
+        File.directory?(filename) ||
+          !sanitizer[File.dirname(filename)].include?(filename)
+      }
 
       template_paths.map { |template|
         handler, format = extract_handler_and_format(template, formats)
@@ -144,36 +199,6 @@ module ActionView
       }
     end
 
-    def reject_files_external_to_app(files)
-      files.reject { |filename| !inside_path?(@path, filename) }
-    end
-
-    if RUBY_VERSION >= '2.2.0'
-      def find_template_paths(query)
-        Dir[query].reject { |filename|
-          File.directory?(filename) ||
-            # deals with case-insensitive file systems.
-            !File.fnmatch(query, filename, File::FNM_EXTGLOB)
-        }
-      end
-    else
-      def find_template_paths(query)
-        # deals with case-insensitive file systems.
-        sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
-
-        Dir[query].reject { |filename|
-          File.directory?(filename) ||
-            !sanitizer[File.dirname(filename)].include?(filename)
-        }
-      end
-    end
-
-    def inside_path?(path, filename)
-      filename = File.expand_path(filename)
-      path = File.join(path, '')
-      filename.start_with?(path)
-    end
-
     # Helper for building query glob string based on resolver's pattern.
     def build_query(path, details)
       query = @pattern.dup
@@ -206,13 +231,21 @@ module ActionView
     def extract_handler_and_format(path, default_formats)
       pieces = File.basename(path).split(".")
       pieces.shift
-      handler = Template.handler_for_extension(pieces.pop)
-      format  = pieces.last && Mime[pieces.last]
+
+      extension = pieces.pop
+      unless extension
+        message = "The file #{path} did not specify a template handler. The default is currently ERB, " \
+                  "but will change to RAW in the future."
+        ActiveSupport::Deprecation.warn message
+      end
+
+      handler = Template.handler_for_extension(extension)
+      format  = pieces.last && Template::Types[pieces.last]
       [handler, format]
     end
   end
 
-  # A resolver that loads files from the filesystem. It allows to set your own
+  # A resolver that loads files from the filesystem. It allows setting your own
   # resolving pattern. Such pattern can be a glob string supported by some variables.
   #
   # ==== Examples
@@ -228,7 +261,7 @@ module ActionView
   #
   #   FileSystemResolver.new("/path/to/views", ":prefix/{:formats/,}:action{.:locale,}{.:formats,}{.:handlers,}")
   #
-  # If you don't specify pattern then the default will be used.
+  # If you don't specify a pattern then the default will be used.
   #
   # In order to use any of the customized resolvers above in a Rails application, you just need
   # to configure ActionController::Base.view_paths in an initializer, for example:
@@ -240,10 +273,10 @@ module ActionView
   #
   # ==== Pattern format and variables
   #
-  # Pattern have to be a valid glob string, and it allows you to use the
+  # Pattern has to be a valid glob string, and it allows you to use the
   # following variables:
   #
-  # * <tt>:prefix</tt> - usualy the controller path
+  # * <tt>:prefix</tt> - usually the controller path
   # * <tt>:action</tt> - name of the action
   # * <tt>:locale</tt> - possible locale versions
   # * <tt>:formats</tt> - possible request formats (for example html, json, xml...)
@@ -271,12 +304,7 @@ module ActionView
   class OptimizedFileSystemResolver < FileSystemResolver #:nodoc:
     def build_query(path, details)
       exts = EXTENSIONS.map { |ext| details[ext] }
-
-      if path.to_s.starts_with? @path.to_s
-        query = escape_entry(path)
-      else
-        query = escape_entry(File.join(@path, path))
-      end
+      query = escape_entry(File.join(@path, path))
 
       query + exts.map { |ext|
         "{#{ext.compact.uniq.map { |e| ".#{e}," }.join}}"

data/lib/action_view/template/text.rb

@@ -1,13 +1,13 @@
 module ActionView #:nodoc:
   # = Action View Text Template
   class Template
-    class Text < String #:nodoc:
-      attr_accessor :mime_type
+    class Text #:nodoc:
+      attr_accessor :type
 
-      def initialize(string, mime_type = nil)
-        super(string.to_s)
-        @mime_type   = Mime[mime_type] || mime_type if mime_type
-        @mime_type ||= Mime::TEXT
+      def initialize(string, type = nil)
+        @string = string.to_s
+        @type   = Types[type] || type if type
+        @type ||= Types[:text]
       end
 
       def identifier
@@ -18,12 +18,16 @@ module ActionView #:nodoc:
         'text template'
       end
 
+      def to_str
+        @string
+      end
+
       def render(*args)
-        to_s
+        to_str
       end
 
       def formats
-        [@mime_type.respond_to?(:ref) ? @mime_type.ref : @mime_type.to_s]
+        [@type.to_sym]
       end
     end
   end

data/lib/action_view/template/types.rb

@@ -0,0 +1,57 @@
+require 'set'
+require 'active_support/core_ext/class/attribute_accessors'
+
+module ActionView
+  class Template
+    class Types
+      class Type
+        cattr_accessor :types
+        self.types = Set.new
+
+        def self.register(*t)
+          types.merge(t.map { |type| type.to_s })
+        end
+
+        register :html, :text, :js, :css,  :xml, :json
+
+        def self.[](type)
+          return type if type.is_a?(self)
+
+          if type.is_a?(Symbol) || types.member?(type.to_s)
+            new(type)
+          end
+        end
+
+        attr_reader :symbol
+
+        def initialize(symbol)
+          @symbol = symbol.to_sym
+        end
+
+        delegate :to_s, :to_sym, :to => :symbol
+        alias to_str to_s
+
+        def ref
+          to_sym || to_s
+        end
+
+        def ==(type)
+          return false if type.blank?
+          symbol.to_sym == type.to_sym
+        end
+      end
+
+      cattr_accessor :type_klass
+
+      def self.delegate_to(klass)
+        self.type_klass = klass
+      end
+
+      delegate_to Type
+
+      def self.[](type)
+        type_klass[type]
+      end
+    end
+  end
+end