assets_booster 0.0.10 → 0.0.11

data/lib/assets_booster/merger/css.rb

@@ -1,7 +1,10 @@
+require 'assets_booster/mixin/css'
 require 'assets_booster/merger/base'
 module AssetsBooster
   module Merger
     class CSS < Base
+      include AssetsBooster::Mixin::Css
+
       def name
         "CSS Merger"
       end
@@ -10,7 +13,7 @@ module AssetsBooster
         target_folder = dirname(target)
         code = assets.inject("") do |code, asset|
           source_folder = dirname(asset[:source])
-          asset[:css]= rewrite_urls(asset[:css], source_folder, target_folder)
+          asset[:css]= adjust_relative_urls(asset[:css], source_folder, target_folder)
           code << asset[:css]
           code << "\n"
         end.strip
@@ -43,7 +46,7 @@ module AssetsBooster
           url, quotes = unquote(url.strip)
           
           # we don't want to statically import external stylesheets
-          next import if absolute_url?(url)
+          next import if external_url?(url)
 
           # recursively process the imported css
           load_source(source_folder+url)
@@ -51,40 +54,10 @@ module AssetsBooster
         end
         assets << asset
       end
-
-      def rewrite_urls(css, source_folder, target_folder)
-        url_prepend = path_difference(source_folder, target_folder)
-        return css if url_prepend == ""
   
-        css.gsub(/url\(([^)]+)\)/i) do |match|
-          url, quotes = unquote($1.strip)
-
-          # we don't want to change references to external assets
-          next match if absolute_url?(url) 
-
-          "url(#{quotes}#{url_prepend}/#{url}#{quotes})"
-        end
-      end
-      
-      def unquote(quoted)
-        (quoted[0].chr =~ /["']/) ? [quoted.slice(1, quoted.length-2), quoted[0].chr] : [quoted, ""]
-      end
-      
-      def absolute_url?(url)
-        !!(url =~ /^(\/|https?:\/\/)/i)
-      end
-      
       def dirname(path)
         path.include?("/") ? File.dirname(path) : ""
       end
-      
-      def path_difference(source, target)
-        return source if target == ""
-        if source[0..target.length-1] != target
-          raise ArgumentError, "source and target to not share a common base path [#{source}, #{target}]"
-        end
-        source[target.length+1..-1] || ""
-      end
     end
   end
 end

data/lib/assets_booster/mixin/css.rb

@@ -0,0 +1,38 @@
+require 'assets_booster/mixin/url'
+module AssetsBooster
+  module Mixin
+    module Css
+      include Url
+
+      def unquote(quoted)
+        (quoted[0].chr =~ /["']/) ? [quoted.slice(1, quoted.length-2), quoted[0].chr] : [quoted, ""]
+      end
+
+      def adjust_relative_urls(css, source_folder, target_folder)
+        url_prepend = path_difference(source_folder, target_folder)
+        return css if url_prepend == ""
+  
+        css.gsub(/url\(([^)]+)\)/i) do |match|
+          url, quotes = unquote($1.strip)
+
+          # we don't want to change references to absolute & external assets
+          next match if absolute_url?(url) || external_url?(url) 
+
+          "url(#{quotes}#{url_prepend}/#{url}#{quotes})"
+        end
+      end
+
+      def hostify_urls(base_url, css)
+        css.gsub(/url\(([^)]+)\)/i) do |match|
+          url, quotes = unquote($1.strip)
+
+          # we don't want to change references to external assets
+          next match if external_url?(url)
+
+          url = url[1..-1] if url[0] == "/"
+          "url(#{quotes}#{base_url}/#{url}#{quotes})"
+        end
+      end
+    end
+  end
+end

data/lib/assets_booster/mixin/url.rb

@@ -0,0 +1,21 @@
+module AssetsBooster
+  module Mixin
+    module Url
+      def absolute_url?(url)
+        !!(url =~ %r{^/}i)
+      end
+  
+      def external_url?(url)
+        !!(url =~ %r{^https?://}i)
+      end
+      
+      def path_difference(source, target)
+        return source if target == ""
+        if source[0..target.length-1] != target
+          raise ArgumentError, "source and target to not share a common base path [#{source}, #{target}]"
+        end
+        source[target.length+1..-1] || ""
+      end
+    end
+  end
+end

data/lib/assets_booster/package/stylesheet.rb

@@ -1,6 +1,9 @@
+require 'assets_booster/mixin/css'
 module AssetsBooster
   module Package
     class Stylesheet < Base
+      include AssetsBooster::Mixin::Css
+
       def merger_class
         require "assets_booster/merger/css"
         AssetsBooster::Merger::CSS
@@ -11,9 +14,21 @@ module AssetsBooster
         path = File.join(path, name+".css") if name
       end
       
+      def default_asset_host
+        Rails.configuration.action_controller.asset_host
+      end
+
       def view_helper(view, options)
         if options[:inline]
-          view.style_tag(read, options.except(:inline))
+          code = read
+          inline = options[:inline]
+          if inline.is_a?(Hash)
+            if inline[:hostify_urls]
+              base_url = (inline[:hostify_urls] == true) ? default_asset_host : inline[:hostify_urls] 
+              code = hostify_urls(base_url, code)
+            end
+          end
+          view.style_tag(code, options.except(:inline))
         else
           view.stylesheet_link_tag(view_helper_sources, options)
         end

data/lib/assets_booster/version.rb

@@ -1,3 +1,3 @@
 module AssetsBooster
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/merger/css_spec.rb

@@ -71,88 +71,6 @@ module AssetsBooster
             lambda{ subject.merge("target.css") }.should raise_error(ArgumentError)
           end
         end
-
-        describe "absolute_url?" do
-          it "should detect absolute urls" do
-            [
-              ["http://www.example.com", true],
-              ["HTTP://www.example.com", true],
-              ["https://www.example.com", true],
-              ["/absolute.css", true],
-              ["relative.css", false],
-              ["another/relative.css", false],
-            ].each do |url, result| 
-              subject.absolute_url?(url).should == result
-            end
-          end
-        end
-        
-        describe "path_difference" do
-          it "should return the difference" do
-            [
-              ["", "", ""],
-              ["test", "", "test"],
-              ["test", "test", ""],
-              ["home/test", "", "home/test"],
-              ["home/test", "home", "test"],
-              ["/home/test", "/home", "test"],
-            ].each do |source, target, result| 
-              subject.path_difference(source, target).should == result
-            end
-          end
-          it "should raise if source and target dont share a common base path" do
-            lambda{ subject.path_difference("/home/gucki/test", "/home/peter") }.should raise_error(ArgumentError)
-          end
-        end
-  
-        describe "rewrite_urls" do
-          it "should rewrite url properties" do
-            subject.rewrite_urls("{color:#f00}", "/home/test", "/home/test").should == "{color:#f00}"
-            subject.rewrite_urls("{color:#f00; background:url(test.png)}", "nested", "").should == "{color:#f00; background:url(nested/test.png)}"
-            source_folder = "/home/test/nested"
-            target_folder = "/home/test"
-            [
-              [
-                "{color:#f00}",
-                "{color:#f00}",
-              ],
-              [
-                "{color:#f00; background:url(test.png)}",
-                "{color:#f00; background:url(nested/test.png)}",
-              ],
-              [
-                "{color:#f00; background:url(\"test.png\")}",
-                "{color:#f00; background:url(\"nested/test.png\")}", 
-              ],
-              [
-                "{color:#f00; background:url('test.png')}",
-                "{color:#f00; background:url('nested/test.png')}", 
-              ],
-              [
-                "{color:#f00; background:url('test file.png')}",
-                "{color:#f00; background:url('nested/test file.png')}", 
-              ],
-              [
-                "{color:#f00; background:url(../test.png)}",
-                "{color:#f00; background:url(nested/../test.png)}", 
-              ],
-            ].each do |input, output| 
-              subject.rewrite_urls(input, source_folder, target_folder).should == output
-            end
-          end
-        end
-        
-        describe "unquote" do
-          it "should return unquoted string and quotes" do
-            [
-              ["'test.png'", ["test.png", "'"]],
-              ['"test.png"', ["test.png", '"']],
-              ["test.png", ["test.png", ""]], 
-            ].each do |input, output| 
-              subject.unquote(input).should == output
-            end
-          end
-        end
         
         describe "dirname" do
           it "should return the folder of the given path" do

data/spec/mixin/css_spec.rb

@@ -0,0 +1,81 @@
+require 'assets_booster/mixin/css'
+module AssetsBooster
+  module Mixin
+    describe Css do
+      subject do 
+        dummy = Class.new
+        dummy.extend(described_class)
+      end
+
+      describe "adjust_relative_urls" do
+        it "should adjust relative urls according to path changes of containing css file" do
+          subject.adjust_relative_urls("{color:#f00}", "/home/test", "/home/test").should == "{color:#f00}"
+          subject.adjust_relative_urls("{color:#f00; background:url(test.png)}", "nested", "").should == "{color:#f00; background:url(nested/test.png)}"
+          source_folder = "/home/test/nested"
+          target_folder = "/home/test"
+          [
+            [
+              "{color:#f00}",
+              "{color:#f00}",
+            ],
+            [
+              "{color:#f00; background:url(test.png)}",
+              "{color:#f00; background:url(nested/test.png)}",
+            ],
+            [
+              "{color:#f00; background:url(\"test.png\")}",
+              "{color:#f00; background:url(\"nested/test.png\")}", 
+            ],
+            [
+              "{color:#f00; background:url('test.png')}",
+              "{color:#f00; background:url('nested/test.png')}", 
+            ],
+            [
+              "{color:#f00; background:url('test file.png')}",
+              "{color:#f00; background:url('nested/test file.png')}", 
+            ],
+            [
+              "{color:#f00; background:url(../test.png)}",
+              "{color:#f00; background:url(nested/../test.png)}", 
+            ],
+          ].each do |input, output| 
+            subject.adjust_relative_urls(input, source_folder, target_folder).should == output
+          end
+        end
+
+        it "should not change absolute urls" do
+          subject.adjust_relative_urls("{color:#f00; background:url(/test.png)}", "nested", "").should == "{color:#f00; background:url(/test.png)}"
+        end
+
+        it "should not change external urls" do
+          subject.adjust_relative_urls("{color:#f00; background:url(http://external.com/test.png)}", "nested", "").should == "{color:#f00; background:url(http://external.com/test.png)}"
+        end
+      end
+
+      describe "hostify_urls" do
+        it "should transform relative urls into absolute urls using the given base url" do
+          subject.hostify_urls("http://webcache.eu", "{color:#f00; background:url(test.png)}").should == "{color:#f00; background:url(http://webcache.eu/test.png)}"
+          subject.hostify_urls("http://webcache.eu", "{color:#f00; background:url(/test.png)}").should == "{color:#f00; background:url(http://webcache.eu/test.png)}"
+          subject.hostify_urls("http://webcache.eu", "{color:#f00; background:url(nested/test.png)}").should == "{color:#f00; background:url(http://webcache.eu/nested/test.png)}"
+        end
+
+        it "should not change externals urls" do
+          subject.hostify_urls("http://webcache.eu", "{color:#f00; background:url(http://external.com/test.png)}").should == "{color:#f00; background:url(http://external.com/test.png)}"
+        end
+      end
+
+      describe "unquote" do
+        it "should return unquoted string and quotes" do
+          [
+            ["'test.png'", ["test.png", "'"]],
+            ['"test.png"', ["test.png", '"']],
+            ["test.png", ["test.png", ""]], 
+          ].each do |input, output| 
+            subject.unquote(input).should == output
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/mixin/url_spec.rb

@@ -0,0 +1,60 @@
+require 'assets_booster/mixin/url'
+module AssetsBooster
+  module Mixin
+    describe Url do
+      subject do 
+        dummy = Class.new
+        dummy.extend(described_class)
+      end
+
+      describe "absolute_url?" do
+        it "should only detect absolute urls" do
+          [
+          ["http://www.example.com", false],
+            ["HTTP://www.example.com", false],
+            ["https://www.example.com", false],
+            ["/absolute.css", true],
+            ["relative.css", false],
+            ["another/relative.css", false],
+          ].each do |url, result| 
+            subject.absolute_url?(url).should == result
+          end
+        end
+      end
+
+      describe "external_url?" do
+        it "should only detect absolute urls" do
+          [
+            ["http://www.example.com", true],
+            ["HTTP://www.example.com", true],
+            ["https://www.example.com", true],
+            ["/absolute.css", false],
+            ["relative.css", false],
+            ["another/relative.css", false],
+          ].each do |url, result| 
+            subject.external_url?(url).should == result
+          end
+        end
+      end
+      
+      describe "path_difference" do
+        it "should return the difference" do
+          [
+            ["", "", ""],
+            ["test", "", "test"],
+            ["test", "test", ""],
+            ["home/test", "", "home/test"],
+            ["home/test", "home", "test"],
+            ["/home/test", "/home", "test"],
+          ].each do |source, target, result| 
+            subject.path_difference(source, target).should == result
+          end
+        end
+        it "should raise if source and target dont share a common base path" do
+          lambda{ subject.path_difference("/home/gucki/test", "/home/peter") }.should raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+end
+

data/spec/package/stylesheet_spec.rb

@@ -10,6 +10,13 @@ module AssetsBooster
           end
         end
 
+        describe "default_asset_host" do
+          it "should return Rails.configuratrion.action_controller.asset_host" do
+            Rails.stub_chain(:configuration, :action_controller, :asset_host).and_return(:test)
+            subject.default_asset_host.should == :test
+          end
+        end
+
         describe "view_helper" do
           before do
             @view = double("View")
@@ -31,6 +38,31 @@ module AssetsBooster
               @view.should_receive(:style_tag).with("css code", @options.except(:inline))
               subject.view_helper(@view, @options)
             end
+            
+            describe "and the hositfy_urls option set to true" do
+              before do
+                @options[:inline] = {:hostify_urls => true}
+              end
+
+              it "should return a style tag with inline css whose urls have been hostified with the default asset host" do
+                subject.should_receive(:default_asset_host).and_return("http://webcache.eu")
+                subject.should_receive(:read).and_return("<style>body{background-image:url(test.png)}</style>")
+                @view.should_receive(:style_tag).with("<style>body{background-image:url(http://webcache.eu/test.png)}</style>", @options.except(:inline))
+                subject.view_helper(@view, @options)
+              end
+            end
+            
+            describe "and the hositfy_urls option set to a string" do
+              before do
+                @options[:inline] = {:hostify_urls => "http://myhost.eu"}
+              end
+
+              it "should return a style tag with inline css whose urls have been hostified with the specified host" do
+                subject.should_receive(:read).and_return("<style>body{background-image:url(test.png)}</style>")
+                @view.should_receive(:style_tag).with("<style>body{background-image:url(http://myhost.eu/test.png)}</style>", @options.except(:inline))
+                subject.view_helper(@view, @options)
+              end
+            end
           end
 
           describe "with no special options" do

metadata

@@ -2,7 +2,7 @@
 name: assets_booster
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Corin Langosch
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 Z
+date: 2011-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -98,6 +98,8 @@ files:
 - lib/assets_booster/merger/base.rb
 - lib/assets_booster/merger/css.rb
 - lib/assets_booster/merger/simple.rb
+- lib/assets_booster/mixin/css.rb
+- lib/assets_booster/mixin/url.rb
 - lib/assets_booster/package/base.rb
 - lib/assets_booster/package/javascript.rb
 - lib/assets_booster/package/stylesheet.rb
@@ -117,6 +119,8 @@ files:
 - spec/merger/base.rb
 - spec/merger/css_spec.rb
 - spec/merger/simple_spec.rb
+- spec/mixin/css_spec.rb
+- spec/mixin/url_spec.rb
 - spec/package/base.rb
 - spec/package/javascript_spec.rb
 - spec/package/stylesheet_spec.rb