Jammit 0.6.2 -- Rails 3.1 bugfix.

Author: jashkenas

index.html

@@ -93,7 +93,7 @@
     </p>
 
     <p>
-      <b>Current Version:</b> <a href="http://rubygems.org/gems/jammit/">0.6.1</a>
+      <b>Current Version:</b> <a href="http://rubygems.org/gems/jammit/">0.6.2</a>
     </p>
 
     <p>
@@ -692,6 +692,13 @@ <h2 id="jst">JavaScript Templates</h2>
 
     <h2 id="changes">Change Log</h2>
 
+    <p>
+      <b class="header">0.6.2</b> &mdash; <small><i>May 26, 2011</i></small><br />
+      Quick bugfix release for Rails 3.1 compatibility, which changes the method
+      signatures of <tt>javascript_include_tag</tt> and <tt>stylesheet_link_tag</tt>
+      in a backwards-incompatible fashion.
+    </p>
+    
     <p>
       <b class="header">0.6.1</b> &mdash; <small><i>May 25, 2011</i></small><br />
       Jammit now supports <b>UglifyJS</b> as a Java-free alternative to YUI and Closure,

jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.6.1'         # Keep version in sync with jammit.rb
-  s.date      = '2011-05-25'
+  s.version   = '0.6.2'         # Keep version in sync with jammit.rb
+  s.date      = '2011-05-26'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"

lib/jammit.rb

@@ -4,7 +4,7 @@
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.6.1"
+  VERSION               = "0.6.2"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 

lib/jammit/helper.rb

@@ -25,10 +25,11 @@ def include_stylesheets(*packages)
     # Writes out the URL to the bundled and compressed javascript package,
     # except in development, where it references the individual scripts.
     def include_javascripts(*packages)
-      tags = packages.map do |pack|
+      html_safe packages.map {|pack|
         should_package? ? Jammit.asset_url(pack, :js) : Jammit.packager.individual_urls(pack.to_sym, :js)
-      end
-      html_safe(javascript_include_tag(tags.flatten))
+      }.flatten.map {|pack|
+        javascript_include_tag pack
+      }.join("\n")
     end
 
     # Writes out the URL to the concatenated and compiled JST file -- we always
@@ -71,10 +72,11 @@ def embedded_image_stylesheets(packages, options)
     # Generate the stylesheet tags for a batch of packages, with options, by
     # yielding each package to a block.
     def tags_with_options(packages, options)
-      packages = packages.dup
-      packages.map! {|package| yield package }.flatten!
-      packages.push(options) unless options.empty?
-      stylesheet_link_tag(*packages)
+      packages.dup.map {|package| 
+        yield package 
+      }.flatten.map {|package|
+        stylesheet_link_tag package, options
+      }.join("\n")
     end
 
   end