jammit 0.2.0 → 0.2.1

data/jammit.gemspec

@@ -1,15 +1,16 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.2.0'         # Keep version in sync with jammit.rb
+  s.version   = '0.2.1'         # Keep version in sync with jammit.rb
   s.date      = '2009-11-18'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"
   s.description = <<-EOS
     Jammit is an industrial strength asset packaging library for Rails,
-    providing both the CSS and JavaScript concatenation and compression
-    that you'd expect, as well as ahead-of-time gzipping, built-in JavaScript
-    template support, and optional Data-URI / MHTML image embedding.
+    providing both the CSS and JavaScript concatenation and compression that
+    you'd expect, as well as YUI Compressor and Closure Compiler compatibility,
+    ahead-of-time gzipping, built-in JavaScript template support, and optional
+    Data-URI / MHTML image embedding.
   EOS
 
   s.authors           = ['Jeremy Ashkenas']

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.2.0"
+  VERSION = "0.2.1"
 
   ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 

data/lib/jammit/helper.rb

@@ -40,22 +40,32 @@ module Jammit
 
     # HTML tags, in order, for all of the individual stylesheets.
     def individual_stylesheets(packages)
-      stylesheet_link_tag(packages.map {|p| Jammit.packager.individual_urls(p.to_sym, :css) }.flatten)
+      tags_with_options(packages) {|p| Jammit.packager.individual_urls(p.to_sym, :css) }
     end
 
     # HTML tags for the stylesheet packages.
     def packaged_stylesheets(packages)
-      stylesheet_link_tag(packages.map {|p| Jammit.asset_url(p, :css) })
+      tags_with_options(packages) {|p| Jammit.asset_url(p, :css) }
     end
 
     # HTML tags for the 'datauri', and 'mhtml' versions of the packaged
     # stylesheets, using conditional comments to load the correct variant.
     def embedded_image_stylesheets(packages)
-      css_tags = stylesheet_link_tag(packages.map {|p| Jammit.asset_url(p, :css, :datauri) })
+      datauri_tags = tags_with_options(packages) {|p| Jammit.asset_url(p, :css, :datauri) }
       ie_tags = Jammit.mhtml_enabled ?
-        stylesheet_link_tag(packages.map {|p| Jammit.asset_url(p, :css, :mhtml) }) :
-        packaged_stylesheets(packages)
-      [DATA_URI_START, css_tags, DATA_URI_END, MHTML_START, ie_tags, MHTML_END].join("\n")
+                tags_with_options(packages) {|p| Jammit.asset_url(p, :css, :mhtml) } :
+                packaged_stylesheets(packages)
+      [DATA_URI_START, datauri_tags, DATA_URI_END, MHTML_START, ie_tags, MHTML_END].join("\n")
+    end
+
+    # Generate the stylesheet tags for a batch of packages, with options, by
+    # yielding each package to a block.
+    def tags_with_options(packages)
+      packages = packages.dup
+      options = packages.extract_options!
+      packages.map! {|package| yield package }.flatten!
+      packages.push(options) unless options.empty?
+      stylesheet_link_tag(*packages)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.0
     version: 
-description: "    Jammit is an industrial strength asset packaging library for Rails,\n    providing both the CSS and JavaScript concatenation and compression\n    that you'd expect, as well as ahead-of-time gzipping, built-in JavaScript\n    template support, and optional Data-URI / MHTML image embedding.\n"
+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
 executables: 
 - jammit