ghazel-jammit 0.4.3.1 → 0.4.4.1

data/bin/jammit

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -rrubygems
 
 require "#{File.dirname(__FILE__)}/../lib/jammit/command_line.rb"
 

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'ghazel-jammit'
-  s.version   = '0.4.3.1'         # Keep version in sync with jammit.rb
-  s.date      = '2009-1-29'
+  s.version   = '0.4.4.1'         # Keep version in sync with jammit.rb
+  s.date      = '2010-2-6'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails',             ['>= 2.0.0']
   s.add_dependency 'yui-compressor',    ['>= 0.9.1']
-  s.add_dependency 'closure-compiler',  ['>= 0.1.0']
+  s.add_dependency 'ghazel-closure-compiler',  ['>= 0.2.0.1']
 
   s.files = Dir['lib/**/*', 'bin/*', 'jammit.gemspec', 'LICENSE', 'README']
 end

data/lib/jammit.rb

@@ -4,13 +4,13 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.4.3.1"
+  VERSION               = "0.4.4"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
   ASSET_ROOT            = File.expand_path(defined?(Rails) ? Rails.root : ".") unless defined?(ASSET_ROOT)
 
-  PUBLIC_ROOT           = File.join(ASSET_ROOT, 'public')
+  PUBLIC_ROOT           = defined?(Rails) ? Rails.public_path : File.join(ASSET_ROOT, 'public')
 
   DEFAULT_CONFIG_PATH   = File.join(ASSET_ROOT, 'config', 'assets.yml')
 

data/lib/jammit/compressor.rb

@@ -7,8 +7,6 @@ module Jammit
   # all stylesheets, with all enabled assets inlined into the css.
   class Compressor
 
-    include ActionView::Helpers::AssetTagHelper
-
     # Mapping from extension to mime-type of all embeddable assets.
     EMBED_MIME_TYPES = {
       '.png'  => 'image/png',
@@ -25,8 +23,8 @@ module Jammit
     EMBED_EXTS      = EMBED_MIME_TYPES.keys
     EMBED_FONTS     = ['.ttf', '.otf']
 
-    # Maximum size for embeddable images (an IE8 limitation).
-    MAX_IMAGE_SIZE  = 32.kilobytes
+    # 32k maximum size for embeddable images (an IE8 limitation).
+    MAX_IMAGE_SIZE  = 32768
 
     # CSS asset-embedding regexes for URL rewriting.
     EMBED_DETECTOR  = /url\(['"]?([^\s)]+\.[a-z]+)(\?\d+)?['"]?\)/
@@ -135,8 +133,7 @@ module Jammit
         i = paths[$1] ||= "#{index += 1}-#{File.basename($1)}"
         "url(mhtml:#{asset_url}!#{i})"
       end
-      paths = paths.sort
-      mhtml = paths.map do |path, identifier|
+      mhtml = paths.sort.map do |path, identifier|
         mime, contents = mime_type(path), encoded_contents(path)
         [MHTML_SEPARATOR, "Content-Location: #{identifier}\r\n", "Content-Type: #{mime}\r\n", "Content-Transfer-Encoding: base64\r\n\r\n", contents, "\r\n"]
       end
@@ -150,7 +147,7 @@ module Jammit
       public_path = absolute_path(asset_path, css_path)
       return "__EMBED__#{public_path}" if embeddable?(public_path, variant)
       source = asset_path.absolute? ? asset_path.to_s : relative_path(public_path)
-      rewrite_asset_path(source)
+      rewrite_asset_path(source, public_path)
     end
 
     # Get the site-absolute public path for an asset file path that may or may
@@ -167,6 +164,21 @@ module Jammit
       File.join('../', absolute_path.sub(PUBLIC_ROOT, ''))
     end
 
+    # Similar to the AssetTagHelper's method of the same name, this will
+    # append the RAILS_ASSET_ID cache-buster to URLs, if it's defined.
+    def rewrite_asset_path(path, file_path)
+      asset_id = rails_asset_id(file_path)
+      asset_id.blank? ? path : "#{path}?#{asset_id}"
+    end
+
+    # Similar to the AssetTagHelper's method of the same name, this will
+    # determine the correct asset id for a file.
+    def rails_asset_id(path)
+      asset_id = ENV["RAILS_ASSET_ID"]
+      return asset_id if asset_id
+      File.exists?(path) ? File.mtime(path).to_i.to_s : ''
+    end
+
     # An asset is valid for embedding if it exists, is less than 32K, and is
     # stored somewhere inside of a folder named "embed".
     # IE does not support Data-URIs larger than 32K, and you probably shouldn't

data/lib/jammit/dependencies.rb

@@ -8,9 +8,11 @@ require 'fileutils'
 
 # Gem Dependencies:
 require 'rubygems'
+gem     'rails', '~> 2.0'
 require 'yui/compressor'
 require 'closure-compiler'
 require 'active_support'
+require 'active_support/core_ext/hash'
 
 # Load initial configuration before the rest of Jammit.
 Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH) if defined?(Rails)

data/lib/jammit/packager.rb

@@ -7,7 +7,8 @@ module Jammit
   class Packager
 
     # In Rails, the difference between a path and an asset URL is "public".
-    PATH_TO_URL = /\A#{Regexp.escape(ASSET_ROOT)}(\/?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.

data/lib/jammit/routes.rb

@@ -1,5 +1,6 @@
 module Jammit
 
+  # Rails 2.x routing module.
   module Routes
 
     # Jammit uses a single route in order to slow down Rails' routing speed
@@ -13,4 +14,12 @@ module Jammit
 
   end
 
+end
+
+# Rails 3.x routes.
+if defined?(Jammit::Railtie)
+  Jammit::Railtie.routes do
+    match "/#{Jammit.package_path}/:package.:extension",
+      :to => 'jammit#package', :as => 'jammit'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-jammit
 version: !ruby/object:Gem::Version 
-  version: 0.4.3.1
+  version: 0.4.4.1
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-29 00:00:00 -08:00
+date: 2010-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,14 @@ dependencies:
         version: 0.9.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: closure-compiler
+  name: ghazel-closure-compiler
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.2.0.1
     version: 
 description: "    Jammit is an industrial strength asset packaging library for Rails,\n    providing both the CSS and JavaScript concatenation and compression that\n    you'd expect, as well as YUI Compressor and Closure Compiler compatibility,\n    ahead-of-time gzipping, built-in JavaScript template support, and optional\n    Data-URI / MHTML image embedding.\n"
 email: jeremy@documentcloud.org