From 19987b64af0d543a6292c3fd9b0b877f70eab306 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 30 Sep 2012 14:46:06 -0700
Subject: Asset manifest includes aliases for foo.js -> foo/index.js and vice
 versa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer
 "should we compile this asset?" for us.

---
 actionpack/lib/sprockets/static_compiler.rb | 32 +++++++++++------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/sprockets/static_compiler.rb b/actionpack/lib/sprockets/static_compiler.rb
index 2e2db4b760..4341a27d5d 100644
--- a/actionpack/lib/sprockets/static_compiler.rb
+++ b/actionpack/lib/sprockets/static_compiler.rb
@@ -15,13 +15,11 @@ module Sprockets
 
     def compile
       manifest = {}
-      env.each_logical_path do |logical_path|
-        if File.basename(logical_path)[/[^\.]+/, 0] == 'index'
-          logical_path.sub!(/\/index\./, '.')
-        end
-        next unless compile_path?(logical_path)
+      env.each_logical_path(paths) do |logical_path|
         if asset = env.find_asset(logical_path)
-          manifest[logical_path] = write_asset(asset)
+          digest_path = write_asset(asset)
+          manifest[asset.logical_path] = digest_path
+          manifest[aliased_path_for(asset.logical_path)] = digest_path
         end
       end
       write_manifest(manifest) if @manifest
@@ -43,22 +41,16 @@ module Sprockets
       end
     end
 
-    def compile_path?(logical_path)
-      paths.each do |path|
-        case path
-        when Regexp
-          return true if path.match(logical_path)
-        when Proc
-          return true if path.call(logical_path)
-        else
-          return true if File.fnmatch(path.to_s, logical_path)
-        end
-      end
-      false
-    end
-
     def path_for(asset)
       @digest ? asset.digest_path : asset.logical_path
     end
+
+    def aliased_path_for(logical_path)
+      if File.basename(logical_path).start_with?('index')
+        logical_path.sub(/\/index([^\/]+)$/, '\1')
+      else
+        logical_path.sub(/\.([^\/]+)$/, '/index.\1')
+      end
+    end
   end
 end
-- 
cgit v1.2.3