stylesheet 0.1.1 → 0.1.3

data/lib/stylesheet.rb

@@ -21,6 +21,7 @@ require 'stylesheet/css_charset_rule'
 require 'stylesheet/css_import_rule'
 require 'stylesheet/css_media_rule'
 require 'stylesheet/css_font_face_rule'
+require 'stylesheet/css_null_rule'
 
 require 'stylesheet/css_style_declaration'
 

data/lib/stylesheet/css_null_rule.rb

@@ -0,0 +1,16 @@
+module Stylesheet
+  class CssNullRule < CssRule
+
+    def type
+      CssRule::NULL_RULE
+    end
+
+    def self.matches_rule?(text)
+      true
+    end
+
+    private
+
+    def parse_css_text; end
+  end
+end

data/lib/stylesheet/css_rule.rb

@@ -1,5 +1,6 @@
 module Stylesheet
   class CssRule
+    NULL_RULE      = 0
     STYLE_RULE     = 1
     CHARSET_RULE   = 2
     IMPORT_RULE    = 3
@@ -50,7 +51,7 @@ module Stylesheet
 
     private
 
-    def parse_css_text(css_text)
+    def parse_css_text
       raise NotImplementedError
     end
   end

data/lib/stylesheet/css_rule_list.rb

@@ -22,7 +22,7 @@ module Stylesheet
       rules = rules.to_s.gsub(/\s+/m, " ").gsub(/([\};])\s/, '\1')
 
       directive_re = "@.+?;"
-      rules_re     = ".+?\{.+?\}"
+      rules_re     = ".+?\{.*?\}"
       split_rules = rules.scan(/(#{directive_re}|#{rules_re})/im).map {|r| r[0] }
 
       split_rules.map do |css_text| 

data/lib/stylesheet/css_style_declaration.rb

@@ -15,7 +15,8 @@ module Stylesheet
     def css_text=(css_text)
       @declarations_list = []
 
-      css_text.to_s.strip.chomp(";").split(";").each do |declaration|
+      re = /((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)\s*/
+      css_text.to_s.strip.chomp(";").scan(re).flatten.each do |declaration|
         property, value = declaration.split(":", 2)
         @declarations_list << declaration.strip
         @declarations[property.strip] = parse_value(value.strip)

data/lib/stylesheet/version.rb

@@ -1,3 +1,3 @@
 module Stylesheet
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/css_rule_list_spec.rb

@@ -35,6 +35,10 @@ describe CssRuleList do
       font-size: 90%;
     }"
   end
+  
+  let(:style_w_empty_rules) do 
+    "#cboxOverlay{color:#ccc}#colorbox{}#cboxTopLeft{width:21px;}"
+  end
 
   describe ".new" do 
     it "parses charset rules" do 
@@ -68,6 +72,14 @@ describe CssRuleList do
       expect(rules[0].css_text).to eq "body { color: #444;background-color: #535353;}"
       expect(rules[1].css_text).to eq "p { font-size: 90%;}"
     end
+    
+    it "parses empty rules" do 
+      rules = CssRuleList.new(style_w_empty_rules)
+      expect(rules.length).to eq 3
+      expect(rules[0].css_text).to eq "#cboxOverlay{color:#ccc}"
+      expect(rules[1].css_text).to eq "#colorbox{}"
+      expect(rules[2].css_text).to eq "#cboxTopLeft{width:21px;}"
+    end
   end
   
   describe "#[]" do 

data/spec/css_rule_spec.rb

@@ -26,6 +26,15 @@ describe CssRule do
       src: url(\"http://example.com/fonts/VeraSeBd.ttf\");
     }"
   end
+  
+  let(:moz_doc_text) do 
+    "@-moz-document url-prefix() {
+      .rec_details .rec-ellipsis:before {
+        float:right;
+        content: url(/fade.png);
+      }
+    }"
+  end
 
   describe ".factory" do 
     it "should build an a css style rule" do 
@@ -58,6 +67,12 @@ describe CssRule do
                              :parent_style_sheet => Object.new)
       expect(rule).to be_kind_of(CssFontFaceRule)
     end
+    
+    it "should build a null rule" do 
+      rule = CssRule.factory(:css_text           => moz_doc_text, 
+                             :parent_style_sheet => Object.new)
+      expect(rule).to be_kind_of(CssNullRule)
+    end
   end
 
   describe "#css_text" do 

data/spec/css_style_declaration_spec.rb

@@ -79,4 +79,19 @@ describe CssStyleDeclaration do
       expect(declaration.overflow).to eq ""
     end
   end
+
+  describe "a declaration with base64 encoded rule" do 
+    let(:css_text) do 
+      "background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIi);color:#1d6299;"
+    end
+
+    it "returns the css style declaration for rules with base64 data" do 
+      rule = CssStyleRule.new(:css_text => "div.section { #{css_text} }")
+      decl = CssStyleDeclaration.new(:css_text => css_text, :parent_rule => rule)
+      
+      expected = {"background" => "url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIi)",
+                  "color"      => "#1d6299"}
+      expect(decl.declarations).to eq expected
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylesheet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -148,6 +148,7 @@ files:
 - lib/stylesheet/css_font_face_rule.rb
 - lib/stylesheet/css_import_rule.rb
 - lib/stylesheet/css_media_rule.rb
+- lib/stylesheet/css_null_rule.rb
 - lib/stylesheet/css_rule.rb
 - lib/stylesheet/css_rule_list.rb
 - lib/stylesheet/css_style_declaration.rb