assets_booster 0.0.3 → 0.0.4

data/lib/assets_booster/merger/css.rb

@@ -8,12 +8,29 @@ module AssetsBooster
       
       def merge(target)
         target_folder = dirname(target)
-        assets.inject("") do |code, asset|
+        code = assets.inject("") do |code, asset|
           source_folder = dirname(asset[:source])
           asset[:css]= rewrite_urls(asset[:css], source_folder, target_folder)
           code << asset[:css]
           code << "\n"
         end.strip
+        
+        charset = nil
+        code.gsub!(/@charset\s+([^;\n]+)[;\n]*/).each do
+          current_charset, quotes = unquote($1)
+          current_charset.downcase!
+          if charset && charset != current_charset
+            raise ArgumentError, "source files have conflicting charsets (#{charset} != #{current_charset})"
+          end
+          charset = current_charset
+          ""
+        end
+        
+        if charset
+          code = "@charset \"#{charset}\";\n"+code
+        end
+
+        code
       end
 
       def load_source(source)
@@ -23,8 +40,8 @@ module AssetsBooster
         source_folder << "/" unless source_folder == ""
         asset[:css].gsub!(/@import\s+([^;\n]+)[;\n]*/).each do |import|
           url = $1.gsub(/^url\((.+)\)/i, '\1')
-          url, quotes = extract_url(url.strip)
-
+          url, quotes = unquote(url.strip)
+          
           # we don't want to statically import external stylesheets
           next import if absolute_url?(url)
 
@@ -40,7 +57,7 @@ module AssetsBooster
         return css if url_prepend == ""
   
         css.gsub(/url\(([^)]+)\)/i) do |match|
-          url, quotes = extract_url($1.strip)
+          url, quotes = unquote($1.strip)
 
           # we don't want to change references to external assets
           next match if absolute_url?(url) 
@@ -49,8 +66,8 @@ module AssetsBooster
         end
       end
       
-      def extract_url(quoted_url)
-        (quoted_url[0].chr =~ /["']/) ? [quoted_url.slice(1, quoted_url.length-2), quoted_url[0].chr] : [quoted_url, ""]
+      def unquote(quoted)
+        (quoted[0].chr =~ /["']/) ? [quoted.slice(1, quoted.length-2), quoted[0].chr] : [quoted, ""]
       end
       
       def absolute_url?(url)

data/lib/assets_booster/version.rb

@@ -1,3 +1,3 @@
 module AssetsBooster
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/merger/css_spec.rb

@@ -38,6 +38,38 @@ module AssetsBooster
             end
             subject.merge("target.css").should == "{color:#f00;}\n{color:#00f;}\n\n@import url(http://www.example.com/test.css)\n{color:#fff;}"
           end
+
+          it "should merge sources, combine charset directives and move the remaining one at top" do
+            File.stub(:read) do |source| 
+              case source
+              when 'a.css'
+                "{color:#fff;}"
+              when 'nested/b.css'
+                "@charset 'UTF-8';"
+              when 'c.css'
+                "@import d.css;@import e.css"
+              when 'd.css'
+                "{color:#00f;}"
+              when 'e.css'
+                "@charset 'utf-8'"
+              end
+            end
+            subject.merge("target.css").should == "@charset \"utf-8\";\n{color:#fff;}\n{color:#00f;}\n"
+          end
+
+          it "should merge sources, and complain if sources have conflicting charset directives" do
+            File.stub(:read) do |source| 
+              case source
+              when 'a.css'
+                "{color:#fff;}"
+              when 'nested/b.css'
+                "@charset 'UTF-8';"
+              when 'c.css'
+                "@charset 'iso-8859-1'"
+              end
+            end
+            lambda{ subject.merge("target.css") }.should raise_error(ArgumentError)
+          end
         end
 
         describe "absolute_url?" do
@@ -110,14 +142,14 @@ module AssetsBooster
           end
         end
         
-        describe "extract_url" do
-          it "should extract urls" do
+        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.extract_url(input).should == output
+              subject.unquote(input).should == output
             end
           end
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assets_booster
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Corin Langosch