beautiful-css 0.0.8 → 0.0.9

data/lib/beautiful-css/engine.rb

@@ -18,6 +18,7 @@ module BeautifulCss
 
     def render
       return nil if @input.nil?
+      save_imports
       rules = build_rules
       cleaned = remove_unset rules
       groups = build_groups(cleaned)
@@ -27,11 +28,16 @@ module BeautifulCss
 
     private
 
+    def save_imports
+      @imports = @input.scan(/@import[^;]+;/i)
+    end
+
     def build_rules
       text = scss_to_css @input
+      text = text.gsub(/@import[^;]+;/i, '') #remove imports
       text = text.gsub( /[\n\r\t]/m, " " )
       text = text.gsub( / +/m, " " )
-      text = text.gsub( /\/\*[^*]*\*\//m, " " )
+      text = text.gsub( /\/\*[^*]*\*\//m, " " ) #remove comments
       rules = text.split('}')
       rules = rules.map{|r| RuleParser.new(r).to_rules }.flatten
     end
@@ -59,13 +65,14 @@ module BeautifulCss
     end
 
     def format groups
-      output = ''
+      output = @imports.join('\n') + "\n"
+
       groups.keys.sort.each do |key|
         output += "\n"
         output += groups[key].uniq.join(",\n") + "\n"
         output += key + "\n"
       end
-      output.gsub( /: +/, ':' )
+      output.gsub( /: +/, ':' ).strip
     end
 
 

data/lib/beautiful-css/rule_parser.rb

@@ -5,6 +5,8 @@ module BeautifulCss
 
     def initialize(str)
       @body = str
+      @body = @body.gsub( /url\( *data:/ , '__url_data__')
+      @body = @body.gsub( /;base64,/ , '__base64__')
     end
 
     def selectors
@@ -20,10 +22,17 @@ module BeautifulCss
       end
     end
 
+    def restore_special_strings str
+      str = str.gsub( /__url_data__/, 'url(data:')
+      str = str.gsub( /__base64__/, ';base64,')
+      str
+    end
+
     def to_rules
       selectors.map do |selector|
         props.map do |prop|
-          BeautifulCss::Rule.new(selector, prop[0], prop[1])
+          val = restore_special_strings prop[1]
+          BeautifulCss::Rule.new(selector, prop[0], val)
         end
       end.flatten
     end

data/lib/beautiful-css/version.rb

@@ -1,3 +1,3 @@
 module BeautifulCss
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/convertions_spec.rb

@@ -133,6 +133,49 @@ CLEAN
 
 
 
+  it 'should work with import' do
+    dirty = <<DIRTY
+@import url("blargs.css");
+a { color:green }
+DIRTY
+    clean = <<CLEAN
+@import url("blargs.css");
+
+a
+{ color:green }
+CLEAN
+    assert_renders dirty, clean
+  end
+
+
+
+
+  it 'should work with base64 encoded images' do
+    dirty = <<DIRTY
+a
+{ background:url( data:image/png;base64,iVBORw0KGLKSsg= ); }
+DIRTY
+    clean = <<CLEAN
+a
+{ background:url(data:image/png;base64,iVBORw0KGLKSsg=) }
+CLEAN
+    assert_renders dirty, clean
+  end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   def assert_renders(dirty,clean)
     assert_equal clean.strip, convert(dirty).strip
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful-css
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies: []
 description: A tool to help cleanup css
 email:
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: reworks your css to make it simple and mantainable