jammit 0.6.1 → 0.6.3

data/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.3'         # 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"

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

data/lib/jammit/command_line.rb

@@ -63,7 +63,7 @@ Options:
         opts.on('-f', '--force', 'force a rebuild of all assets') do |force|
           @options[:force] = force
         end
-        opts.on('-p', '--packages PACKAGE_NAMES', 'comma-separated list of packages (ex: "core,embed", default: all packages)') do |package_names|
+        opts.on('-p', '--packages LIST', 'list of packages to build (ex: "core,ui", default: all)') do |package_names|
           @options[:package_names] = package_names.split(/,\s*/).map {|n| n.to_sym }
         end
         opts.on_tail('-v', '--version', 'display Jammit version') do

data/lib/jammit/helper.rb

@@ -16,7 +16,7 @@ module Jammit
     # compressed CSS, and in development the stylesheet URLs are passed verbatim.
     def include_stylesheets(*packages)
       options = packages.extract_options!
-      return individual_stylesheets(packages, options) unless should_package?
+      return html_safe(individual_stylesheets(packages, options)) unless should_package?
       disabled = (options.delete(:embed_assets) == false) || (options.delete(:embed_images) == false)
       return html_safe(packaged_stylesheets(packages, options)) if disabled || !Jammit.embed_assets
       return html_safe(embedded_image_stylesheets(packages, options))
@@ -25,10 +25,11 @@ module Jammit
     # 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 @@ module Jammit
     # 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 Z
+date: 2011-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yui-compressor