jammit 0.5.3 → 0.5.4

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.5.3'         # Keep version in sync with jammit.rb
-  s.date      = '2010-9-15'
+  s.version   = '0.5.4'         # Keep version in sync with jammit.rb
+  s.date      = '2010-11-8'
 
   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.5.3"
+  VERSION               = "0.5.4"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -58,8 +58,10 @@ module Jammit
   @package_path  = DEFAULT_PACKAGE_PATH
 
   # Load the complete asset configuration from the specified @config_path@.
-  def self.load_configuration(config_path)
+  # If we're loading softly, don't let missing configuration error out.
+  def self.load_configuration(config_path, soft=false)
     exists = config_path && File.exists?(config_path)
+    return false if soft && !exists
     raise ConfigurationNotFound, "could not find the \"#{config_path}\" configuration file" unless exists
     conf = YAML.load(ERB.new(File.read(config_path)).result)
     @config_path            = config_path
@@ -108,6 +110,18 @@ module Jammit
     "/#{package_path}/#{filename(package, extension, suffix)}#{timestamp}"
   end
 
+  # Convenience method for packaging up Jammit, using the default options.
+  def self.package!(options={})
+    options = {
+      :config_path    => Jammit::DEFAULT_CONFIG_PATH,
+      :output_folder  => nil,
+      :base_url       => nil,
+      :force          => false
+    }.merge(options)
+    load_configuration(options[:config_path])
+    packager.force = options[:force]
+    packager.precache_all(options[:output_folder], options[:base_url])
+  end
 
   private
 
@@ -119,7 +133,7 @@ module Jammit
 
   # Turn asset packaging on or off, depending on configuration and environment.
   def self.set_package_assets(value)
-    package_env     = !defined?(Rails) || !Rails.env.development?
+    package_env     = !defined?(Rails) || (!Rails.env.development? && !Rails.env.test?)
     @package_assets = value == true || value.nil? ? package_env :
                       value == 'always'           ? true : false
   end

data/lib/jammit/command_line.rb

@@ -26,9 +26,7 @@ Options:
     def initialize
       parse_options
       ensure_configuration_file
-      Jammit.load_configuration(@options[:config_path])
-      Jammit.packager.force = @options[:force]
-      Jammit.packager.precache_all(@options[:output_folder], @options[:base_url])
+      Jammit.package!(@options)
     end
 
 

data/lib/jammit/compressor.rb

@@ -97,12 +97,12 @@ module Jammit
       paths       = paths.grep(Jammit.template_extension_matcher).sort
       base_path   = find_base_path(paths)
       compiled    = paths.map do |path|
-        contents  = File.open(path, 'r:binary') {|f| f.read }
+        contents  = read_binary_file(path)
         contents  = contents.gsub(/\n/, '').gsub("'", '\\\\\'')
         name      = template_name(path, base_path)
         "#{namespace}['#{name}'] = #{Jammit.template_function}('#{contents}');"
       end
-      compiler = Jammit.include_jst_script ? File.read(DEFAULT_JST_SCRIPT) : '';
+      compiler = Jammit.include_jst_script ? read_binary_file(DEFAULT_JST_SCRIPT) : '';
       setup_namespace = "#{namespace} = #{namespace} || {};"
       [JST_START, setup_namespace, compiler, compiled, JST_END].flatten.join("\n")
     end
@@ -137,7 +137,7 @@ module Jammit
     # at it.
     def concatenate_and_tag_assets(paths, variant=nil)
       stylesheets = [paths].flatten.map do |css_path|
-        contents = File.open(css_path, 'r:binary') {|f| f.read }
+        contents = read_binary_file(css_path)
         contents.gsub(EMBED_DETECTOR) do |url|
           ipath, cpath = Pathname.new($1), Pathname.new(File.expand_path(css_path))
           is_url = URI.parse($1).absolute?
@@ -228,7 +228,7 @@ module Jammit
     # Return the Base64-encoded contents of an asset on a single line.
     def encoded_contents(asset_path)
       return @asset_contents[asset_path] if @asset_contents[asset_path]
-      data = File.open(asset_path, 'rb') {|f| f.read }
+      data = read_binary_file(asset_path)
       @asset_contents[asset_path] = Base64.encode64(data).gsub(/\n/, '')
     end
 
@@ -239,9 +239,13 @@ module Jammit
 
     # Concatenate together a list of asset files.
     def concatenate(paths)
-      [paths].flatten.map {|p| File.read(p) }.join("\n")
+      [paths].flatten.map {|p| read_binary_file(p) }.join("\n")
     end
 
+    # `File.read`, but in "binary" mode.
+    def read_binary_file(path)
+      File.open(path, 'r:binary') {|f| f.read }
+    end
   end
 
 end

data/lib/jammit/controller.rb

@@ -53,7 +53,7 @@ module Jammit
     def generate_stylesheets
       return @contents = Jammit.packager.pack_stylesheets(@package, @variant) unless @variant == :mhtml
       @mtime      = Time.now
-      request_url = prefix_url(request.request_uri)
+      request_url = prefix_url(request.fullpath)
       cached_url  = prefix_url(Jammit.asset_url(@package, @extension, @variant, @mtime))
       css         = Jammit.packager.pack_stylesheets(@package, @variant, request_url)
       @contents   = css.gsub(request_url, cached_url) if perform_caching
@@ -87,7 +87,7 @@ end
 # Make the Jammit::Controller available to Rails as a top-level controller.
 ::JammitController = Jammit::Controller
 
-if defined?(Rails) && Rails.env.development?
+if defined?(Rails) && (Rails.env.development? || Rails.env.test?)
   ActionController::Base.class_eval do
     append_before_filter { Jammit.reload! }
   end

data/lib/jammit/dependencies.rb

@@ -12,7 +12,7 @@ require 'yui/compressor'
 require 'closure-compiler'
 
 # Load initial configuration before the rest of Jammit.
-Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH) if defined?(Rails)
+Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH, true) if defined?(Rails)
 
 # Jammit Core:
 require 'jammit/compressor'

data/rails/routes.rb

@@ -2,6 +2,9 @@ if defined?(Rails::Application)
   # Rails3 routes
   Rails.application.routes.draw do
     match "/#{Jammit.package_path}/:package.:extension",
-      :to => 'jammit#package', :as => :jammit
+      :to => 'jammit#package', :as => :jammit, :constraints => {
+        # A hack to allow extension to include "."
+        :extension => /.+/
+      }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -04:00
+date: 2010-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency