diff options
author | Joshua Peek <josh@joshpeek.com> | 2011-03-29 21:16:44 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2011-03-29 21:16:44 -0500 |
commit | 612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f (patch) | |
tree | a607dc09ac72b308893ad4d06052e2281b551cea /railties/lib/rails/engine.rb | |
parent | db3e310d6b327b2b58cfbc0318abd3b4ddca5e30 (diff) | |
download | rails-612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f.tar.gz rails-612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f.tar.bz2 rails-612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f.zip |
Move sprockets initializers back to application
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r-- | railties/lib/rails/engine.rb | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 79d48889c9..8adeafaff5 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -433,56 +433,11 @@ module Rails end def routes - @routes ||= build_route_set + @routes ||= ActionDispatch::Routing::RouteSet.new @routes.append(&Proc.new) if block_given? @routes end - def build_route_set - routes = ActionDispatch::Routing::RouteSet.new - - engine = self - routes.append do - if engine.config.use_sprockets - routes.add_route(engine.assets, {:path_info => "/assets"}, {}, {}, nil, false) - end - end - - routes - end - - def self.default_sprockets_paths - [ - "app/javascripts", - "app/stylesheets", - "vendor/plugins/*/app/javascripts", - "vendor/plugins/*/app/stylesheets", - "vendor/plugins/*/javascripts", - "vendor/plugins/*/stylesheets" - ] - end - - def assets - @assets ||= build_asset_environment - end - - def build_asset_environment - return nil if !config.use_sprockets - - require 'sprockets' - - env = Sprockets::Environment.new(root.to_s) - env.static_root = root.join("public/assets") - - self.class.default_sprockets_paths.each do |pattern| - Dir[root.join(pattern)].each do |dir| - env.paths << dir - end - end - - env - end - def initializers initializers = [] railties.all { |r| initializers += r.initializers } |