mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Extract dependency tracking from Digestor
This commit is contained in:
parent
3a0b6c8e13
commit
889bf19857
2 changed files with 73 additions and 44 deletions
66
actionpack/lib/action_view/dependency_tracker.rb
Normal file
66
actionpack/lib/action_view/dependency_tracker.rb
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
module ActionView
|
||||||
|
class DependencyTracker
|
||||||
|
def self.find_dependencies(name, template)
|
||||||
|
ErbTracker.call(name, template)
|
||||||
|
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).call
|
||||||
|
end
|
||||||
|
|
||||||
|
def initialize(name, template)
|
||||||
|
@name, @template = name, template
|
||||||
|
end
|
||||||
|
|
||||||
|
def call
|
||||||
|
render_dependencies + explicit_dependencies
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
attr_reader :name, :template
|
||||||
|
|
||||||
|
def directory
|
||||||
|
name.split("/")[0..-2].join("/")
|
||||||
|
end
|
||||||
|
|
||||||
|
def render_dependencies
|
||||||
|
template.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
|
||||||
|
template.source.scan(EXPLICIT_DEPENDENCY).flatten.uniq
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,25 +1,8 @@
|
||||||
require 'thread_safe'
|
require 'thread_safe'
|
||||||
|
require 'action_view/dependency_tracker'
|
||||||
|
|
||||||
module ActionView
|
module ActionView
|
||||||
class Digestor
|
class Digestor
|
||||||
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
|
|
||||||
|
|
||||||
cattr_reader(:cache)
|
cattr_reader(:cache)
|
||||||
@@cache = ThreadSafe::Cache.new
|
@@cache = ThreadSafe::Cache.new
|
||||||
|
|
||||||
|
@ -47,7 +30,7 @@ module ActionView
|
||||||
end
|
end
|
||||||
|
|
||||||
def dependencies
|
def dependencies
|
||||||
render_dependencies + explicit_dependencies
|
DependencyTracker.find_dependencies(name, template)
|
||||||
rescue ActionView::MissingTemplate
|
rescue ActionView::MissingTemplate
|
||||||
[] # File doesn't exist, so no dependencies
|
[] # File doesn't exist, so no dependencies
|
||||||
end
|
end
|
||||||
|
@ -69,16 +52,16 @@ module ActionView
|
||||||
name.gsub(%r|/_|, "/")
|
name.gsub(%r|/_|, "/")
|
||||||
end
|
end
|
||||||
|
|
||||||
def directory
|
|
||||||
name.split("/")[0..-2].join("/")
|
|
||||||
end
|
|
||||||
|
|
||||||
def partial?
|
def partial?
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def template
|
||||||
|
@template ||= finder.find(logical_name, [], partial?, formats: [ format ])
|
||||||
|
end
|
||||||
|
|
||||||
def source
|
def source
|
||||||
@source ||= finder.find(logical_name, [], partial?, formats: [ format ]).source
|
template.source
|
||||||
end
|
end
|
||||||
|
|
||||||
def dependency_digest
|
def dependency_digest
|
||||||
|
@ -89,26 +72,6 @@ module ActionView
|
||||||
(template_digests + injected_dependencies).join("-")
|
(template_digests + injected_dependencies).join("-")
|
||||||
end
|
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
|
|
||||||
|
|
||||||
def injected_dependencies
|
def injected_dependencies
|
||||||
Array.wrap(options[:dependencies])
|
Array.wrap(options[:dependencies])
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue