jammit 0.2.3 → 0.2.4

data/jammit.gemspec

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

data/lib/jammit.rb

@@ -4,11 +4,13 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 
   ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 
-  DEFAULT_CONFIG_PATH   = "config/assets.yml"
+  ASSET_ROOT            = defined?(RAILS_ROOT) ? RAILS_ROOT : "."
+
+  DEFAULT_CONFIG_PATH   = "#{ASSET_ROOT}/config/assets.yml"
 
   DEFAULT_PACKAGE_PATH  = "assets"
 
@@ -24,6 +26,10 @@ module Jammit
   # requested by a browser -- rendering a 404.
   class PackageNotFound < NameError; end
 
+  # Jammit raises a ConfigurationNotFound exception when you try to load the
+  # configuration of an assets.yml file that doesn't exist.
+  class ConfigurationNotFound < NameError; end
+
   class << self
     attr_reader :configuration, :template_function, :embed_images, :package_path,
                 :package_assets, :mhtml_enabled, :include_jst_script,
@@ -36,9 +42,10 @@ module Jammit
 
   # Load the complete asset configuration from the specified @config_path@.
   def self.load_configuration(config_path)
-    return unless config_path && File.exists?(config_path)
+    conf = config_path && File.exists?(config_path) && YAML.load_file(config_path)
+    raise ConfigurationNotFound, "could not find the \"#{config_path}\" configuration file" unless conf
     @config_path            = config_path
-    @configuration          = conf = YAML.load_file(@config_path).symbolize_keys
+    @configuration          = conf = conf.symbolize_keys
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH
     @embed_images           = conf[:embed_images]
     @mhtml_enabled          = @embed_images && @embed_images != "datauri"

data/lib/jammit/compressor.rb

@@ -124,7 +124,7 @@ module Jammit
     # not be relative, given the path of the stylesheet that contains it.
     def public_path(image_path, css_path)
       image_path, css_path = Pathname.new(image_path), Pathname.new(css_path)
-      (image_path.absolute? ? Pathname.new("public#{image_path}") : css_path.dirname + image_path).cleanpath
+      (image_path.absolute? ? Pathname.new("#{ASSET_ROOT}/public#{image_path}") : css_path.dirname + image_path).cleanpath
     end
 
     # An image is valid if it exists, and is less than 32K.

data/lib/jammit/controller.rb

@@ -9,7 +9,7 @@ module Jammit
 
     SUFFIX_STRIPPER = /-(datauri|mhtml)\Z/
 
-    NOT_FOUND_PATH  = "#{RAILS_ROOT}/public/404.html"
+    NOT_FOUND_PATH  = "#{ASSET_ROOT}/public/404.html"
 
     after_filter :cache_package if perform_caching
 

data/lib/jammit/packager.rb

@@ -30,7 +30,7 @@ module Jammit
     # versions. In order to prebuild the MHTML stylesheets, we need to know the
     # base_url, because IE only supports MHTML with absolute references.
     def precache_all(output_dir=nil, base_url=nil)
-      output_dir ||= "public/#{Jammit.package_path}"
+      output_dir ||= "#{ASSET_ROOT}/public/#{Jammit.package_path}"
       @config[:js].keys.each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir) }
       @config[:jst].keys.each {|p| cache(p, 'jst', pack_templates(p),  output_dir) }
       @config[:css].keys.each do |p|

metadata

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