adamh-asset_library 0.3.1 → 0.3.2

data/lib/asset_library/helpers.rb

@@ -3,44 +3,79 @@ class AssetLibrary
     def asset_library_javascript_tags(module_key, format = nil)
       m = AssetLibrary.asset_module(module_key)
       if AssetLibrary.cache
-        @@asset_library_javascript_tags_cache ||= {}
-        @@asset_library_javascript_tags_cache[module_key] ||= script_tag(m.cache_asset.relative_url)
+        AssetLibrary.cache_vars[:javascript_tags] ||= {}
+        AssetLibrary.cache_vars[:javascript_tags][module_key] ||= asset_library_priv.script_tag(m.cache_asset)
       else
-        m.assets(format).collect{|a| script_tag(a.relative_url)}.join("\n")
+        m.assets(format).collect{|a| asset_library_priv.script_tag(a)}.join("\n")
       end
     end
 
     def asset_library_stylesheet_tags(module_key, format = nil)
       m = AssetLibrary.asset_module(module_key)
       if AssetLibrary.cache
-        @@asset_library_stylesheet_tags_cache ||= {}
-        @@asset_library_stylesheet_tags_cache[[module_key, format]] ||= style_tag(m.cache_asset(format).relative_url)
+        AssetLibrary.cache_vars[:stylesheet_tags] ||= {}
+        AssetLibrary.cache_vars[:stylesheet_tags][[module_key, format]] ||= asset_library_priv.style_tag(m.cache_asset(format))
       else
-        import_styles_tag(m.assets(format).collect{|a| a.relative_url})
+        asset_library_priv.import_styles_tag(m.assets(format))
       end
     end
 
     private
 
-    def script_tag(url)
-      "<script type=\"text/javascript\" src=\"#{url}\"></script>"
+    def asset_library_priv
+      @asset_library_priv ||= Priv.new(self)
     end
 
-    def style_tag(url)
-      "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{url}\" />"
-    end
+    class Priv
+      # Don't pollute helper's class's namespace with all our methods; put
+      # them here instead
+
+      attr_accessor :helper
 
-    def import_styles_tag(urls)
-      a = []
-      urls.each_slice(30) do |subset|
-        a << import_style_tag(subset)
+      def initialize(helper)
+        @helper = helper
+      end
+
+      def url(asset)
+        absolute_url(asset.relative_url)
+      end
+
+      def absolute_url(relative_url)
+        host = helper.__send__(:compute_asset_host, relative_url) if helper.respond_to?(:compute_asset_host, true)
+
+        if host && !(host =~ %r{^[-a-z]+://})
+          controller = helper.instance_variable_get(:@controller)
+          request = controller && controller.respond_to?(:request) && controller.request
+          host = request && "#{request.protocol}#{host}"
+        end
+
+        if host
+          "#{host}#{relative_url}"
+        else
+          relative_url
+        end
+      end
+
+      def script_tag(asset)
+        "<script type=\"text/javascript\" src=\"#{url(asset)}\"></script>"
+      end
+
+      def style_tag(asset)
+        "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{url(asset)}\" />"
+      end
+
+      def import_styles_tag(assets)
+        a = []
+        assets.each_slice(30) do |subset|
+          a << import_style_tag(subset)
+        end
+        a.join("\n")
       end
-      a.join("\n")
-    end
 
-    def import_style_tag(urls)
-      imports = urls.collect{ |u| "@import \"#{u}\";" }
-      "<style type=\"text/css\">\n#{imports.join("\n")}\n</style>"
+      def import_style_tag(assets)
+        imports = assets.collect{ |a| "@import \"#{url(a)}\";" }
+        "<style type=\"text/css\">\n#{imports.join("\n")}\n</style>"
+      end
     end
   end
 end

data/lib/asset_library.rb

@@ -33,9 +33,15 @@ class AssetLibrary
 
     def cache=(cache)
       @config = nil
+      @cache_vars = nil
       @cache = cache
     end
 
+    def cache_vars
+      # We store cache_vars even if not caching--this is our "globals"
+      @cache_vars ||= {}
+    end
+
     def config
       return @config if cache && @config
       ret = if File.exist?(config_path)

data/spec/asset_library/helpers_spec.rb

@@ -4,8 +4,20 @@ require File.dirname(__FILE__) + '/../../lib/asset_library/helpers'
 
 describe(AssetLibrary::Helpers) do
   before(:each) do
+    @h = nil
     AssetLibrary.stub!(:root).and_return('/')
   end
+  before(:each) do
+    @old_cache = AssetLibrary.cache # Empty globals
+  end
+
+  after(:each) do
+    @h = nil
+  end
+  after(:each) do
+    AssetLibrary.cache = @old_cache
+    @old_cache = nil
+  end
 
   describe('#asset_library_javascript_tags') do
     describe('when not caching') do
@@ -36,11 +48,26 @@ describe(AssetLibrary::Helpers) do
         AssetLibrary.stub!(:asset_module).and_return(m)
         h.asset_library_javascript_tags(:m).should == '<script type="text/javascript" src="/f.js?123"></script>' + "\n" + '<script type="text/javascript" src="/f2.js?123"></script>'
       end
+
+      it('should use compute_asset_host if available') do
+        m = mock(:assets => [a('/f.js')])
+        AssetLibrary.stub!(:asset_module).and_return(m)
+        h.should_receive(:compute_asset_host).with('/f.js?123').and_return('http://assets.test')
+        h.asset_library_javascript_tags(:m).should =~ %r{"http://assets.test/f.js\?123"}
+      end
+
+      it('should add request protocol to compute_asset_host output if applicable') do
+        m = mock(:assets => [a('/f.js')])
+        AssetLibrary.stub!(:asset_module).and_return(m)
+        h.stub!(:compute_asset_host).and_return('assets.test')
+        h.instance_variable_set(:@controller, mock(:request => mock(:protocol => 'http://')))
+        h.asset_library_javascript_tags(:m).should =~ %r{"http://assets.test/f.js\?123"}
+      end
     end
 
     describe('when caching') do
       before(:each) do
-        AssetLibrary.stub!(:cache).and_return(true)
+        AssetLibrary.cache = true
       end
 
       it('should output a single <script> tag with the cache filename') do
@@ -48,6 +75,14 @@ describe(AssetLibrary::Helpers) do
         AssetLibrary.stub!(:asset_module).and_return(m)
         h.asset_library_javascript_tags(:m).should == '<script type="text/javascript" src="/cache.js?123"></script>'
       end
+
+      it('should use compute_asset_host if available') do
+        m = mock(:cache_asset => a('/cache.js'))
+        AssetLibrary.stub!(:asset_module).and_return(m)
+        h.should_receive(:compute_asset_host).with('/cache.js?123').and_return('http://assets.test')
+        h.asset_library_javascript_tags(:m)
+        #h.asset_library_javascript_tags(:m).should =~ %r{"http://assets.test/cache.js\?123"}
+      end
     end
   end
 
@@ -123,9 +158,10 @@ describe(AssetLibrary::Helpers) do
   end
 
   def h
+    return @h if @h
     c = Class.new do
       include AssetLibrary::Helpers
     end
-    o = c.new
+    @h = c.new
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamh-asset_library
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - adamh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency