jammit 0.3.0 → 0.3.1

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.3.0'         # Keep version in sync with jammit.rb
-  s.date      = '2009-11-24'
+  s.version   = '0.3.1'         # Keep version in sync with jammit.rb
+  s.date      = '2009-11-29'
 
   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.3.0"
+  VERSION               = "0.3.1"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -36,6 +36,10 @@ module Jammit
   # not a recent enough version to run the JavaScript compressor.
   class JavaNotFound < StandardError; end
 
+  # Jammit raises an OutputNotWritable exception if the output directory for
+  # cached packages is locked.
+  class OutputNotWritable < StandardError; end
+
   class << self
     attr_reader :configuration, :template_function, :embed_images, :package_path,
                 :package_assets, :mhtml_enabled, :include_jst_script,
@@ -99,7 +103,7 @@ module Jammit
 
   # Turn asset packaging on or off, depending on configuration and environment.
   def self.set_package_assets(value)
-    package_env     = !defined?(RAILS_ENV) || RAILS_ENV != 'development'
+    package_env     = !defined?(Rails) || !Rails.env.development?
     @package_assets = value == true || value.nil? ? package_env :
                       value == 'always'           ? true : false
   end
@@ -122,28 +126,4 @@ module Jammit
 
 end
 
-# Standard Library Dependencies:
-require 'uri'
-require 'zlib'
-require 'base64'
-require 'pathname'
-require 'fileutils'
-
-# Gem Dependencies:
-require 'rubygems'
-require 'yui/compressor'
-require 'closure-compiler'
-require 'activesupport'
-
-# Load initial configuration before the rest of Jammit.
-Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH) if defined?(RAILS_ENV)
-
-# Jammit Core:
-require 'jammit/compressor'
-require 'jammit/packager'
-
-# Jammit Rails Integration:
-if defined?(RAILS_ENV)
-  require 'jammit/controller' # Rails will auto-load 'jammit/helper' for us.
-  require 'jammit/routes'
-end
+require 'jammit/dependencies'

data/lib/jammit/controller.rb

@@ -11,17 +11,16 @@ module Jammit
 
     NOT_FOUND_PATH  = "#{PUBLIC_ROOT}/404.html"
 
-    after_filter :cache_package if perform_caching
-
     # The "package" action receives all requests for asset packages that haven't
     # yet been cached. The package will be built, cached, and gzipped.
     def package
       parse_request
       case @extension
-      when :js  then render :js   => Jammit.packager.pack_javascripts(@package)
+      when :js  then render :js   => (@contents = Jammit.packager.pack_javascripts(@package))
       when :css then render :text => generate_stylesheets, :content_type => 'text/css'
-      when :jst then render :js   => Jammit.packager.pack_templates(@package)
+      when :jst then render :js   => (@contents = Jammit.packager.pack_templates(@package))
       end
+      cache_package if perform_caching
     rescue Jammit::PackageNotFound
       package_not_found
     end
@@ -34,7 +33,7 @@ module Jammit
     # the timestamp that ends up in the MHTML is also on the cached file.
     def cache_package
       dir = File.join(page_cache_directory, Jammit.package_path)
-      Jammit.packager.cache(@package, @extension, @contents || response.body, dir, @variant, @mtime)
+      Jammit.packager.cache(@package, @extension, @contents, dir, @variant, @mtime)
     end
 
     # Generate the complete, timestamped, MHTML url -- if we're rendering a
@@ -49,7 +48,7 @@ module Jammit
     # request URL to the client, and cache a version with the timestamped cache
     # URL swapped in.
     def generate_stylesheets
-      return Jammit.packager.pack_stylesheets(@package, @variant) unless @variant == :mhtml
+      return @contents = Jammit.packager.pack_stylesheets(@package, @variant) unless @variant == :mhtml
       @mtime      = Time.now
       request_url = prefix_url(request.request_uri)
       cached_url  = prefix_url(Jammit.asset_url(@package, @extension, @variant, @mtime))
@@ -85,7 +84,7 @@ end
 # Make the Jammit::Controller available to Rails as a top-level controller.
 ::JammitController = Jammit::Controller
 
-if RAILS_ENV == 'development'
+if Rails.env.development?
   ActionController::Base.class_eval do
     append_before_filter { Jammit.reload! }
   end

data/lib/jammit/dependencies.rb

@@ -0,0 +1,25 @@
+# Standard Library Dependencies:
+require 'uri'
+require 'zlib'
+require 'base64'
+require 'pathname'
+require 'fileutils'
+
+# Gem Dependencies:
+require 'rubygems'
+require 'yui/compressor'
+require 'closure-compiler'
+require 'active_support'
+
+# Load initial configuration before the rest of Jammit.
+Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH) if defined?(Rails)
+
+# Jammit Core:
+require 'jammit/compressor'
+require 'jammit/packager'
+
+# Jammit Rails Integration:
+if defined?(Rails)
+  require 'jammit/controller' # Rails will auto-load 'jammit/helper' for us.
+  require 'jammit/routes'
+end

data/lib/jammit/packager.rb

@@ -58,6 +58,7 @@ module Jammit
     # variants is identical, for web server caching modules, as well as MHTML.
     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) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/jammit/command_line.rb
 - lib/jammit/compressor.rb
 - lib/jammit/controller.rb
+- lib/jammit/dependencies.rb
 - lib/jammit/helper.rb
 - lib/jammit/jst.js
 - lib/jammit/packager.rb