asset_hat 0.3.0 → 0.3.1

data/HISTORY

@@ -1,5 +1,15 @@
 = HISTORY
 
+== Version 0.3.1 (2011-04-02)
+* IMPROVEMENT: Added tolerance for `.css` and `.js` extensions in assets.yml,
+  even though you don't need them.
+* IMPROVEMENT: Added support for symbols as bundle names, e.g.,
+  `include_js :bundle => :application`. Thanks,
+  daphonz[https://github.com/daphonz]!
+* FIX: Worked around a JSMin bug that causes an error when JS ends with a
+  comment and no line break.
+
+== Version 0.3.0 (2010-12-08)
 * FEATURE: Added ERb support in `config/assets.yml`.
 * FEATURE: Added support for auto-creating SSL versions of every stylesheet.
 * FEATURE: Added support for loading remote JS via SSL. Includes loading

data/README.rdoc

@@ -38,7 +38,9 @@ And this in your deploy script:
 
     rake asset_hat:minify
 
-Tested with Rails 2.3.x. For the gritty details, check the
+Tested with Rails 2.3.x. For a quick overview, see
+{the AssetHat website}[http://mintdigital.github.com/asset_hat/].
+For the gritty details, check the
 {complete docs}[http://mintdigital.github.com/asset_hat/doc/] and
 {change history}[http://mintdigital.github.com/asset_hat/doc/files/HISTORY.html].
 

data/Rakefile

@@ -14,14 +14,14 @@ begin
       CDN in production. Can rewrite stylesheets to use CDN hosts (not just
       your web server) and cache-busting hashes for updated images.
     }.strip.gsub(/\s+/, ' ')
-    gemspec.homepage    = 'http://github.com/mintdigital/asset_hat'
+    gemspec.homepage    = 'http://mintdigital.github.com/asset_hat'
 
     gemspec.authors     = ['Ron DeVera', 'Mint Digital']
     gemspec.email       = 'hello@rondevera.com'
 
     gemspec.add_development_dependency  'flexmock', '~> 0.8.6'
     gemspec.add_development_dependency  'hanna',    '~> 0.1.12'
-    gemspec.add_development_dependency  'jeweler',  '~> 1.4.0'
+    gemspec.add_development_dependency  'jeweler',  '~> 1.5.1'
     gemspec.add_development_dependency  'shoulda',  '~> 2.10.2'
     gemspec.add_runtime_dependency      'cssmin',   '~> 1.0.2'
     gemspec.add_runtime_dependency      'jsmin',    '~> 1.0.1'

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
-:minor: 3
-:patch: 0
-:build:
+---
 :major: 0
+:build:
+:minor: 3
+:patch: 1

data/asset_hat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset_hat}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ron DeVera", "Mint Digital"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2011-04-02}
   s.description = %q{Minifies, bundles, and optimizes CSS/JS assets ahead of time (e.g., on deploy), not at runtime. Loads popular JS frameworks (like jQuery and Prototype) from localhost in development, and auto-switches to Google's CDN in production. Can rewrite stylesheets to use CDN hosts (not just your web server) and cache-busting hashes for updated images.}
   s.email = %q{hello@rondevera.com}
   s.extra_rdoc_files = [
@@ -95,9 +95,9 @@ Gem::Specification.new do |s|
     "test/asset_hat_test.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/mintdigital/asset_hat}
+  s.homepage = %q{http://mintdigital.github.com/asset_hat}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Your assets are covered.}
   s.test_files = [
     "test/asset_hat_helper_test.rb",
@@ -106,20 +106,19 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<flexmock>, ["~> 0.8.6"])
       s.add_development_dependency(%q<hanna>, ["~> 0.1.12"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<shoulda>, ["~> 2.10.2"])
       s.add_runtime_dependency(%q<cssmin>, ["~> 1.0.2"])
       s.add_runtime_dependency(%q<jsmin>, ["~> 1.0.1"])
     else
       s.add_dependency(%q<flexmock>, ["~> 0.8.6"])
       s.add_dependency(%q<hanna>, ["~> 0.1.12"])
-      s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<shoulda>, ["~> 2.10.2"])
       s.add_dependency(%q<cssmin>, ["~> 1.0.2"])
       s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
@@ -127,7 +126,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<flexmock>, ["~> 0.8.6"])
     s.add_dependency(%q<hanna>, ["~> 0.1.12"])
-    s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<shoulda>, ["~> 2.10.2"])
     s.add_dependency(%q<cssmin>, ["~> 1.0.2"])
     s.add_dependency(%q<jsmin>, ["~> 1.0.1"])

data/doc/classes/AssetHat.html

@@ -268,7 +268,7 @@
                   <a class='source-toggle' href='#' onclick="toggleCode('M000011-source'); return false">
                     [show source]
                   </a>
-                  <pre id='M000011-source'>     <span class="ruby-comment cmt"># File lib/asset_hat.rb, line 169</span>&#x000A;169:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">bundle_filenames</span>(<span class="ruby-identifier">bundle</span>, <span class="ruby-identifier">type</span>)&#x000A;170:     <span class="ruby-comment cmt"># Process arguments</span>&#x000A;171:     <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">TYPES</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">type</span>.<span class="ruby-identifier">to_sym</span>)&#x000A;172:       <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unknown type \&quot;#{type}\&quot;; should be one of: #{TYPES.join(', ')}.&quot;</span>&#x000A;173:       <span class="ruby-keyword kw">return</span>&#x000A;174:     <span class="ruby-keyword kw">end</span>&#x000A;175: &#x000A;176:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">config</span>[<span class="ruby-identifier">type</span>.<span class="ruby-identifier">to_s</span>][<span class="ruby-value str">'bundles'</span>][<span class="ruby-identifier">bundle</span>] <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>&#x000A;177:   <span class="ruby-keyword kw">end</span></pre>
+                  <pre id='M000011-source'>     <span class="ruby-comment cmt"># File lib/asset_hat.rb, line 169</span>&#x000A;169:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">bundle_filenames</span>(<span class="ruby-identifier">bundle</span>, <span class="ruby-identifier">type</span>)&#x000A;170:     <span class="ruby-comment cmt"># Process arguments</span>&#x000A;171:     <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">TYPES</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">type</span>.<span class="ruby-identifier">to_sym</span>)&#x000A;172:       <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unknown type \&quot;#{type}\&quot;; should be one of: #{TYPES.join(', ')}.&quot;</span>&#x000A;173:       <span class="ruby-keyword kw">return</span>&#x000A;174:     <span class="ruby-keyword kw">end</span>&#x000A;175: &#x000A;176:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">config</span>[<span class="ruby-identifier">type</span>.<span class="ruby-identifier">to_s</span>][<span class="ruby-value str">'bundles'</span>][<span class="ruby-identifier">bundle</span>.<span class="ruby-identifier">to_s</span>] <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>&#x000A;177:   <span class="ruby-keyword kw">end</span></pre>
                 </div>
               </div>
               <div class='method public-class' id='method-M000012'>

data/doc/classes/AssetHat/JS/Engines.html

@@ -80,7 +80,7 @@
                   <a class='source-toggle' href='#' onclick="toggleCode('M000026-source'); return false">
                     [show source]
                   </a>
-                  <pre id='M000026-source'>    <span class="ruby-comment cmt"># File lib/asset_hat/js.rb, line 79</span>&#x000A;79:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">jsmin</span>(<span class="ruby-identifier">input_string</span>)&#x000A;80:         <span class="ruby-constant">JSMin</span>.<span class="ruby-identifier">minify</span>(<span class="ruby-identifier">input_string</span>)&#x000A;81:       <span class="ruby-keyword kw">end</span></pre>
+                  <pre id='M000026-source'>    <span class="ruby-comment cmt"># File lib/asset_hat/js.rb, line 79</span>&#x000A;79:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">jsmin</span>(<span class="ruby-identifier">input_string</span>)&#x000A;80:         <span class="ruby-constant">JSMin</span>.<span class="ruby-identifier">minify</span>(<span class="ruby-identifier">input_string</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span>)&#x000A;81:       <span class="ruby-keyword kw">end</span></pre>
                 </div>
               </div>
               <div class='method public-class' id='method-M000025'>

data/doc/created.rid

@@ -1 +1 @@
-Wed, 08 Dec 2010 12:26:28 -0500
+Sat, 02 Apr 2011 23:06:30 -0400

data/doc/files/HISTORY.html

@@ -9,14 +9,14 @@
         function popupCode(url) {
           window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
         }
-        
+
         function toggleCode(id) {
           var code = document.getElementById(id)
-        
+
           code.style.display = code.style.display != 'block' ? 'block' : 'none'
           return true
         }
-        
+
         // Make codeblocks hidden by default
         document.writeln('<' + 'style type="text/css">.method .source pre { display: none }<\/style>')
       //]]>
@@ -31,76 +31,93 @@
         </div>
         <div class='last-update'>
           Last Update:
-          <span class='datetime'>Mon Nov 15 10:51:12 -0500 2010</span>
+          <span class='datetime'>Sat Apr 02 23:06:23 -0400 2011</span>
         </div>
       </div>
       <div id='content'>
         <div id='text'>
           <div id='description'>
             <h1><a href="HISTORY.html">HISTORY</a></h1>
+            <h2>Version 0.3.1 (2011-04-02)</h2>
+            <ul>
+            <li>IMPROVEMENT: Added tolerance for `.css` and `.js` extensions in assets.yml,
+            even though you don&#8217;t need them.
+
+            </li>
+            <li>IMPROVEMENT: Added support for symbols as bundle names, e.g., `include_js
+            :bundle => :application`. Thanks, <a
+            href="https://github.com/daphonz">daphonz</a>!
+
+            </li>
+            <li>FIX: Worked around a JSMin bug that causes an error when JS ends with a
+            comment and no line break.
+
+            </li>
+            </ul>
+            <h2>Version 0.3.0 (2010-12-08)</h2>
             <ul>
             <li>FEATURE: Added ERb support in `config/assets.yml`.
-            
+
             </li>
             <li>FEATURE: Added support for auto-creating SSL versions of every stylesheet.
-            
+
             </li>
             <li>FEATURE: Added support for loading remote JS via SSL. Includes loading
             popular JS from `<a
             href="https://ajax.googleapis.com">ajax.googleapis.com</a>` or your own
             CDN.
-            
+
             </li>
             <li>FEATURE: Added support for `FORMAT=long|short|dot` flags for `rake
             asset_hat:minify`. Useful for shortening output from deployment scripts.
-            
+
             </li>
             <li>FEATURE: Added support for absolute paths in `config/assets.yml`. Allows
             pointing to assets directly inside `public/`.
-            
+
             </li>
             <li>FEATURE: Added `asset_hat:minify:css` and `asset_hat:minify:js` Rake task
             aliases.
-            
+
             </li>
             <li>IMPROVEMENT: Updated default CSS minification engine to remove rules that
             have empty declaration blocks.
-            
+
             </li>
             <li>IMPROVEMENT: Stopped pre-caching asset commit IDs when launching console.
-            
+
             </li>
             <li>IMPROVEMENT: Added support for single/double quotation marks in `url()` CSS
             when adding asset hosts and cache busters
-            
+
             </li>
             <li>FIX: Fixed adding asset commit IDs to URLs containing &#8220;?&#8221; in
             stylesheets.
-            
+
             </li>
             </ul>
             <h2>Version 0.2.1 (2010-07-21)</h2>
             <ul>
             <li>FEATURE: Added WebFont Loader to supported JS vendors.
-            
+
             </li>
             <li>FIX: Stopped adding asset hosts to `url(/htc/...)` URLs because IE 6, by
             default, refuses to run .htc files from other domains, including CDN
             subdomains.
-            
+
             </li>
             </ul>
             <h2>Version 0.2.0 (2010-06-10)</h2>
             <ul>
             <li>FEATURE: Added support for loading many more JS vendors from Google&#8217;s
             CDN, including Prototype, MooTools, and SWFObject.
-            
+
             </li>
             <li>FEATURE: Cleaned up existing docs, and added complete RDoc documentation.
-            
+
             </li>
             <li>FEATURE: Added example integration script for Capistrano deployments.
-            
+
             </li>
             </ul>
             <h2>Version 0.1.5 (2010-03-11)</h2>
@@ -108,52 +125,52 @@
             <li>FIX: Fixed fetching asset commit IDs in some environments. The bug was
             possibly caused by older versions of Git, which fail to read logs properly
             when given absolute paths, rather than relative paths.
-            
+
             </li>
             <li>FIX: Stopped app tests from running twice in some environments.
-            
+
             </li>
             </ul>
             <h2>Version 0.1.4 (2010-03-03)</h2>
             <ul>
             <li>FIX: Fixed config filepaths in `asset_hat:config` task.
-            
+
             </li>
             </ul>
             <h2>Version 0.1.3 (2010-03-03)</h2>
             <ul>
             <li>FIX: Allowed adding commit IDs and asset hosts to `url(/htc/...)` URLs
             (e.g., `/htc/iepngfix.htc`) in CSS, not just images.
-            
+
             </li>
             <li>FIX: Changed `<a
             href="../classes/AssetHat.html#M000005">AssetHat.config</a>` to memoize
             only if `cache?` is true. In development environments, this means the
             config file will be reread with every request.
-            
+
             </li>
             </ul>
             <h2>Version 0.1.2 (2010-01-27)</h2>
             <ul>
             <li>IMPROVEMENT: Memoized HTML output from `include_css` and `include_js` when
             `<a href="../classes/AssetHat.html#M000009">AssetHat.cache?</a>` is true.
-            
+
             </li>
             </ul>
             <h2>Version 0.1.1 (2010-01-20)</h2>
             <ul>
             <li>FIX: Rewrote `AssetHat::VERSION` to be based on `VERSION.yml`.
-            
+
             </li>
             <li>FIX: Prefixed `AssetHat::CONFIG_FILEPATH` with `RAILS_ROOT`, which fixes
             ability to run an app&#8217;s individual test files.
-            
+
             </li>
             </ul>
             <h2>Version 0.1.0 (2010-01-19)</h2>
             <ul>
             <li>Initial release.
-            
+
             </li>
             </ul>
           </div>

data/doc/files/README_rdoc.html

@@ -31,7 +31,7 @@
         </div>
         <div class='last-update'>
           Last Update:
-          <span class='datetime'>Wed Dec 08 12:26:25 -0500 2010</span>
+          <span class='datetime'>Wed Dec 08 14:43:30 -0500 2010</span>
         </div>
       </div>
       <div id='content'>
@@ -79,7 +79,9 @@
             </p>
             <pre>rake asset_hat:minify</pre>
             <p>
-            Tested with Rails 2.3.x. For the gritty details, check the <a
+            Tested with Rails 2.3.x. For a quick overview, see <a
+            href="http://mintdigital.github.com/asset_hat/">the AssetHat website</a>.
+            For the gritty details, check the <a
             href="http://mintdigital.github.com/asset_hat/doc/">complete docs</a> and
             <a
             href="http://mintdigital.github.com/asset_hat/doc/files/HISTORY.html">change

data/lib/asset_hat.rb

@@ -173,7 +173,7 @@ module AssetHat
       return
     end
 
-    self.config[type.to_s]['bundles'][bundle] rescue nil
+    self.config[type.to_s]['bundles'][bundle.to_s] rescue nil
   end
 
   # Returns the full paths of files in the given bundle:

data/lib/asset_hat/js.rb

@@ -77,7 +77,7 @@ module AssetHat
       # - http://github.com/rgrove/jsmin
       # - http://rubygems.org/gems/jsmin
       def self.jsmin(input_string)
-        JSMin.minify(input_string)
+        JSMin.minify(input_string + "\n")
       end
     end # module Engines
 

data/lib/asset_hat/tasks/css.rb

@@ -88,7 +88,7 @@ namespace :asset_hat do
       end
       filepaths = filenames.map do |filename|
         parts = filename.split(File::SEPARATOR)
-        parts.last << '.' << type
+        parts.last << '.' << type unless parts.last =~ /\.#{type}$/
         File.join(
           (parts.first.present? ?
             AssetHat.assets_dir(type) : # Given path was relative
@@ -164,7 +164,7 @@ namespace :asset_hat do
       if opts[:show_intro]
         print "Minifying #{type.upcase}..."
         if report_format == 'dot'
-          $stdout.sync = true
+          $stdout.sync = true # Output immediately
         else
           puts
         end

data/lib/asset_hat/tasks/js.rb

@@ -41,7 +41,7 @@ namespace :asset_hat do
 
       config = AssetHat.config[type]
       report_format = ([ENV['FORMAT']] & %w[long short dot])[0] || 'long'
-      $stdout.sync = true if report_format == 'dot'
+      $stdout.sync = true if report_format == 'dot' # Output immediately
       min_options = {
         :engine => config['engine']
       }.reject { |k,v| v.blank? }
@@ -54,7 +54,7 @@ namespace :asset_hat do
       end
       filepaths = filenames.map do |filename|
         parts = filename.split(File::SEPARATOR)
-        parts.last << '.' << type
+        parts.last << '.' << type unless parts.last =~ /\.#{type}$/
         File.join(
           (parts.first.present? ?
             AssetHat.assets_dir(type) : # Given path was relative
@@ -113,7 +113,7 @@ namespace :asset_hat do
       if opts[:show_intro]
         print "Minifying #{type.upcase}..."
         if report_format == 'dot'
-          $stdout.sync = true
+          $stdout.sync = true # Output immediately
         else
           puts
         end

data/test/asset_hat_helper_test.rb

@@ -118,6 +118,16 @@ class AssetHatHelperTest < ActionView::TestCase
           assert_equal expected, output
         end
 
+        should 'include a bundle as separate files ' +
+               'with a symbol bundle name' do
+          bundle = 'css-bundle-1'
+          expected = @config['css']['bundles'][bundle].map do |source|
+            css_tag("#{source}.css?#{@asset_id}")
+          end.join("\n")
+          output = include_css(:bundle => bundle.to_sym, :cache => false)
+          assert_equal expected, output
+        end
+
         should 'include multiple bundles as separate files' do
           bundles = [1,2,3].map { |i| "css-bundle-#{i}" }
           expected = bundles.map do |bundle|
@@ -403,6 +413,16 @@ class AssetHatHelperTest < ActionView::TestCase
           assert_equal expected, output
         end
 
+        should 'include a bundle as separate files ' +
+               'with a symbol bundle name' do
+          bundle = 'js-bundle-1'
+          sources = @config['js']['bundles'][bundle]
+          expected = sources.
+            map { |src| js_tag("#{src}.js?#{@asset_id}") }.join("\n")
+          output = include_js(:bundle => bundle.to_sym, :cache => false)
+          assert_equal expected, output
+        end
+
         should 'include multiple bundles as separate files' do
           bundles = [1,2,3].map { |i| "js-bundle-#{i}" }
           expected = bundles.map do |bundle|

data/test/asset_hat_test.rb

@@ -228,6 +228,13 @@ class AssetHatTest < ActiveSupport::TestCase
       assert_equal  'foo/bar/baz.min.js',
                     AssetHat::JS.min_filepath('foo/bar/baz.js')
     end
+
+    context 'with minifying' do
+      should 'minify if a string ends with a comment and no line break' do
+        input = 'foo(); // bar'
+        assert_equal 'foo();', AssetHat::JS.minify(input, :engine => :jsmin)
+      end
+    end # context 'with minifying'
   end # context 'AssetHat::JS'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asset_hat
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ron DeVera
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -05:00
+date: 2011-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 5
+        - 1
+        version: 1.5.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -203,7 +203,7 @@ files:
 - test/asset_hat_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/mintdigital/asset_hat
+homepage: http://mintdigital.github.com/asset_hat
 licenses: []
 
 post_install_message: 
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Your assets are covered.