jammit 0.4.3 → 0.4.4

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.4.3'         # Keep version in sync with jammit.rb
-  s.date      = '2009-1-29'
+  s.version   = '0.4.4'         # 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"

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"
+  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

@@ -23,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+)?['"]?\)/
@@ -110,7 +110,7 @@ module Jammit
         File.read(css_path).gsub(EMBED_DETECTOR) do |url|
           ipath, cpath = Pathname.new($1), Pathname.new(File.expand_path(css_path))
           is_url = URI.parse($1).absolute?
-          is_url ? url : "url(#{rewrite_asset_path(ipath, cpath, variant)})"
+          is_url ? url : "url(#{construct_asset_path(ipath, cpath, variant)})"
         end
       end
       stylesheets.join("\n")
@@ -133,7 +133,7 @@ module Jammit
         i = paths[$1] ||= "#{index += 1}-#{File.basename($1)}"
         "url(mhtml:#{asset_url}!#{i})"
       end
-      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
@@ -143,10 +143,11 @@ module Jammit
     # Return a rewritten asset URL for a new stylesheet -- the asset should
     # be tagged for embedding if embeddable, and referenced at the correct level
     # if relative.
-    def rewrite_asset_path(asset_path, css_path, variant)
+    def construct_asset_path(asset_path, css_path, variant)
       public_path = absolute_path(asset_path, css_path)
       return "__EMBED__#{public_path}" if embeddable?(public_path, variant)
-      asset_path.absolute? ? asset_path.to_s : relative_path(public_path)
+      source = asset_path.absolute? ? asset_path.to_s : relative_path(public_path)
+      rewrite_asset_path(source, public_path)
     end
 
     # Get the site-absolute public path for an asset file path that may or may
@@ -163,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
@@ -179,7 +195,8 @@ module Jammit
 
     # Return the Base64-encoded contents of an asset on a single line.
     def encoded_contents(asset_path)
-      Base64.encode64(File.read(asset_path)).gsub(/\n/, '')
+      data = File.open(asset_path, 'rb'){|f| f.read }
+      Base64.encode64(data).gsub(/\n/, '')
     end
 
     # Grab the mime-type of an asset, by filename.

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.

metadata

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