Jammit 0.6.5

Author: jashkenas

index.html

@@ -93,7 +93,7 @@
     </p>
 
     <p>
-      <b>Current Version:</b> <a href="http://rubygems.org/gems/jammit/">0.6.4</a>
+      <b>Current Version:</b> <a href="http://rubygems.org/gems/jammit/">0.6.5</a>
     </p>
 
     <p>
@@ -693,7 +693,7 @@ <h2 id="jst">JavaScript Templates</h2>
     <h2 id="changes">Change Log</h2>
 
     <p>
-      <b class="header">0.6.4</b> &mdash; <small><i>Nov 30, 2011</i></small><br />
+      <b class="header">0.6.5</b> &mdash; <small><i>Nov 30, 2011</i></small><br />
       Added the ability to pass HTML tag options to <tt>include_javascripts</tt>.
       Fixed a bug that would always cause JS to be recompiled, regardless of mtimes.
     </p>

jammit.gemspec

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

lib/jammit.rb

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

lib/jammit/packager.rb

@@ -6,10 +6,6 @@ module Jammit
   # with the correct timestamps.
   class Packager
 
-    # In Rails, the difference between a path and an asset URL is "public".
-    PATH_DIFF   = PUBLIC_ROOT.sub(ASSET_ROOT, '')
-    PATH_TO_URL = /\A#{Regexp.escape(ASSET_ROOT)}(\/?#{Regexp.escape(PATH_DIFF)})?/
-
     # Set force to false to allow packages to only be rebuilt when their source
     # files have changed since the last time their package was built.
     attr_accessor :force, :package_names
@@ -37,7 +33,7 @@ def initialize
     # Unless forced, will only rebuild assets whose source files have been
     # changed since their last package build.
     def precache_all(output_dir=nil, base_url=nil)
-      output_dir ||= File.join(PUBLIC_ROOT, Jammit.package_path)
+      output_dir ||= File.join(Jammit.public_root, Jammit.package_path)
       cacheable(:js, output_dir).each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir) }
       cacheable(:css, output_dir).each do |p|
         cache(p, 'css', pack_stylesheets(p), output_dir)
@@ -89,6 +85,7 @@ def pack_javascripts(package)
     def pack_templates(package)
       @compressor.compile_jst(package_for(package, :js)[:paths])
     end
+  
 
     private
 
@@ -107,6 +104,11 @@ def glob_files(glob)
       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, ''))})?/
+    end
 
     # Get the latest mtime of a list of files (plus the config path).
     def latest_mtime(paths)
@@ -155,10 +157,10 @@ def create_packages(config)
         paths                  = globs.flatten.uniq.map {|glob| glob_files(glob) }.flatten.uniq
         packages[name][:paths] = paths
         if !paths.grep(Jammit.template_extension_matcher).empty?
-          packages[name][:urls] = paths.grep(JS_EXTENSION).map {|path| path.sub(PATH_TO_URL, '') }
+          packages[name][:urls] = paths.grep(JS_EXTENSION).map {|path| path.sub(path_to_url, '') }
           packages[name][:urls] += [Jammit.asset_url(name, Jammit.template_extension)]
         else
-          packages[name][:urls] = paths.map {|path| path.sub(PATH_TO_URL, '') }
+          packages[name][:urls] = paths.map {|path| path.sub(path_to_url, '') }
         end
       end
       packages