accept multiple asset roots as search paths for globbing for assets.

Author: knowtheory

lib/jammit.rb

@@ -57,7 +57,7 @@ class << self
                   :javascript_compressor, :compressor_options, :css_compressor,
                   :css_compressor_options, :template_extension,
                   :template_extension_matcher, :allow_debugging,
-                  :rewrite_relative_paths, :public_root
+                  :rewrite_relative_paths, :public_root, :asset_roots
     attr_accessor :javascript_compressors, :css_compressors
   end
 
@@ -109,6 +109,7 @@ def self.load_configuration(config, soft=false)
     set_template_namespace(conf[:template_namespace])
     set_template_extension(conf[:template_extension])
     set_public_root(conf[:public_root]) if conf[:public_root]
+    set_asset_roots(conf[:asset_roots]) if conf[:asset_roots]
     symbolize_keys(conf[:stylesheets]) if conf[:stylesheets]
     symbolize_keys(conf[:javascripts]) if conf[:javascripts]
     check_for_deprecations
@@ -163,6 +164,10 @@ def self.package!(options={})
   def self.set_public_root(public_root=nil)
     @public_root = public_root if public_root
   end
+  
+  def self.set_asset_roots(*roots)
+    @asset_roots = [ASSET_ROOT, roots].compact.flatten.uniq
+  end
 
   # Ensure that the JavaScript compressor is a valid choice.
   def self.set_javascript_compressor(value)

lib/jammit/packager.rb

@@ -102,15 +102,21 @@ def package_for(package, extension)
     # Absolute globs are absolute -- relative globs are relative to ASSET_ROOT.
     # Print a warning if no files were found that match the glob.
     def glob_files(glob)
-      absolute = Pathname.new(glob).absolute?
-      paths = Dir[absolute ? glob : File.join(ASSET_ROOT, glob)].sort
+      absolute = 
+      paths = if Pathname.new(glob).absolute?
+        Dir[glob].sort
+      else
+        search_paths = Jammit.asset_roots.map{ |path| File.join(path, glob) }
+        Dir[*search_paths].sort
+      end
       Jammit.warn("No assets match '#{glob}'") if paths.empty?
       paths
     end
 
     # In Rails, the difference between a path and an asset URL is "public".    
     def path_to_url
-      @path_to_url ||= /\A#{Regexp.escape(ASSET_ROOT)}(\/?#{Regexp.escape(Jammit.public_root.sub(ASSET_ROOT, ''))})?/
+      prefix = Jammit.asset_roots.map{ |path| Regexp.escape(path) }.uniq.join("|")
+      @path_to_url ||= /\A(#{prefix})(\/?#{Regexp.escape(Jammit.public_root.sub(/#{prefix}/, ''))})?/
     end
 
     # Get the latest mtime of a list of files (plus the config path).