asset_hat 0.4.1 → 0.4.2

data/lib/asset_hat/capistrano.rb

@@ -7,9 +7,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :minify, :roles => :assets, :except => {:no_release => true} do
         rake = fetch(:rake, "rake")
         env  = fetch(:environment, fetch(:rails_env, "production"))
-        run "cd #{current_path} ; " +
+        run "cd #{release_path} ; " +
             "#{rake} RAILS_ENV=#{env} FORMAT=short asset_hat:minify"
       end
     end
   end
+
 end

data/lib/asset_hat/js/vendors.rb

@@ -60,7 +60,7 @@ module AssetHat
       #
       # [ssl]     Boolean for whether to include vendor JS via HTTPS. Defaults
       #           to false.
-      # [version] The vendor version, e.g., '1.5.0' for jQuery 1.5. By
+      # [version] The vendor version, e.g., '1.6.0' for jQuery 1.6. By
       #           default, each vendor version is taken from
       #           <code>config/assets.yml</code>; use this option to override
       #           the configuration.

data/lib/asset_hat/tasks.rb

@@ -4,7 +4,7 @@ require 'asset_hat/tasks/js'
 namespace :asset_hat do
 
   desc 'Minifies all CSS and JS bundles'
-  task :minify, :needs => :environment do
+  task :minify => :environment do
     format = ENV['FORMAT']
     print 'Minifying CSS/JS...'
     puts unless format == 'dot'

data/lib/asset_hat/tasks/css.rb

@@ -2,7 +2,7 @@ namespace :asset_hat do
   namespace :css do
 
     desc 'Adds commit IDs to asset URLs in CSS for cache busting'
-    task :add_asset_commit_ids, :filename, :needs => :environment do |t, args|
+    task :add_asset_commit_ids, [:filename] => :environment do |t, args|
       if args.filename.blank?
         raise 'Usage: rake asset_hat:css:' +
           'add_asset_commit_ids[filename.css]' and return
@@ -18,7 +18,7 @@ namespace :asset_hat do
     end
 
     desc 'Adds hosts to asset URLs in CSS'
-    task :add_asset_hosts, :filename, :needs => :environment do |t, args|
+    task :add_asset_hosts, [:filename] => :environment do |t, args|
       if args.filename.blank?
         raise 'Usage: rake asset_hat:css:' +
           'add_asset_hosts[filename.css]' and return
@@ -40,7 +40,7 @@ namespace :asset_hat do
     end
 
     desc 'Minifies one CSS file'
-    task :minify_file, :filepath, :needs => :environment do |t, args|
+    task :minify_file, [:filepath] => :environment do |t, args|
       type = 'css'
 
       if args.filepath.blank?
@@ -65,7 +65,7 @@ namespace :asset_hat do
     end
 
     desc 'Minifies one CSS bundle'
-    task :minify_bundle, :bundle, :needs => :environment do |t, args|
+    task :minify_bundle, [:bundle] => :environment do |t, args|
       type = 'css'
 
       if args.bundle.blank?
@@ -155,7 +155,7 @@ namespace :asset_hat do
     end
 
     desc 'Concatenates and minifies all CSS bundles'
-    task :minify, :opts, :needs => :environment do |t, args|
+    task :minify, [:opts] => :environment do |t, args|
       args.with_defaults(:opts => {})
       opts = args.opts.reverse_merge(:show_intro => true, :show_outro => true)
       type = 'css'

data/lib/asset_hat/tasks/js.rb

@@ -2,7 +2,7 @@ namespace :asset_hat do
   namespace :js do
 
     desc 'Minifies one JS file'
-    task :minify_file, :filepath, :needs => :environment do |t, args|
+    task :minify_file, [:filepath] => :environment do |t, args|
       type = 'js'
 
       if args.filepath.blank?
@@ -31,7 +31,7 @@ namespace :asset_hat do
     end
 
     desc 'Minifies one JS bundle'
-    task :minify_bundle, :bundle, :needs => :environment do |t, args|
+    task :minify_bundle, [:bundle] => :environment do |t, args|
       type = 'js'
 
       if args.bundle.blank?
@@ -104,7 +104,7 @@ namespace :asset_hat do
     end
 
     desc 'Concatenates and minifies all JS bundles'
-    task :minify, :opts, :needs => :environment do |t, args|
+    task :minify, [:opts] => :environment do |t, args|
       args.with_defaults(:opts => {})
       opts = args.opts.reverse_merge(:show_intro => true, :show_outro => true)
       type = 'js'

data/lib/asset_hat_helper.rb

@@ -103,7 +103,7 @@ module AssetHatHelper
         else nil
         end
       end.join("\n")
-      html.respond_to?(:html_safe) ? html.html_safe : html
+      make_html_safe html
     end
 
   end # def include_assets
@@ -159,15 +159,15 @@ module AssetHatHelper
   def include_css(*args)
     return if args.blank?
 
-    AssetHat.html_cache       ||= {}
-    AssetHat.html_cache[:css] ||= {}
+    initialize_html_cache :css
 
-    options = args.extract_options!
-    options.symbolize_keys!.reverse_merge!(
-      :media => 'screen,projection', :ssl => controller.request.ssl?)
-    cache_key = (args + [options]).inspect
+    options = setup_options(args,
+      :media => 'screen,projection',
+      :ssl => controller.request.ssl?
+    )
+    cache_key = setup_cache_key(args, options)
 
-    if !AssetHat.cache? || AssetHat.html_cache[:css][cache_key].blank?
+    if !asset_cached?(:css, cache_key)
       # Generate HTML and write to cache
       options[:ssl] &&= AssetHat.ssl_asset_host_differs?
       html = AssetHat.html_cache[:css][cache_key] =
@@ -175,7 +175,7 @@ module AssetHatHelper
     end
 
     html ||= AssetHat.html_cache[:css][cache_key]
-    html.respond_to?(:html_safe) ? html.html_safe : html
+    make_html_safe html
   end
 
   # <code>include_js</code> is a smart wrapper for Rails'
@@ -199,7 +199,7 @@ module AssetHatHelper
   #   include_js :jquery
   #   =>  <script src="http://ajax.googleapis.com/.../jquery.min.js" ...></script>
   #     # Set jQuery versions either in `config/assets.yml`, or by using
-  #     # `include_js :jquery, :version => '1.6.0'`.
+  #     # `include_js :jquery, :version => '1.6.1'`.
   #
   # Include a bundle of JS files (i.e., a concatenated set of files;
   # configure in <code>config/assets.yml</code>):
@@ -295,24 +295,19 @@ module AssetHatHelper
   def include_js(*args)
     return if args.blank?
 
-    AssetHat.html_cache       ||= {}
-    AssetHat.html_cache[:js]  ||= {}
+    initialize_html_cache :js
 
-    options = args.extract_options!
-    options.symbolize_keys!.reverse_merge!(:ssl => controller.request.ssl?)
-    cache_key = (args + [options]).inspect
+    options = setup_options(args, :ssl => controller.request.ssl?)
+    cache_key = setup_cache_key(args, options)
 
-    if !AssetHat.cache? || AssetHat.html_cache[:js][cache_key].blank?
+    if !asset_cached?(:js, cache_key)
       # Generate HTML and write to cache
 
       htmls = []
       include_assets_options = options.except(:ssl, :version)
-      loader = nil
 
-      if options[:loader].present?
-        loader = options.delete(:loader)
-        include_assets_options.merge!(:only_url => true)
-      end
+      loader = options.delete(:loader)
+      include_assets_options.merge!(:only_url => true) if loader
 
       # Get vendor HTML/URLs
       included_vendors = (args & AssetHat::JS::VENDORS)
@@ -359,7 +354,7 @@ module AssetHatHelper
     end
 
     html ||= AssetHat.html_cache[:js][cache_key]
-    html.respond_to?(:html_safe) ? html.html_safe : html
+    make_html_safe html
   end
 
   # Returns the public URL path to the given source file.
@@ -370,8 +365,34 @@ module AssetHatHelper
     when :css ; stylesheet_path(source)
     when :js  ; javascript_path(source)
     else
-      raise %{Unknown type "#{type}"; should be one of: #{TYPES.join(', ')}.}
+      raise %{
+        Unknown type "#{type}"; should be one of:
+        #{AssetHat::TYPES.join(', ')}.
+      }.squish!
     end
   end
 
+  private
+
+  def initialize_html_cache(type)
+    AssetHat.html_cache ||= {}
+    AssetHat.html_cache[type] ||= {}
+  end
+
+  def setup_options(args, defaults)
+    options = args.extract_options!
+    options.symbolize_keys!.reverse_merge!(defaults)
+  end
+
+  def setup_cache_key(args, options)
+    (args + [options]).inspect
+  end
+
+  def make_html_safe(html)
+    html.respond_to?(:html_safe) ? html.html_safe : html
+  end
+
+  def asset_cached?(type, cache_key)
+    AssetHat.cache? && !AssetHat.html_cache[type.to_sym][cache_key].blank?
+  end
 end

data/test/asset_hat_helper_test.rb

@@ -450,7 +450,7 @@ class AssetHatHelperTest < ActionView::TestCase
 
         context 'with a mock config containing a version number' do
           setup do
-            @vendor_version = '1.6.0'
+            @vendor_version = '1.6.1'
             config = AssetHat.config
             config['js']['vendors'] = {
               'jquery' => {'version' => @vendor_version}
@@ -549,7 +549,7 @@ class AssetHatHelperTest < ActionView::TestCase
 
         context 'with a mock config containing custom CDN URLs' do
           setup do
-            @vendor_version = '1.6.0'
+            @vendor_version = '1.6.1'
             config = AssetHat.config
             config['js']['vendors'] = {
               'jquery' => {
@@ -872,7 +872,7 @@ class AssetHatHelperTest < ActionView::TestCase
         setup do
           @config = AssetHat.config
           @config['js']['vendors'] = {
-            'jquery' => {'version' => '1.6.0'},
+            'jquery' => {'version' => '1.6.1'},
             'lab_js' => {'version' => '1.2.0'}
           }
           flexmock(AssetHat).should_receive(:config => @config).by_default

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asset_hat
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ron DeVera
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -04:00
+date: 2011-08-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   version_requirements: *id006
-description: Minifies, bundles, and optimizes CSS/JS assets ahead of time (e.g., on deploy), not at runtime. Loads popular third-party JS (like jQuery, YUI, and Ext JS) from localhost in development, and auto-switches to Google's CDN in production. Lets you switch on LABjs to load more scripts in parallel. Can rewrite stylesheets to use CDN hosts (not just your web server) and cache-busting hashes for updated images.
+description: Load CSS and JS faster. Minifies, bundles, and optimizes CSS/JS assets ahead of time (e.g., on deploy), not at runtime. Loads popular third-party JS (like jQuery, YUI, and Dojo) from localhost in development, and auto-switches to Google's CDN in production. Lets you switch on LABjs mode to load more scripts in parallel. Can rewrite stylesheets to use CDN hosts (not just your web server) and cache-busting hashes for updated images.
 email: hello@rondevera.com
 executables: []
 
@@ -125,8 +125,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gemtest
 - Gemfile
-- Gemfile.lock
 - HISTORY
 - LICENSE
 - README.rdoc

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    asset_hat (0.4.0)
-      cssmin (~> 1.0.2)
-      jsmin (~> 1.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    cssmin (1.0.2)
-    flexmock (0.8.11)
-    git (1.2.5)
-    haml (2.2.24)
-    hanna (0.1.12)
-      haml (~> 2.2.8)
-      rake (~> 0.8.2)
-      rdoc (~> 2.3.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    jsmin (1.0.1)
-    rake (0.8.7)
-    rdoc (2.3.0)
-    shoulda (2.10.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  asset_hat!
-  flexmock (~> 0.8.6)
-  hanna (~> 0.1.12)
-  jeweler (~> 1.5.1)
-  shoulda (~> 2.10.2)