jammit 0.4.1 → 0.4.2

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.4.1'         # Keep version in sync with jammit.rb
-  s.date      = '2009-1-5'
+  s.version   = '0.4.2'         # Keep version in sync with jammit.rb
+  s.date      = '2009-1-27'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"

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.4.1"
+  VERSION               = "0.4.2"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -39,8 +39,9 @@ module Jammit
   class OutputNotWritable < StandardError; end
 
   class << self
-    attr_reader :configuration, :template_function, :template_namespace, :embed_assets, :package_path,
-                :package_assets, :compress_assets, :mhtml_enabled, :include_jst_script,
+    attr_reader :configuration, :template_function, :template_namespace,
+                :embed_assets, :package_assets, :compress_assets, :gzip_assets,
+                :package_path, :mhtml_enabled, :include_jst_script,
                 :javascript_compressor, :compressor_options, :css_compressor_options
   end
 
@@ -58,6 +59,7 @@ module Jammit
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH
     @embed_assets           = conf[:embed_assets] || conf[:embed_images]
     @compress_assets        = !(conf[:compress_assets] == false)
+    @gzip_assets            = !(conf[:gzip_assets] == false)
     @mhtml_enabled          = @embed_assets && @embed_assets != "datauri"
     @compressor_options     = (conf[:compressor_options] || {}).symbolize_keys
     @css_compressor_options = (conf[:css_compressor_options] || {}).symbolize_keys
@@ -136,8 +138,14 @@ module Jammit
   # complain loudly.
   def self.disable_compression
     @compress_assets = false
-    complaint = "Warning: Jammit asset compression disabled -- Java unavailable."
-    defined?(Rails) ? Rails.logger.warn(complaint) : STDERR.puts(complaint)
+    warn("Asset compression disabled -- Java unavailable.")
+  end
+
+  def self.warn(message)
+    message = "Jammit Warning: #{message}"
+    @logger ||= (defined?(Rails) && Rails.logger ? Rails.logger :
+                 defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil)
+    @logger ? @logger.warn(message) : STDERR.puts(message)
   end
 
 end

data/lib/jammit/packager.rb

@@ -59,11 +59,14 @@ module Jammit
     def cache(package, extension, contents, output_dir, suffix=nil, mtime=Time.now)
       FileUtils.mkdir_p(output_dir) unless File.exists?(output_dir)
       raise OutputNotWritable, "Jammit doesn't have permission to write to \"#{output_dir}\"" unless File.writable?(output_dir)
-      filename = File.join(output_dir, Jammit.filename(package, extension, suffix))
-      zip_name = "#{filename}.gz"
-      File.open(filename, 'wb+') {|f| f.write(contents) }
-      Zlib::GzipWriter.open(zip_name, Zlib::BEST_COMPRESSION) {|f| f.write(contents) }
-      File.utime(mtime, mtime, filename, zip_name)
+      files = []
+      files << file_name = File.join(output_dir, Jammit.filename(package, extension, suffix))
+      File.open(file_name, 'wb+') {|f| f.write(contents) }
+      if Jammit.gzip_assets
+        files << zip_name = "#{file_name}.gz"
+        Zlib::GzipWriter.open(zip_name, Zlib::BEST_COMPRESSION) {|f| f.write(contents) }
+      end
+      File.utime(mtime, mtime, *files)
     end
 
     # Get the list of individual assets for a package.
@@ -97,9 +100,12 @@ module Jammit
     end
 
     # 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?
-      Dir[absolute ? glob : File.join(ASSET_ROOT, glob)].sort
+      paths = Dir[absolute ? glob : File.join(ASSET_ROOT, glob)].sort
+      Jammit.warn("No assets match '#{glob}'") if paths.empty?
+      paths
     end
 
     # Return a list of all of the packages that should be cached. If "force" is

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-05 00:00:00 -05:00
+date: 2009-01-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency