actionpack 3.2.19 → 4.0.0

data/lib/action_view/dependency_tracker.rb

@@ -0,0 +1,93 @@
+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"'][@\w\/\."']+)        # 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
+
+      attr_reader :name, :template
+      private :name, :template
+
+      private
+
+        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/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)