jammit 0.4.0 → 0.4.1

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.4.0'         # Keep version in sync with jammit.rb
-  s.date      = '2009-1-26'
+  s.version   = '0.4.1'         # Keep version in sync with jammit.rb
+  s.date      = '2009-1-5'
 
   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.4.0"
+  VERSION               = "0.4.1"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -26,10 +26,6 @@ module Jammit
 
   DEFAULT_COMPRESSOR    = :yui
 
-  # Extension matchers for JavaScript and JST, which need to be disambiguated.
-  JS_EXT                = /\.js\Z/
-  JST_EXT               = /\.jst\Z/
-
   # Jammit raises a @PackageNotFound@ exception when a non-existent package is
   # requested by a browser -- rendering a 404.
   class PackageNotFound < NameError; end

data/lib/jammit/compressor.rb

@@ -61,13 +61,9 @@ module Jammit
     end
 
     # Concatenate together a list of JavaScript paths, and pass them through the
-    # YUI Compressor (with munging enabled). JST can optionally be included.
+    # YUI Compressor (with munging enabled).
     def compress_js(paths)
-      if (jst_paths = paths.grep(JST_EXT)).empty?
-        js = concatenate(paths)
-      else
-        js = concatenate(paths - jst_paths) + compile_jst(jst_paths)
-      end
+      js = concatenate(paths)
       Jammit.compress_assets ? @js_compressor.compress(js) : js
     end
 
@@ -92,7 +88,7 @@ module Jammit
     # JST templates are named with the basename of their file.
     def compile_jst(paths)
       namespace = Jammit.template_namespace
-      compiled = paths.grep(JST_EXT).map do |path|
+      compiled = paths.map do |path|
         template_name = File.basename(path, File.extname(path))
         contents      = File.read(path).gsub(/\n/, '').gsub("'", '\\\\\'')
         "#{namespace}.#{template_name} = #{Jammit.template_function}('#{contents}');"

data/lib/jammit/packager.rb

@@ -93,7 +93,6 @@ module Jammit
     # package has gone missing.
     def package_for(package, extension)
       pack = @packages[extension] && @packages[extension][package]
-      pack ||= @packages[:js] && @packages[:js][package] if extension == :jst
       pack || not_found(package, extension)
     end
 
@@ -127,12 +126,7 @@ module Jammit
         packages[name]         = {}
         paths                  = globs.map {|glob| glob_files(glob) }.flatten.uniq
         packages[name][:paths] = paths
-        if !paths.grep(JS_EXT).empty? && !paths.grep(JST_EXT).empty?
-          packages[name][:urls] = paths.grep(JS_EXT).map {|path| path.sub(PATH_TO_URL, '') }
-          packages[name][:urls] += [Jammit.asset_url(name, :jst)]
-        else
-          packages[name][:urls] = paths.map {|path| path.sub(PATH_TO_URL, '') }
-        end
+        packages[name][:urls]  = paths.map {|path| path.sub(PATH_TO_URL, '') }
       end
       packages
     end

metadata

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