jammit 0.2.4 → 0.2.5

data/jammit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.2.4'         # Keep version in sync with jammit.rb
+  s.version   = '0.2.5'         # Keep version in sync with jammit.rb
   s.date      = '2009-11-18'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"

data/lib/jammit.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 
   ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 

data/lib/jammit/packager.rb

@@ -7,7 +7,7 @@ module Jammit
   class Packager
 
     # In Rails, the difference between a path and an asset URL is "public".
-    PATH_TO_URL = /\A\/?public/
+    PATH_TO_URL = /\A#{ASSET_ROOT}(\/public)?/
 
     # Creating a new Packager will rebuild the list of assets from the
     # Jammit.configuration. When assets.yml is being changed on the fly,
@@ -88,6 +88,12 @@ module Jammit
       pack || not_found(package, extension)
     end
 
+    # Absolute globs are absolute -- relative globs are relative to ASSET_ROOT.
+    def glob_files(glob)
+      absolute = Pathname.new(glob).absolute?
+      Dir[absolute ? glob : File.join(ASSET_ROOT, glob)]
+    end
+
     # Compiles the list of assets that goes into each package. Runs an ordered
     # list of Dir.globs, taking the merged unique result.
     def create_packages(config)
@@ -96,7 +102,7 @@ module Jammit
       config.each do |name, globs|
         globs                  ||= []
         packages[name]         = {}
-        paths                  = globs.map {|glob| Dir[glob] }.flatten.uniq
+        paths                  = globs.map {|glob| glob_files(glob) }.flatten.uniq
         packages[name][:paths] = paths
         packages[name][:urls]  = paths.map {|path| path.sub(PATH_TO_URL, '') }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jeremy Ashkenas