actionview 5.0.7.2 → 5.1.0.beta1

data/lib/action_view/template/error.rb

@@ -35,10 +35,10 @@ module ActionView
       prefixes = Array(prefixes)
       template_type = if partial
         "partial"
-      elsif path =~ /layouts/i
-        'layout'
+      elsif /layouts/i.match?(path)
+        "layout"
       else
-        'template'
+        "template"
       end
 
       if partial && path.present?
@@ -62,23 +62,13 @@ module ActionView
       # Override to prevent #cause resetting during re-raise.
       attr_reader :cause
 
-      def initialize(template, original_exception = nil)
-        if original_exception
-          ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \
-                                          "Exceptions will automatically capture the original exception.", caller)
-        end
-
+      def initialize(template)
         super($!.message)
         set_backtrace($!.backtrace)
         @cause = $!
         @template, @sub_templates = template, nil
       end
 
-      def original_exception
-        ActiveSupport::Deprecation.warn("#original_exception is deprecated. Use #cause instead.", caller)
-        cause
-      end
-
       def file_name
         @template.identifier
       end
@@ -130,7 +120,7 @@ module ActionView
           if line_number
             "on line ##{line_number} of "
           else
-            'in '
+            "in "
           end + file_name
         end
 

data/lib/action_view/template/handlers.rb

@@ -2,10 +2,10 @@ module ActionView #:nodoc:
   # = Action View Template Handlers
   class Template
     module Handlers #:nodoc:
-      autoload :Raw, 'action_view/template/handlers/raw'
-      autoload :ERB, 'action_view/template/handlers/erb'
-      autoload :Html, 'action_view/template/handlers/html'
-      autoload :Builder, 'action_view/template/handlers/builder'
+      autoload :Raw, "action_view/template/handlers/raw"
+      autoload :ERB, "action_view/template/handlers/erb"
+      autoload :Html, "action_view/template/handlers/html"
+      autoload :Builder, "action_view/template/handlers/builder"
 
       def self.extended(base)
         base.register_default_template_handler :raw, Raw.new

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

@@ -7,20 +7,20 @@ module ActionView
 
       def call(template)
         require_engine
-        "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
+        "xml = ::Builder::XmlMarkup.new(:indent => 2);" \
           "self.output_buffer = xml.target!;" +
           template.source +
           ";xml.target!;"
       end
 
-      protected
+      private
 
-      def require_engine
-        @required ||= begin
-          require "builder"
-          true
+        def require_engine # :doc:
+          @required ||= begin
+            require "builder"
+            true
+          end
         end
-      end
     end
   end
 end

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

@@ -1,87 +1,20 @@
-require 'erubis'
-
 module ActionView
   class Template
     module Handlers
-      class Erubis < ::Erubis::Eruby
-        def add_preamble(src)
-          @newline_pending = 0
-          src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
-        end
-
-        def add_text(src, text)
-          return if text.empty?
-
-          if text == "\n"
-            @newline_pending += 1
-          else
-            src << "@output_buffer.safe_append='"
-            src << "\n" * @newline_pending if @newline_pending > 0
-            src << escape_text(text)
-            src << "'.freeze;"
-
-            @newline_pending = 0
-          end
-        end
-
-        # Erubis toggles <%= and <%== behavior when escaping is enabled.
-        # We override to always treat <%== as escaped.
-        def add_expr(src, code, indicator)
-          case indicator
-          when '=='
-            add_expr_escaped(src, code)
-          else
-            super
-          end
-        end
-
-        BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
-
-        def add_expr_literal(src, code)
-          flush_newline_if_pending(src)
-          if code =~ BLOCK_EXPR
-            src << '@output_buffer.append= ' << code
-          else
-            src << '@output_buffer.append=(' << code << ');'
-          end
-        end
-
-        def add_expr_escaped(src, code)
-          flush_newline_if_pending(src)
-          if code =~ BLOCK_EXPR
-            src << "@output_buffer.safe_expr_append= " << code
-          else
-            src << "@output_buffer.safe_expr_append=(" << code << ");"
-          end
-        end
-
-        def add_stmt(src, code)
-          flush_newline_if_pending(src)
-          super
-        end
-
-        def add_postamble(src)
-          flush_newline_if_pending(src)
-          src << '@output_buffer.to_s'
-        end
-
-        def flush_newline_if_pending(src)
-          if @newline_pending > 0
-            src << "@output_buffer.safe_append='#{"\n" * @newline_pending}'.freeze;"
-            @newline_pending = 0
-          end
-        end
-      end
+      autoload :Erubis, "action_view/template/handlers/erb/deprecated_erubis"
 
       class ERB
+        autoload :Erubi, "action_view/template/handlers/erb/erubi"
+        autoload :Erubis, "action_view/template/handlers/erb/erubis"
+
         # Specify trim mode for the ERB compiler. Defaults to '-'.
         # See ERB documentation for suitable values.
         class_attribute :erb_trim_mode
-        self.erb_trim_mode = '-'
+        self.erb_trim_mode = "-"
 
         # Default implementation used.
         class_attribute :erb_implementation
-        self.erb_implementation = Erubis
+        self.erb_implementation = Erubi
 
         # Do not escape templates of these mime types.
         class_attribute :escape_whitelist
@@ -108,7 +41,7 @@ module ActionView
           # expression
           template_source = template.source.dup.force_encoding(Encoding::ASCII_8BIT)
 
-          erb = template_source.gsub(ENCODING_TAG, '')
+          erb = template_source.gsub(ENCODING_TAG, "")
           encoding = $2
 
           erb.force_encoding valid_encoding(template.source.dup, encoding)
@@ -118,8 +51,8 @@ module ActionView
 
           self.class.erb_implementation.new(
             erb,
-            :escape => (self.class.escape_whitelist.include? template.type),
-            :trim => (self.class.erb_trim_mode == "-")
+            escape: (self.class.escape_whitelist.include? template.type),
+            trim: (self.class.erb_trim_mode == "-")
           ).src
         end
 

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

@@ -0,0 +1,9 @@
+::ActiveSupport::Deprecation.warn("ActionView::Template::Handlers::Erubis is deprecated and will be removed from Rails 5.2. Switch to ActionView::Template::Handlers::ERB::Erubi instead.")
+
+module ActionView
+  class Template
+    module Handlers
+      Erubis = ERB::Erubis
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+require "erubi"
+
+module ActionView
+  class Template
+    module Handlers
+      class ERB
+        class Erubi < ::Erubi::Engine
+          # :nodoc: all
+          def initialize(input, properties = {})
+            @newline_pending = 0
+
+            # Dup properties so that we don't modify argument
+            properties = Hash[properties]
+            properties[:preamble]   = "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
+            properties[:postamble]  = "@output_buffer.to_s"
+            properties[:bufvar]     = "@output_buffer"
+            properties[:escapefunc] = ""
+
+            super
+          end
+
+          def evaluate(action_view_erb_handler_context)
+            pr = eval("proc { #{@src} }", binding, @filename || "(erubi)")
+            action_view_erb_handler_context.instance_eval(&pr)
+          end
+
+        private
+          def add_text(text)
+            return if text.empty?
+
+            if text == "\n"
+              @newline_pending += 1
+            else
+              src << "@output_buffer.safe_append='"
+              src << "\n" * @newline_pending if @newline_pending > 0
+              src << text.gsub(/['\\]/, '\\\\\&')
+              src << "'.freeze;"
+
+              @newline_pending = 0
+            end
+          end
+
+          BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+          def add_expression(indicator, code)
+            flush_newline_if_pending(src)
+
+            if (indicator == "==") || @escape
+              src << "@output_buffer.safe_expr_append="
+            else
+              src << "@output_buffer.append="
+            end
+
+            if BLOCK_EXPR.match?(code)
+              src << " " << code
+            else
+              src << "(" << code << ");"
+            end
+          end
+
+          def add_code(code)
+            flush_newline_if_pending(src)
+            super
+          end
+
+          def add_postamble(_)
+            flush_newline_if_pending(src)
+            super
+          end
+
+          def flush_newline_if_pending(src)
+            if @newline_pending > 0
+              src << "@output_buffer.safe_append='#{"\n" * @newline_pending}'.freeze;"
+              @newline_pending = 0
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+gem "erubis"
+require "erubis"
+
+module ActionView
+  class Template
+    module Handlers
+      class ERB
+        class Erubis < ::Erubis::Eruby
+          # :nodoc: all
+          def add_preamble(src)
+            @newline_pending = 0
+            src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
+          end
+
+          def add_text(src, text)
+            return if text.empty?
+
+            if text == "\n"
+              @newline_pending += 1
+            else
+              src << "@output_buffer.safe_append='"
+              src << "\n" * @newline_pending if @newline_pending > 0
+              src << escape_text(text)
+              src << "'.freeze;"
+
+              @newline_pending = 0
+            end
+          end
+
+          # Erubis toggles <%= and <%== behavior when escaping is enabled.
+          # We override to always treat <%== as escaped.
+          def add_expr(src, code, indicator)
+            case indicator
+            when "=="
+              add_expr_escaped(src, code)
+            else
+              super
+            end
+          end
+
+          BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+          def add_expr_literal(src, code)
+            flush_newline_if_pending(src)
+            if BLOCK_EXPR.match?(code)
+              src << "@output_buffer.append= " << code
+            else
+              src << "@output_buffer.append=(" << code << ");"
+            end
+          end
+
+          def add_expr_escaped(src, code)
+            flush_newline_if_pending(src)
+            if BLOCK_EXPR.match?(code)
+              src << "@output_buffer.safe_expr_append= " << code
+            else
+              src << "@output_buffer.safe_expr_append=(" << code << ");"
+            end
+          end
+
+          def add_stmt(src, code)
+            flush_newline_if_pending(src)
+            super
+          end
+
+          def add_postamble(src)
+            flush_newline_if_pending(src)
+            src << "@output_buffer.to_s"
+          end
+
+          def flush_newline_if_pending(src)
+            if @newline_pending > 0
+              src << "@output_buffer.safe_append='#{"\n" * @newline_pending}'.freeze;"
+              @newline_pending = 0
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/action_view/template/html.rb

@@ -11,12 +11,10 @@ module ActionView #:nodoc:
       end
 
       def identifier
-        'html template'
+        "html template"
       end
 
-      def inspect
-        'html template'
-      end
+      alias_method :inspect, :identifier
 
       def to_str
         ERB::Util.h(@string)

data/lib/action_view/template/resolver.rb

@@ -37,15 +37,15 @@ module ActionView
     class Cache #:nodoc:
       class SmallCache < Concurrent::Map
         def initialize(options = {})
-          super(options.merge(:initial_capacity => 2))
+          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)}
+      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 save memory
       NO_TEMPLATES = [].freeze
@@ -88,24 +88,41 @@ module ActionView
         @query_cache.clear
       end
 
-      private
+      # Get the cache size.  Do not call this
+      # method. This method is not guaranteed to be here ever.
+      def size # :nodoc:
+        size = 0
+        @data.each_value do |v1|
+          v1.each_value do |v2|
+            v2.each_value do |v3|
+              v3.each_value do |v4|
+                size += v4.size
+              end
+            end
+          end
+        end
 
-      def canonical_no_templates(templates)
-        templates.empty? ? NO_TEMPLATES : templates
+        size + @query_cache.size
       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?
+      private
+
+        def canonical_no_templates(templates)
+          templates.empty? ? NO_TEMPLATES : templates
         end
 
-        cached_templates_max_updated_at = cached_templates.map(&:updated_at).max
+        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
 
-        # 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
+          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
 
     cattr_accessor :caching
@@ -124,13 +141,13 @@ module ActionView
     end
 
     # Normalizes the arguments and passes it on to find_templates.
-    def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
+    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)
       end
     end
 
-    def find_all_anywhere(name, prefix, partial=false, details={}, key=nil, locals=[])
+    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)
       end
@@ -160,7 +177,7 @@ module ActionView
     # always check the cache before hitting the resolver. Otherwise,
     # 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:
+    def cached(key, path_info, details, locals)
       name, prefix, partial = path_info
       locals = locals.map(&:to_s).sort!
 
@@ -174,7 +191,7 @@ module ActionView
     end
 
     # Ensures all the resolver information is set in the template.
-    def decorate(templates, path_info, details, locals) #:nodoc:
+    def decorate(templates, path_info, details, locals)
       cached = nil
       templates.each do |t|
         t.locals         = locals
@@ -187,103 +204,103 @@ module ActionView
 
   # An abstract class that implements a Resolver with path semantics.
   class PathResolver < Resolver #:nodoc:
-    EXTENSIONS = { :locale => ".", :formats => ".", :variants => "+", :handlers => "." }
+    EXTENSIONS = { locale: ".", formats: ".", variants: "+", handlers: "." }
     DEFAULT_PATTERN = ":prefix/:action{.:locale,}{.:formats,}{+:variants,}{.:handlers,}"
 
-    def initialize(pattern=nil)
+    def initialize(pattern = nil)
       @pattern = pattern || DEFAULT_PATTERN
       super()
     end
 
     private
 
-    def find_templates(name, prefix, partial, details, outside_app_allowed = false)
-      path = Path.build(name, prefix, partial)
-      query(path, details, details[:formats], outside_app_allowed)
-    end
+      def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+        path = Path.build(name, prefix, partial)
+        query(path, details, details[:formats], outside_app_allowed)
+      end
 
-    def query(path, details, formats, outside_app_allowed)
-      query = build_query(path, details)
+      def query(path, details, formats, outside_app_allowed)
+        query = build_query(path, details)
 
-      template_paths = find_template_paths(query)
-      template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
+        template_paths = find_template_paths(query)
+        template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
 
-      template_paths.map do |template|
-        handler, format, variant = extract_handler_and_format_and_variant(template, formats)
-        contents = File.binread(template)
+        template_paths.map do |template|
+          handler, format, variant = extract_handler_and_format_and_variant(template)
+          contents = File.binread(template)
 
-        Template.new(contents, File.expand_path(template), handler,
-          :virtual_path => path.virtual,
-          :format       => format,
-          :variant      => variant,
-          :updated_at   => mtime(template)
-        )
+          Template.new(contents, File.expand_path(template), handler,
+            virtual_path: path.virtual,
+            format: format,
+            variant: variant,
+            updated_at: mtime(template)
+          )
+        end
       end
-    end
 
-    def reject_files_external_to_app(files)
-      files.reject { |filename| !inside_path?(@path, filename) }
-    end
+      def reject_files_external_to_app(files)
+        files.reject { |filename| !inside_path?(@path, filename) }
+      end
 
-    def find_template_paths(query)
-      Dir[query].uniq.reject do |filename|
-        File.directory?(filename) ||
-          # deals with case-insensitive file systems.
-          !File.fnmatch(query, filename, File::FNM_EXTGLOB)
+      def find_template_paths(query)
+        Dir[query].uniq.reject do |filename|
+          File.directory?(filename) ||
+            # deals with case-insensitive file systems.
+            !File.fnmatch(query, filename, File::FNM_EXTGLOB)
+        end
       end
-    end
 
-    def inside_path?(path, filename)
-      filename = File.expand_path(filename)
-      path = File.join(path, '')
-      filename.start_with?(path)
-    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
+      # Helper for building query glob string based on resolver's pattern.
+      def build_query(path, details)
+        query = @pattern.dup
 
-      prefix = path.prefix.empty? ? '' : "#{escape_entry(path.prefix)}\\1"
-      query.gsub!(/:prefix(\/)?/, prefix)
+        prefix = path.prefix.empty? ? "" : "#{escape_entry(path.prefix)}\\1"
+        query.gsub!(/:prefix(\/)?/, prefix)
 
-      partial = escape_entry(path.partial? ? "_#{path.name}" : path.name)
-      query.gsub!(/:action/, partial)
+        partial = escape_entry(path.partial? ? "_#{path.name}" : path.name)
+        query.gsub!(/:action/, partial)
 
-      details.each do |ext, candidates|
-        if ext == :variants && candidates == :any
-          query.gsub!(/:#{ext}/, "*")
-        else
-          query.gsub!(/:#{ext}/, "{#{candidates.compact.uniq.join(',')}}")
+        details.each do |ext, candidates|
+          if ext == :variants && candidates == :any
+            query.gsub!(/:#{ext}/, "*")
+          else
+            query.gsub!(/:#{ext}/, "{#{candidates.compact.uniq.join(',')}}")
+          end
         end
-      end
 
-      File.expand_path(query, @path)
-    end
+        File.expand_path(query, @path)
+      end
 
-    def escape_entry(entry)
-      entry.gsub(/[*?{}\[\]]/, '\\\\\\&'.freeze)
-    end
+      def escape_entry(entry)
+        entry.gsub(/[*?{}\[\]]/, '\\\\\\&'.freeze)
+      end
 
-    # Returns the file mtime from the filesystem.
-    def mtime(p)
-      File.mtime(p)
-    end
+      # Returns the file mtime from the filesystem.
+      def mtime(p)
+        File.mtime(p)
+      end
 
-    # Extract handler, formats and variant from path. If a format cannot be found neither
-    # from the path, or the handler, we should return the array of formats given
-    # to the resolver.
-    def extract_handler_and_format_and_variant(path, default_formats)
-      pieces = File.basename(path).split('.'.freeze)
-      pieces.shift
+      # Extract handler, formats and variant from path. If a format cannot be found neither
+      # from the path, or the handler, we should return the array of formats given
+      # to the resolver.
+      def extract_handler_and_format_and_variant(path)
+        pieces = File.basename(path).split(".".freeze)
+        pieces.shift
 
-      extension = pieces.pop
+        extension = pieces.pop
 
-      handler = Template.handler_for_extension(extension)
-      format, variant = pieces.last.split(EXTENSIONS[:variants], 2) if pieces.last
-      format  &&= Template::Types[format]
+        handler = Template.handler_for_extension(extension)
+        format, variant = pieces.last.split(EXTENSIONS[:variants], 2) if pieces.last
+        format &&= Template::Types[format]
 
-      [handler, format, variant]
-    end
+        [handler, format, variant]
+      end
   end
 
   # A resolver that loads files from the filesystem. It allows setting your own
@@ -325,7 +342,7 @@ module ActionView
   # * <tt>:handlers</tt> - possible handlers (for example erb, haml, builder...)
   #
   class FileSystemResolver < PathResolver
-    def initialize(path, pattern=nil)
+    def initialize(path, pattern = nil)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
       super(pattern)
       @path = File.expand_path(path)