asset_hat 0.1.2 → 0.1.3

data/HISTORY

@@ -1,6 +1,14 @@
 HISTORY
 =======
 
+Version 0.1.3 (2010-03-03)
+--------------------------
+* Allowed adding commit IDs and asset hosts to `url(/htc/...)` URLs (e.g.,
+  `/htc/iepngfix.htc`) in CSS, not just images.
+* Changed `AssetHat.config` to memoize only if `cache?` is true. In
+  development environments, this means the config file will be reread with
+  every request.
+
 Version 0.1.2 (2010-01-27)
 --------------------------
 * Memoized HTML output from `include_css` and `include_js` when

data/VERSION.yml

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

data/app/helpers/asset_hat_helper.rb

@@ -88,6 +88,7 @@ module AssetHatHelper
         stylesheet_link_tag(src, options)
       when :js
         javascript_include_tag(src, options)
+      else nil
       end
     end.join("\n")
   end

data/asset_hat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset_hat}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-01-27}
+  s.date = %q{2010-03-03}
   s.description = %q{Minify, bundle, and optimize CSS/JS assets.}
   s.email = %q{ronald.devera@gmail.com}
   s.extra_rdoc_files = [

data/lib/asset_hat.rb

@@ -11,17 +11,21 @@ module AssetHat
   CONFIG_FILEPATH = File.join(RAILS_ROOT, 'config', 'assets.yml')
 
   class << self
-    attr_accessor :html_cache
+    attr_accessor :config, :asset_exists, :html_cache
   end
 
   def self.config
-    @@config ||= YAML.load(File.open(CONFIG_FILEPATH, 'r'))
+    if !cache? || @config.blank?
+      @config = YAML.load(File.open(CONFIG_FILEPATH, 'r'))
+    end
+    @config
   end
 
   def self.assets_dir(type)
     case type.to_sym
     when :css ; STYLESHEETS_DIR
     when :js  ; JAVASCRIPTS_DIR
+    else nil
     end
   end
 
@@ -33,14 +37,14 @@ module AssetHat
       return
     end
 
-    @@asset_exists ||= TYPES.inject({}) do |hsh, known_type|
+    @asset_exists ||= TYPES.inject({}) do |hsh, known_type|
       hsh.merge!(known_type => {})
     end
-    if @@asset_exists[type][filename].nil?
-      @@asset_exists[type][filename] =
+    if @asset_exists[type][filename].nil?
+      @asset_exists[type][filename] =
         File.exist?(File.join(self.assets_dir(type), filename))
     end
-    @@asset_exists[type][filename]
+    @asset_exists[type][filename]
   end
 
   def self.cache? ; ActionController::Base.perform_caching ; end

data/lib/asset_hat/css.rb

@@ -13,19 +13,19 @@ module AssetHat
     def self.minify(input_string, options={})
       options.reverse_merge!(:engine => :cssmin)
 
-      options[:engine] = options[:engine].to_sym
-      unless ENGINES.include?(options[:engine])
+      engine = options[:engine].to_sym
+      unless ENGINES.include?(engine)
         raise %Q{
-          Unknown CSS minification engine '#{options[:engine]}'.
+          Unknown CSS minification engine '#{engine}'.
           Allowed: #{ENGINES.map{ |e| "'#{e}'" }.join(', ')}
         }.strip.gsub(/\s+/, ' ') and return
       end
 
-      AssetHat::CSS::Engines.send(options[:engine], input_string)
+      AssetHat::CSS::Engines.send(engine, input_string)
     end
 
     # def self.add_asset_mtimes(css)
-    #   css.gsub(/url[\s]*\((\/images\/[^)]+)\)/) do |match|
+    #   css.gsub(/url[\s]*\((\/(images|htc)\/[^)]+)\)/) do |match|
     #     src = $1
     #     mtime = File.mtime(File.join(Rails.public_path, src))
     #     "url(#{src}?#{mtime.to_i})"
@@ -33,7 +33,7 @@ module AssetHat
     # end
 
     def self.add_asset_commit_ids(css)
-      css.gsub(/url[\s]*\((\/images\/[^)]+)\)/) do |match|
+      css.gsub(/url[\s]*\((\/(images|htc)\/[^)]+)\)/) do |match|
         src = $1
         filepath = File.join(Rails.public_path, src)
         commit_id = AssetHat.last_commit_id(filepath)
@@ -43,7 +43,7 @@ module AssetHat
 
     def self.add_asset_hosts(css, asset_host)
       return if asset_host.blank?
-      css.gsub(/url[\s]*\((\/images\/[^)]+)\)/) do |match|
+      css.gsub(/url[\s]*\((\/(images|htc)\/[^)]+)\)/) do |match|
         src = $1
         "url(#{(asset_host =~ /%d/) ? asset_host % (src.hash % 4) : asset_host}#{src})"
       end

data/lib/asset_hat/js.rb

@@ -15,15 +15,15 @@ module AssetHat
     def self.minify(input_string, options={})
       options.reverse_merge!(:engine => :jsmin)
 
-      options[:engine] = options[:engine].to_sym
-      unless ENGINES.include?(options[:engine])
+      engine = options[:engine].to_sym
+      unless ENGINES.include?(engine)
         raise %Q{
-          Unknown JS minification engine '#{options[:engine]}'.
+          Unknown JS minification engine '#{engine}'.
           Allowed: #{ENGINES.map{ |e| "'#{e}'" }.join(', ')}
         }.strip.gsub(/\s+/, ' ') and return
       end
 
-      AssetHat::JS::Engines.send(options[:engine], input_string)
+      AssetHat::JS::Engines.send(engine, input_string)
     end
 
     module Engines
@@ -76,6 +76,7 @@ module AssetHat
           src = ActionController::Base.consider_all_requests_local ?
             "jquery-#{version}.min.js" :
             "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
+        else nil
         end
         src
       end

data/lib/asset_hat/vcs.rb

@@ -1,4 +1,8 @@
 module AssetHat
+  class << self
+    attr_accessor :last_commit_ids, :last_bundle_commit_ids
+  end
+
   def self.last_commit_id(*args)
     # Usage:
     #
@@ -20,13 +24,13 @@ module AssetHat
       raise 'Git is currently the only supported VCS.' and return
     end
 
-    @@last_commit_ids ||= {}
-    if @@last_commit_ids[filepaths].blank?
+    @last_commit_ids ||= {}
+    if @last_commit_ids[filepaths].blank?
       h = `git log -1 --pretty=format:%h #{filepaths} 2>/dev/null`
         # `h` has either the abbreviated Git commit hash or an empty string
-      @@last_commit_ids[filepaths] = h if h.present?
+      @last_commit_ids[filepaths] = h if h.present?
     end
-    @@last_commit_ids[filepaths]
+    @last_commit_ids[filepaths]
   end
 
   def self.last_bundle_commit_id(bundle, type)
@@ -46,20 +50,20 @@ module AssetHat
     end
 
     # Default to `{:css => {}, :js => {}}`
-    @@last_bundle_commit_ids ||=
+    @last_bundle_commit_ids ||=
       TYPES.inject({}) { |hsh, t| hsh.merge(t => {}) }
 
-    if @@last_bundle_commit_ids[type][bundle].blank?
+    if @last_bundle_commit_ids[type][bundle].blank?
       dir = self.assets_dir(type)
       filepaths = self.bundle_filepaths(bundle, type)
       if filepaths.present?
-        @@last_bundle_commit_ids[type][bundle] = self.last_commit_id(*filepaths)
+        @last_bundle_commit_ids[type][bundle] = self.last_commit_id(*filepaths)
       end
     end
 
-    @@last_bundle_commit_ids[type][bundle]
+    @last_bundle_commit_ids[type][bundle]
   end
 
-  def self.last_commit_ids ; @@last_commit_ids ; end
+  def self.last_commit_ids ; @last_commit_ids ; end
 
 end

data/test/asset_hat_test.rb

@@ -1,13 +1,39 @@
 require 'test_helper'
 
 class AssetHatTest < ActiveSupport::TestCase
+  context 'AssetHat' do
+    context 'with caching enabled' do
+      setup do
+        flexmock(AssetHat).should_receive(:cache? => true)
+      end
+
+      should 'memoize config' do
+        AssetHat.config
+        flexmock(YAML).should_receive(:load).never
+        3.times { AssetHat.config }
+      end
+    end # context 'with caching enabled'
+
+    context 'with caching disabled' do
+      setup do
+        flexmock(AssetHat).should_receive(:cache? => false)
+      end
+
+      should 'not memoize config' do
+        AssetHat.config
+        flexmock(YAML).should_receive(:load).times(3)
+        3.times { AssetHat.config }
+      end
+    end # context 'with caching disabled'
+  end # context 'AssetHat'
+
   context 'AssetHat::CSS' do
     should 'return path to minified file' do
       assert_equal  'foo/bar/baz.min.css',
                     AssetHat::CSS.min_filepath('foo/bar/baz.css')
     end
 
-    should 'add asset commit IDs' do
+    should 'add image asset commit IDs' do
       commit_id = 111
       flexmock(AssetHat).should_receive(:last_commit_id => commit_id)
       flexmock(Rails).should_receive(:public_path => '')
@@ -17,7 +43,17 @@ class AssetHatTest < ActiveSupport::TestCase
                       'p{background:url(/images/foo.png)}')
     end
 
-    should 'add asset hosts' do
+    should 'add .htc asset commit IDs' do
+      commit_id = 111
+      flexmock(AssetHat).should_receive(:last_commit_id => commit_id)
+      flexmock(Rails).should_receive(:public_path => '')
+
+      assert_equal  "p{background:url(/htc/iepngfix.htc?#{commit_id})}",
+                    AssetHat::CSS.add_asset_commit_ids(
+                      'p{background:url(/htc/iepngfix.htc)}')
+    end
+
+    should 'add image asset hosts' do
       asset_host = 'http://media%d.example.com'
       assert_match(
         /^p\{background:url\(http:\/\/media[\d]\.example\.com\/images\/foo.png\)\}$/,
@@ -25,6 +61,15 @@ class AssetHatTest < ActiveSupport::TestCase
           'p{background:url(/images/foo.png)}', asset_host)
       )
     end
+
+    should 'add .htc asset hosts' do
+      asset_host = 'http://media%d.example.com'
+      assert_match(
+        /^p\{background:url\(http:\/\/media[\d]\.example\.com\/htc\/iepngfix.htc\)\}$/,
+        AssetHat::CSS.add_asset_hosts(
+          'p{background:url(/htc/iepngfix.htc)}', asset_host)
+      )
+    end
   end # context 'AssetHat::CSS'
 
   context 'AssetHat::JS' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: asset_hat
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ron DeVera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -05:00
+date: 2010-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency