stylesheet 0.1.3 → 0.1.4

data/lib/stylesheet/css_rule_list.rb

@@ -16,7 +16,7 @@ module Stylesheet
     
     def parse(rules, parent)
       # clean out comments
-      rules = rules.gsub(/\/\*[\s\S]*?\*\//, '')
+      rules = rules.gsub(/\/\*[\s\S]*?\*\//, '').gsub("/*", "").gsub("*/", "")
       
       # clean extraneous whitespace
       rules = rules.to_s.gsub(/\s+/m, " ").gsub(/([\};])\s/, '\1')

data/lib/stylesheet/css_style_declaration.rb

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

data/lib/stylesheet/css_style_sheet.rb

@@ -62,6 +62,14 @@ module Stylesheet
 
     alias_method :rules, :css_rules 
 
+    def import_rules
+      css_rules.select {|r| r.type == CssRule::IMPORT_RULE }
+    end
+    
+    def style_rules
+      css_rules.select {|r| r.type == CssRule::STYLE_RULE }
+    end
+
     def parent_style_sheet
       @parent if @owner_rule
     end

data/lib/stylesheet/version.rb

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

data/spec/css_rule_list_spec.rb

@@ -36,6 +36,17 @@ describe CssRuleList do
     }"
   end
   
+  let(:style_w_mismatched_comments) do 
+    "body {
+      color: #444;
+      background-color: #535353;
+    }
+
+    */
+    p {
+      font-size: 90%;
+    }"  end
+  
   let(:style_w_empty_rules) do 
     "#cboxOverlay{color:#ccc}#colorbox{}#cboxTopLeft{width:21px;}"
   end
@@ -73,6 +84,13 @@ describe CssRuleList do
       expect(rules[1].css_text).to eq "p { font-size: 90%;}"
     end
     
+    it "removes mismatched comments" do 
+      rules = CssRuleList.new(style_w_mismatched_comments)
+      expect(rules.length).to eq 2
+      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

data/spec/css_style_declaration_spec.rb

@@ -94,4 +94,18 @@ describe CssStyleDeclaration do
       expect(decl.declarations).to eq expected
     end
   end
+  
+  describe "a declaration with an invalid rule" do 
+    let(:css_text) do 
+      "padding0;color:#1d6299;"
+    end
+
+    it "skips the invalid rule" do 
+      rule = CssStyleRule.new(:css_text => "div.section { #{css_text} }")
+      decl = CssStyleDeclaration.new(:css_text => css_text, :parent_rule => rule)
+      
+      expected = {"color" => "#1d6299"}
+      expect(decl.declarations).to eq expected
+    end
+  end
 end

data/spec/css_style_sheet_spec.rb

@@ -142,6 +142,28 @@ describe CssStyleSheet do
     end
   end
   
+  describe "#import_rules" do 
+    it "returns all import rules from style sheet" do 
+      sheet = CssStyleSheet.new("http://example.com/css_import/stylesheets/screen.css")
+      expect(sheet.import_rules.length).to eq 9
+      
+      sheet.import_rules.each do |rule|
+        expect(rule.type).to eq CssRule::IMPORT_RULE
+      end
+    end
+  end
+  
+  describe "#style_rules" do 
+    it "returns all style rules from style sheet" do 
+      sheet = CssStyleSheet.new("http://example.com/css_import/stylesheets/screen.css")
+      expect(sheet.style_rules.length).to eq 1
+
+      sheet.style_rules.each do |rule|
+        expect(rule.type).to eq CssRule::STYLE_RULE
+      end
+    end
+  end
+  
   describe "#owner_rule" do 
     let(:parent) do 
       CssStyleSheet.new("http://example.com/css_import/stylesheets/screen.css")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylesheet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: