asset_hat 0.2.1 → 0.3.0

data/lib/asset_hat/js.rb

@@ -30,13 +30,13 @@ module AssetHat
 
       engine = options[:engine].to_sym
       unless ENGINES.include?(engine)
-        raise %Q{
+        raise %{
           Unknown JS minification engine '#{engine}'.
           Allowed: #{ENGINES.map{ |e| "'#{e}'" }.join(', ')}
         }.strip.gsub(/\s+/, ' ') and return
       end
 
-      AssetHat::JS::Engines.send(engine, input_string)
+      AssetHat::JS::Engines.send(engine, input_string).strip
     end
 
     # Swappable JavaScript minification engines.

data/lib/asset_hat/js/vendors.rb

@@ -33,6 +33,8 @@ module AssetHat
       # points to {Google's CDN}[http://code.google.com/apis/ajaxlibs/].
       # Options:
       #
+      # [ssl]     Boolean for whether to include vendor JS via HTTPS. Defaults
+      #           to false.
       # [version] The vendor version, e.g., '1.4.0' for jQuery 1.4. By
       #           default, each vendor version is taken from
       #           <code>config/assets.yml</code>; use this option to override
@@ -41,10 +43,12 @@ module AssetHat
         vendor_config =
           AssetHat.config['js']['vendors'][vendor.to_s] rescue nil
         use_local = ActionController::Base.consider_all_requests_local
+        use_ssl   = !!options[:ssl]
         version   = options[:version] || vendor_config['version'] rescue nil
 
         unless use_local
           src = vendor_config['remote_url'] rescue nil
+          src = (vendor_config['remote_ssl_url'] rescue nil) if use_ssl
         end
 
         if src.blank?
@@ -52,45 +56,45 @@ module AssetHat
           when :jquery
             src = use_local || version.blank? ?
               "#{['jquery', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
           when :jquery_ui
             src = use_local || version.blank? ?
               "#{['jquery-ui', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/jqueryui/#{version}/jquery-ui.min.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/jqueryui/#{version}/jquery-ui.min.js"
           when :prototype
             # Prototype currently doesn't provide an official minified version.
             src = use_local || version.blank? ?
               "#{['prototype', version].compact.join('-')}.js" :
-              "http://ajax.googleapis.com/ajax/libs/prototype/#{version}/prototype.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/prototype/#{version}/prototype.js"
           when :scriptaculous
             # script.aculo.us currently doesn't provide an official minified version.
             src = use_local || version.blank? ?
               "#{['scriptaculous', version].compact.join('-')}.js" :
-              "http://ajax.googleapis.com/ajax/libs/scriptaculous/#{version}/scriptaculous.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/scriptaculous/#{version}/scriptaculous.js"
           when :mootools
             src = use_local || version.blank? ?
               "#{['mootools', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/mootools/#{version}/mootools-yui-compressed.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/mootools/#{version}/mootools-yui-compressed.js"
           when :dojo
             src = use_local || version.blank? ?
               "#{['dojo', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/dojo/#{version}/dojo/dojo.xd.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/dojo/#{version}/dojo/dojo.xd.js"
           when :swfobject
             src = use_local || version.blank? ?
               "#{['swfobject', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/swfobject/#{version}/swfobject.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/swfobject/#{version}/swfobject.js"
           when :yui
             src = use_local || version.blank? ?
               "#{['yui', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/yui/#{version}/build/yuiloader/yuiloader-min.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/yui/#{version}/build/yuiloader/yuiloader-min.js"
           when :ext_core
             src = use_local || version.blank? ?
               "#{['ext_core', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/ext-core/#{version}/ext-core.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/ext-core/#{version}/ext-core.js"
           when :webfont
             src = use_local || version.blank? ?
               "#{['webfont', version].compact.join('-')}.min.js" :
-              "http://ajax.googleapis.com/ajax/libs/webfont/#{version}/webfont.js"
+              "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/webfont/#{version}/webfont.js"
           else nil # TODO: Write to log
           end
         end

data/lib/asset_hat/tasks.rb

@@ -4,17 +4,36 @@ require 'asset_hat/tasks/js'
 namespace :asset_hat do
 
   desc 'Minifies all CSS and JS bundles'
-  task :minify => ['asset_hat:css:minify', 'asset_hat:js:minify']
+  task :minify, :needs => :environment do
+    format = ENV['FORMAT']
+    print 'Minifying CSS/JS...'
+    puts unless format == 'dot'
+
+    %w[css js].each do |type|
+      task = Rake::Task["asset_hat:#{type}:minify"]
+      task.reenable
+      task.invoke(:show_intro => false, :show_outro => false)
+    end
+    puts unless format == 'short'
+    puts 'Done.'
+  end
+
+  namespace :minify do
+    %w[css js].each do |type|
+      desc "Alias for asset_hat:#{type}:minify"
+      task type.to_sym => "asset_hat:#{type}:minify"
+    end
+  end
 
   desc 'Prepare configuration file'
-  task :config do
+  task :config, :needs => :environment do
     template_filepath = File.join(File.dirname(__FILE__), '..', '..',
       AssetHat::RELATIVE_CONFIG_FILEPATH)
     target_filepath = AssetHat::CONFIG_FILEPATH
 
     if File.exists?(target_filepath)
       print "Replace #{target_filepath}? (y/n) "
-      response = STDIN.gets.chomp
+      response = $stdin.gets.chomp
       unless response.downcase == 'y'
         puts 'Aborted.' ; exit
       end

data/lib/asset_hat/tasks/css.rb

@@ -1,66 +1,56 @@
 namespace :asset_hat do
   namespace :css do
 
-    # desc 'Adds mtimes to asset URLs in CSS'
-    # task :add_asset_mtimes, :filename, :verbose do |t, args|
-    #   if args.filename.blank?
-    #     raise 'Usage: rake asset_hat:css:add_asset_mtimes[filename.css]' and return
-    #   end
-    #
-    #   args.with_defaults :verbose => true
-    #
-    #   css = File.open(args.filename, 'r') { |f| f.read }
-    #   css = AssetHat::CSS.add_asset_mtimes(css)
-    #   File.open(args.filename, 'w') { |f| f.write css }
-    #
-    #   puts "- Added asset mtimes to #{args.filename}" if args.verbose
-    # end
-
     desc 'Adds commit IDs to asset URLs in CSS for cache busting'
-    task :add_asset_commit_ids, :filename, :verbose, :needs => :environment do |t, args|
+    task :add_asset_commit_ids, :filename, :needs => :environment do |t, args|
       if args.filename.blank?
-        raise 'Usage: rake asset_hat:css:add_asset_commit_ids[filename.css]' and return
+        raise 'Usage: rake asset_hat:css:' +
+          'add_asset_commit_ids[filename.css]' and return
       end
 
-      args.with_defaults :verbose => true
+      verbose = (ENV['VERBOSE'] != 'false') # Defaults to `true`
 
       css = File.open(args.filename, 'r') { |f| f.read }
       css = AssetHat::CSS.add_asset_commit_ids(css)
       File.open(args.filename, 'w') { |f| f.write css }
 
-      puts "- Added asset commit IDs to #{args.filename}" if args.verbose
+      puts "- Added asset commit IDs to #{args.filename}" if verbose
     end
 
     desc 'Adds hosts to asset URLs in CSS'
-    task :add_asset_hosts, :filename, :verbose, :needs => :environment do |t, args|
+    task :add_asset_hosts, :filename, :needs => :environment do |t, args|
       if args.filename.blank?
-        raise 'Usage: rake asset_hat:css:add_asset_hosts[filename.css]' and return
+        raise 'Usage: rake asset_hat:css:' +
+          'add_asset_hosts[filename.css]' and return
       end
 
-      args.with_defaults :verbose => true
+      verbose = (ENV['VERBOSE'] != 'false') # Defaults to `true`
 
       asset_host = ActionController::Base.asset_host
       if asset_host.blank?
-        raise "This environment (#{ENV['RAILS_ENV']}) doesn't have an `asset_host` configured."
-        return
+        raise "This environment (#{ENV['RAILS_ENV']}) " +
+          "doesn't have an `asset_host` configured." and return
       end
 
       css = File.open(args.filename, 'r') { |f| f.read }
       css = AssetHat::CSS.add_asset_hosts(css, asset_host)
       File.open(args.filename, 'w') { |f| f.write css }
 
-      puts "- Added asset hosts to #{args.filename}" if args.verbose
+      puts "- Added asset hosts to #{args.filename}" if verbose
     end
 
     desc 'Minifies one CSS file'
-    task :minify_file, :filepath, :verbose, :needs => :environment do |t, args|
+    task :minify_file, :filepath, :needs => :environment do |t, args|
+      type = 'css'
+
       if args.filepath.blank?
-        raise 'Usage: rake asset_hat:css:minify_file[path/to/filename.css]' and return
+        raise "Usage: rake asset_hat:#{type}:" +
+          "minify_file[path/to/filename.#{type}]" and return
       end
 
-      args.with_defaults :verbose => false
+      verbose = (ENV['VERBOSE'] != 'false') # Defaults to `true`
       min_options = {
-        :engine => AssetHat.config['css']['engine']
+        :engine => AssetHat.config[type]['engine']
       }.reject { |k,v| v.blank? }
 
       input   = File.open(args.filepath, 'r').read
@@ -71,79 +61,133 @@ namespace :asset_hat do
       File.open(target_filepath, 'w') { |f| f.write output }
 
       # Print results
-      puts "- Minified to #{target_filepath}" if args.verbose
+      puts "- Minified to #{target_filepath}" if verbose
     end
 
     desc 'Minifies one CSS bundle'
     task :minify_bundle, :bundle, :needs => :environment do |t, args|
+      type = 'css'
+
       if args.bundle.blank?
-        raise 'Usage: rake asset_hat:css:minify_bundle[application]' and return
+        raise "Usage: rake asset_hat:#{type}:" +
+          "minify_bundle[application]" and return
       end
 
-      config = AssetHat.config
-      old_bundle_size = 0.0
-      new_bundle_size = 0.0
+      config = AssetHat.config[type]
+      report_format = ([ENV['FORMAT']] & %w[long short dot])[0] || 'long'
+      $stdout.sync  = (report_format == 'dot')
       min_options = {
-        :engine => config['css']['engine']
+        :engine => config['engine']
       }.reject { |k,v| v.blank? }
 
       # Get bundle filenames
-      filenames = config['css']['bundles'][args.bundle]
+      filenames = config['bundles'][args.bundle].select(&:present?)
       if filenames.empty?
-        raise "No CSS files are specified for the #{args.bundle} bundle in #{AssetHat::CONFIG_FILEPATH}."
-        return
+        raise "No #{type.upcase} files are specified for the " +
+          "#{args.bundle} bundle in #{AssetHat::CONFIG_FILEPATH}." and return
       end
       filepaths = filenames.map do |filename|
-        File.join('public', 'stylesheets', "#{filename}.css")
+        parts = filename.split(File::SEPARATOR)
+        parts.last << '.' << type
+        File.join(
+          (parts.first.present? ?
+            AssetHat.assets_dir(type) : # Given path was relative
+            AssetHat::ASSETS_DIR),      # Given path was absolute
+          parts
+        )
       end
-      bundle_filepath = AssetHat::CSS.min_filepath(File.join(
-        'public', 'stylesheets', 'bundles', "#{args.bundle}.css"))
 
-      # Concatenate and process output
-      output = ''
+      # Check whether app has special SSL asset host
       asset_host = ActionController::Base.asset_host
-      filepaths.each do |filepath|
-        file_output = File.open(filepath, 'r').read
-        old_bundle_size += file_output.size
-
-        file_output = AssetHat::CSS.minify(file_output, min_options)
-        file_output = AssetHat::CSS.add_asset_commit_ids(file_output)
-        if asset_host.present?
-          file_output = AssetHat::CSS.add_asset_hosts(file_output, asset_host)
-        end
-
-        new_bundle_size += file_output.size
-        output << file_output + "\n"
+      output_options_array = [{:ssl => false}]
+      if AssetHat.ssl_asset_host_differs?
+        # The bundle needs a second version, which uses the asset host via SSL
+        output_options_array << {:ssl => true}
       end
-      FileUtils.makedirs(File.dirname(bundle_filepath))
-      File.open(bundle_filepath, 'w') { |f| f.write output }
 
-      # Print results
-      percent_saved = 1 - (new_bundle_size / old_bundle_size)
-      puts "\nWrote CSS bundle: #{bundle_filepath}"
-      filepaths.each do |filepath|
-        puts "        contains: #{filepath}"
-      end
-      if old_bundle_size > 0
-        engine = "(Engine: #{min_options[:engine]})"
-        puts "        MINIFIED: #{'%.1f' % (percent_saved * 100)}% #{engine}"
+      output_options_array.each do |output_options|
+
+        # Concatenate and process output
+        bundle_filepath = AssetHat::CSS.min_filepath(File.join(
+          AssetHat.bundles_dir(type, output_options.slice(:ssl)),
+          "#{args.bundle}.#{type}"))
+        old_bundle_size = 0.0
+        new_bundle_size = 0.0
+        output     = ''
+        filepaths.each do |filepath|
+          file_output = File.open(filepath, 'r').read
+          old_bundle_size += file_output.size
+
+          file_output = AssetHat::CSS.minify(file_output, min_options)
+          file_output = AssetHat::CSS.add_asset_commit_ids(file_output)
+          if asset_host.present?
+            file_output = AssetHat::CSS.add_asset_hosts(
+              file_output, asset_host, output_options.slice(:ssl))
+          end
+
+          new_bundle_size += file_output.size
+          output << file_output + "\n"
+        end
+        FileUtils.makedirs(File.dirname(bundle_filepath))
+        File.open(bundle_filepath, 'w') { |f| f.write output }
+
+        # Print results
+        percent_saved =
+          "#{'%.1f' % ((1 - (new_bundle_size / old_bundle_size)) * 100)}%"
+        bundle_filepath.sub!(/^#{Rails.root}\//, '')
+        case report_format
+        when 'dot'
+          print '.'
+        when 'short'
+          puts "Minified #{percent_saved.rjust(6)}: #{bundle_filepath}"
+        else # 'long'
+          puts "\nWrote #{type.upcase} bundle: #{bundle_filepath}"
+          filepaths.each do |filepath|
+            puts "        contains: #{filepath.sub(/^#{Rails.root}\//, '')}"
+          end
+          if old_bundle_size > 0
+            puts "        MINIFIED: #{percent_saved}" +
+                          (" (empty!)" if new_bundle_size == 0).to_s +
+                          " (Engine: #{min_options[:engine]})"
+          end
+        end
       end
     end
 
     desc 'Concatenates and minifies all CSS bundles'
-    task :minify, :needs => :environment do
+    task :minify, :opts, :needs => :environment do |t, args|
+      args.with_defaults(:opts => {})
+      opts = args.opts.reverse_merge(:show_intro => true, :show_outro => true)
+      type = 'css'
+      report_format = ENV['FORMAT']
+
+      if opts[:show_intro]
+        print "Minifying #{type.upcase}..."
+        if report_format == 'dot'
+          $stdout.sync = true
+        else
+          puts
+        end
+      end
+
       # Get input bundles
-      config = AssetHat.config
-      if config['css'].blank? || config['css']['bundles'].blank?
-        puts "You need to set up CSS bundles in #{AssetHat::CONFIG_FILEPATH}."
-        exit
+      config = AssetHat.config[type]
+      if config.blank? || config['bundles'].blank?
+        raise "You need to set up #{type.upcase} bundles " +
+          "in #{AssetHat::CONFIG_FILEPATH}." and return
       end
-      bundles = config['css']['bundles'].keys
+      bundles = config['bundles'].keys
 
       # Minify bundles
       bundles.each do |bundle|
-        Rake::Task['asset_hat:css:minify_bundle'].reenable
-        Rake::Task['asset_hat:css:minify_bundle'].invoke(bundle)
+        task = Rake::Task["asset_hat:#{type}:minify_bundle"]
+        task.reenable
+        task.invoke(bundle)
+      end
+
+      if opts[:show_outro]
+        puts unless report_format == 'short'
+        puts 'Done.'
       end
     end
 

data/lib/asset_hat/tasks/js.rb

@@ -2,19 +2,21 @@ namespace :asset_hat do
   namespace :js do
 
     desc 'Minifies one JS file'
-    task :minify_file, :filepath, :verbose, :needs => :environment do |t, args|
+    task :minify_file, :filepath, :needs => :environment do |t, args|
+      type = 'js'
+
       if args.filepath.blank?
-        raise 'Usage: rake asset_hat:js:minify_file[filepath.js]' and return
+        raise "Usage: rake asset_hat:#{type}:" +
+          "minify_file[filepath.#{type}]" and return
       end
 
-      args.with_defaults :verbose => false
+      verbose = (ENV['VERBOSE'] != 'false') # Defaults to `true`
       min_options = {
-        :engine => AssetHat.config['js']['engine']
+        :engine => AssetHat.config[type]['engine']
       }.reject { |k,v| v.blank? }
 
-      if args.verbose && args.filepath.match(/\.min\.js$/)
-        puts "#{args.filepath} is already minified."
-        exit 1
+      if verbose && args.filepath.match(/\.min\.#{type}$/)
+        raise "#{args.filepath} is already minified." and return
       end
 
       input   = File.open(args.filepath, 'r').read
@@ -25,40 +27,52 @@ namespace :asset_hat do
       File.open(target_filepath, 'w') { |f| f.write output }
 
       # Print results
-      puts "- Minified to #{target_filepath}" if args.verbose
+      puts "- Minified to #{target_filepath}" if verbose
     end
 
     desc 'Minifies one JS bundle'
     task :minify_bundle, :bundle, :needs => :environment do |t, args|
+      type = 'js'
+
       if args.bundle.blank?
-        raise 'Usage: rake asset_hat:js:minify_bundle[application]' and return
+        raise "Usage: rake asset_hat:#{type}:" +
+          "minify_bundle[application]" and return
       end
 
-      config = AssetHat.config
-      old_bundle_size = 0.0
-      new_bundle_size = 0.0
+      config = AssetHat.config[type]
+      report_format = ([ENV['FORMAT']] & %w[long short dot])[0] || 'long'
+      $stdout.sync = true if report_format == 'dot'
       min_options = {
-        :engine => config['js']['engine']
+        :engine => config['engine']
       }.reject { |k,v| v.blank? }
 
       # Get bundle filenames
-      filenames = config['js']['bundles'][args.bundle]
+      filenames = config['bundles'][args.bundle].select(&:present?)
       if filenames.empty?
-        raise "No JS files are specified for the #{args.bundle} bundle in #{AssetHat::CONFIG_FILEPATH}."
-        return
+        raise "No #{type.upcase} files are specified for the " +
+          "#{args.bundle} bundle in #{AssetHat::CONFIG_FILEPATH}." and return
       end
       filepaths = filenames.map do |filename|
-        File.join('public', 'javascripts', "#{filename}.js")
+        parts = filename.split(File::SEPARATOR)
+        parts.last << '.' << type
+        File.join(
+          (parts.first.present? ?
+            AssetHat.assets_dir(type) : # Given path was relative
+            AssetHat::ASSETS_DIR),      # Given path was absolute
+          parts
+        )
       end
       bundle_filepath = AssetHat::JS.min_filepath(File.join(
-        'public', 'javascripts', 'bundles', "#{args.bundle}.js"))
+        AssetHat.bundles_dir(type), "#{args.bundle}.#{type}"))
 
       # Concatenate and process output
       output = ''
+      old_bundle_size = 0.0
+      new_bundle_size = 0.0
       filepaths.each do |filepath|
         file_output = File.open(filepath, 'r').read
         old_bundle_size += file_output.size
-        unless filepath =~ /\.min\.js$/ # Already minified
+        unless filepath =~ /\.min\.#{type}$/ # Already minified
           file_output = AssetHat::JS.minify(file_output, min_options)
         end
         new_bundle_size += file_output.size
@@ -68,31 +82,61 @@ namespace :asset_hat do
       File.open(bundle_filepath, 'w') { |f| f.write output }
 
       # Print results
-      percent_saved = 1 - (new_bundle_size / old_bundle_size)
-      puts "\n Wrote JS bundle: #{bundle_filepath}"
-      filepaths.each do |filepath|
-        puts "        contains: #{filepath}"
-      end
-      if old_bundle_size > 0
-        engine = "(Engine: #{min_options[:engine]})"
-        puts "        MINIFIED: #{'%.1f' % (percent_saved * 100)}% #{engine}"
+      percent_saved =
+        "#{'%.1f' % ((1 - (new_bundle_size / old_bundle_size)) * 100)}%"
+      bundle_filepath.sub!(/^#{Rails.root}\//, '')
+      case report_format
+      when 'dot'
+        print '.'
+      when 'short'
+        puts "Minified #{percent_saved.rjust(6)}: #{bundle_filepath}"
+      else # 'long'
+        puts "\n Wrote #{type.upcase} bundle: #{bundle_filepath}"
+        filepaths.each do |filepath|
+          puts "        contains: #{filepath.sub(/^#{Rails.root}\//, '')}"
+        end
+        if old_bundle_size > 0
+          puts "        MINIFIED: #{percent_saved}" +
+                        (" (empty!)" if new_bundle_size == 0).to_s +
+                        " (Engine: #{min_options[:engine]})"
+        end
       end
     end
 
     desc 'Concatenates and minifies all JS bundles'
-    task :minify, :needs => :environment do
+    task :minify, :opts, :needs => :environment do |t, args|
+      args.with_defaults(:opts => {})
+      opts = args.opts.reverse_merge(:show_intro => true, :show_outro => true)
+      type = 'js'
+      report_format = ENV['FORMAT']
+
+      if opts[:show_intro]
+        print "Minifying #{type.upcase}..."
+        if report_format == 'dot'
+          $stdout.sync = true
+        else
+          puts
+        end
+      end
+
       # Get input bundles
-      config = AssetHat.config
-      if config['js'].blank? || config['js']['bundles'].blank?
-        puts "You need to set up JS bundles in #{AssetHat::CONFIG_FILEPATH}."
-        exit
+      config = AssetHat.config[type]
+      if config.blank? || config['bundles'].blank?
+        raise "You need to set up #{type.upcase} bundles " +
+          "in #{AssetHat::CONFIG_FILEPATH}." and return
       end
-      bundles = config['js']['bundles'].keys
+      bundles = config['bundles'].keys
 
       # Minify bundles
       bundles.each do |bundle|
-        Rake::Task['asset_hat:js:minify_bundle'].reenable
-        Rake::Task['asset_hat:js:minify_bundle'].invoke(bundle)
+        task = Rake::Task["asset_hat:#{type}:minify_bundle"]
+        task.reenable
+        task.invoke(bundle)
+      end
+
+      if opts[:show_outro]
+        puts unless report_format == 'short'
+        puts 'Done.'
       end
     end