stylesheet 0.1.3 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: bb5d18ee1118e1d272c96ec33ecc6b3a2fc834a3b1c922a3505f1efbabedabaa
+  data.tar.gz: b5825b6322c79a693a8c182cf2915c888abfe5ebbf526831b443832cbc9b7979
+SHA512:
+  metadata.gz: 1d283ae915974d1238de25e13f99c15668f38783d1b21f2bdd6d2927ef0c0cbe3f6d6a0b29019975b6dd3624e9ceacbc149e29cf45568df32b493ab5a4c641d5
+  data.tar.gz: 10460aeec21ea54e9b01e6793d715b402d9f9b1e69d19e54933e405d4b5c5a3afc283a46ece2e0d6cdaf56b31282adf4d9fe887fd86f42a44fb8f20c3c4e7fb8

data/README.md

@@ -67,7 +67,7 @@ rule.style.border
 To install Stylesheet, add the gem to your Gemfile: 
 
 ```ruby
-gem "stylesheet", "~> 0.1.0"
+gem "stylesheet"
 ```
 
 ## LICENSE

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

@@ -49,7 +49,7 @@ module Stylesheet
     end
 
     def content=(content)
-      @content = content if content != ""
+      @content = content if content
     end
 
     def content
@@ -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
@@ -98,7 +106,8 @@ module Stylesheet
     end
 
     def request_content
-      raise InvalidLocationError unless location.valid?
+      return "" if inline_css?
+      raise InvalidLocationError unless location && location.valid?
       request.get(location.href)
     end
 
@@ -106,4 +115,4 @@ module Stylesheet
       @request ||= Stylesheet.request
     end
   end
-end
+end

data/lib/stylesheet/document.rb

@@ -27,13 +27,14 @@ module Stylesheet
 
     private
 
-    def styles 
+    def styles
       (inline_styles + external_styles).map do |style|
-         { parent:  self,
-           content: style.inner_html, 
-           href:    style["href"],
-           media:   style["media"],
-           title:   style["title"] }
+        html = style.inner_html
+        { parent:  self,
+          content: html != "" ? html : nil,
+          href:    style["href"],
+          media:   style["media"],
+          title:   style["title"] }
       end
     end
 
@@ -60,4 +61,4 @@ module Stylesheet
       @request ||= Stylesheet.request
     end
   end
-end
+end

data/lib/stylesheet/location.rb

@@ -47,7 +47,7 @@ module Stylesheet
     end
 
     def valid?
-       valid_protocol? && valid_host?
+      !!(valid_protocol? && valid_host?)
     end
     
     def expand_paths_from_parent
@@ -74,19 +74,19 @@ module Stylesheet
     def valid_protocol?
       protocol && protocol != ":"
     end
-    
+
     def valid_host?
       host && host != ""
     end
-    
+
     def valid_port?
       port && port != ""
     end
-    
+
     def standard_port?
       port_80? || port_443?
     end
-    
+
     def port_80?
       uri && uri.port == 80 && uri.scheme == "http"
     end
@@ -100,14 +100,13 @@ module Stylesheet
         URI.parse(url.strip)
       rescue URI::InvalidURIError
         URI.parse(URI.escape(url.strip))
-      end      
+      end
 
     # re-raise external library errors in our namespace
     rescue URI::InvalidURIError => error
       raise Stylesheet::InvalidLocationError.new(
         "#{error.class}: #{error.message}")
     end
-    
+
   end
 end
-

data/lib/stylesheet/version.rb

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

data/spec/css_charset_rule_spec.rb

@@ -23,17 +23,17 @@ describe CssCharsetRule do
   describe ".matches_rule?" do 
     it "should match text starting with @charset" do 
       matches = CssCharsetRule.matches_rule?(css_text)
-      expect(matches).to be_true
+      expect(matches).to eq true
     end
     
     it "should not match text without at-rule" do 
       matches = CssCharsetRule.matches_rule?("a:link { color: #357ad1; }")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
 
     it "should not match text without charset" do 
       matches = CssCharsetRule.matches_rule?("@import url(\"import1.css\");")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end    
   end
-end
+end

data/spec/css_font_face_rule_spec.rb

@@ -31,17 +31,17 @@ describe CssFontFaceRule do
   describe ".matches_rule?" do 
     it "should match text starting with @font-face" do 
       matches = CssFontFaceRule.matches_rule?(css_text)
-      expect(matches).to be_true
+      expect(matches).to eq true
     end
     
     it "should not match text without at-rule" do 
       matches = CssFontFaceRule.matches_rule?("a:link { color: #357ad1; }")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
 
     it "should not match text without font-face" do 
       matches = CssFontFaceRule.matches_rule?("@import url(\"import1.css\");")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
   end
-end
+end

data/spec/css_import_rule_spec.rb

@@ -162,17 +162,17 @@ describe CssImportRule do
   describe ".matches_rule?" do 
     it "should match text starting with @import" do 
       matches = CssImportRule.matches_rule?(css_text)
-      expect(matches).to be_true
+      expect(matches).to eq true
     end
     
     it "should not match text without at-rule" do 
       matches = CssImportRule.matches_rule?("a:link { color: #357ad1; }")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
 
     it "should not match text without import" do 
       matches = CssImportRule.matches_rule?("@charset \"UTF-8\";")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
   end
-end
+end

data/spec/css_media_rule_spec.rb

@@ -41,17 +41,17 @@ describe CssMediaRule do
   describe ".matches_rule?" do 
     it "should match text starting with @media" do 
       matches = CssMediaRule.matches_rule?(css_text)
-      expect(matches).to be_true
+      expect(matches).to eq true
     end
 
     it "should not match text without at-rule" do 
       matches = CssMediaRule.matches_rule?("a:link { color: #357ad1; }")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
 
     it "should not match text without media" do 
       matches = CssMediaRule.matches_rule?("@charset \"UTF-8\";")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
   end
-end
+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_rule_spec.rb

@@ -42,12 +42,12 @@ describe CssStyleRule do
   describe ".matches_rule?" do 
     it "should match text that doesn't begin with an at-rule" do 
       matches = CssStyleRule.matches_rule?(css_text)
-      expect(matches).to be_true
+      expect(matches).to eq true
     end
     
     it "should not match rules starting with at-rule" do 
       matches = CssStyleRule.matches_rule?("@import url(\"import1.css\");")
-      expect(matches).to be_false
+      expect(matches).to eq false
     end
   end
-end
+end

data/spec/css_style_sheet_spec.rb

@@ -8,10 +8,10 @@ describe CssStyleSheet do
   describe "#disabled" do 
     it "shows if style sheet is disabled" do 
       sheet = CssStyleSheet.new("http://example.com/css/stylesheets/screen.css")
-      expect(sheet.disabled?).to be_false
+      expect(sheet.disabled?).to eq false
 
       sheet.disabled = true
-      expect(sheet.disabled?).to be_true
+      expect(sheet.disabled?).to eq true
     end
   end
 
@@ -127,7 +127,26 @@ describe CssStyleSheet do
       expect(sheet.type).to eq "text/css"
     end
   end
-  
+
+  describe "#content" do
+    it "doesn't fetch for empty inline styles" do
+      sheet = CssStyleSheet.new(content: "")
+
+      expect {
+        sheet.css_rules.map {|r| r.content }
+      }.not_to raise_error
+    end
+
+    it "doesn't fetch for nil inline styles" do
+      sheet = CssStyleSheet.new(content: nil)
+
+      expect {
+        sheet.css_rules.map {|r| r.content }
+      }.not_to raise_error
+    end
+
+  end
+
   describe "#css_rules" do 
     it "returns a list of css rules found in the style sheet" do 
       sheet = CssStyleSheet.new("http://example.com/css/stylesheets/screen.css")
@@ -142,6 +161,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")
@@ -185,4 +226,4 @@ describe CssStyleSheet do
       
     end
   end
-end
+end

data/spec/location_spec.rb

@@ -8,18 +8,14 @@ describe Location do
       location = Location.new(url)
       expect(location.host).to eq "initvisual.com"
     end
-    
+
     it "should accept relative urls" do 
       location = Location.new("/some/path.html")
       expect(location.to_s).to eq "/some/path.html"
     end
-    
-    it "should throw error for invalid host" do 
-      expect { Location.new("http://") }.to raise_error(InvalidLocationError)
-    end
   end
-  
-  
+
+
   describe "#new with parent" do 
     it "should not expand a full url" do 
       parent   = Location.new("http://example.com/css/url.html")
@@ -31,7 +27,7 @@ describe Location do
     it "should expand a relative path into a full path given the parent" do 
       parent   = Location.new("http://example.com/css/relative.html")
       location = Location.new("stylesheets/screen.css", parent)
-      
+
       expect(location.to_s).to eq "http://example.com/css/stylesheets/screen.css"
     end
 
@@ -40,9 +36,9 @@ describe Location do
       location = Location.new("/css/stylesheets/screen.css", parent)
 
       expect(location.to_s).to eq "http://example.com/css/stylesheets/screen.css"
-    end    
+    end
   end
-  
+
 
   describe "#host" do 
     it "should parse out the url host" do 
@@ -50,27 +46,27 @@ describe Location do
       expect(location.host).to eq "initvisual.com"
     end
   end
-  
-  describe "#host=" do 
-    it "should assign host to url" do 
+
+  describe "#host=" do
+    it "should assign host to url" do
       location = Location.new(url)
-      
+
       location.host = "derekdevries.com"
       expect(location.host).to eq "derekdevries.com"
     end
   end
-  
+
   describe "#hostname" do 
     it "should parse out the url hostname" do 
       location = Location.new(url)
       expect(location.hostname).to eq "initvisual.com"
     end
   end
-  
+
   describe "#hostname=" do 
     it "should assign hostname to url" do 
       location = Location.new(url)
-      
+
       location.hostname = "derekdevries.com"
       expect(location.hostname).to eq "derekdevries.com"
     end
@@ -86,14 +82,14 @@ describe Location do
   describe "#pathname=" do 
     it "should assign path to url" do 
       location = Location.new(url)
-      
+
       location.pathname = "/work"
       expect(location.pathname).to eq "/work"
     end
 
     it "add initial forward-slash if not given" do 
       location = Location.new(url)
-      
+
       location.pathname = "work"
       expect(location.pathname).to eq "/work"
     end
@@ -243,18 +239,23 @@ describe Location do
   describe "#valid?" do 
     it "should be true with a valid host and protocol" do 
       location = Location.new("http://initvisual.com")
-      expect(location.valid?).to be_true
+      expect(location.valid?).to eq true 
     end
 
-    it "should be false for an invalid host" do 
+    it "should be false for an invalid host" do
       location = Location.new("/asdf")
-      expect(location.valid?).to be_false      
+      expect(location.valid?).to eq false
+    end
+
+    it "should be false for a missing host" do
+      location = Location.new("http://")
+      expect(location.valid?).to eq false
     end
 
-    it "should be false for an invalid protocol" do 
+    it "should be false for an invalid protocol" do
       location = Location.new("foo.com/asdf")
-      expect(location.valid?).to be_false
+      expect(location.valid?).to eq false
     end
   end
   
-end
+end

data/stylesheet.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("curb",     "~> 0.8")
   gem.add_runtime_dependency("nokogiri", "~> 1.5")
 
+  gem.add_development_dependency("rake")
   gem.add_development_dependency("rspec", "~> 2.9")
   gem.add_development_dependency("cucumber", "~> 1.2")
 

metadata

@@ -1,126 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: stylesheet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - Derek DeVries
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: A CSS parser based on the DOM API
@@ -130,7 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -215,27 +214,25 @@ files:
 homepage: https://github.com/devrieda/stylesheet
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.2
+signing_key:
+specification_version: 4
 summary: A CSS parser based on the DOM API
 test_files:
 - features/document_styles.feature
@@ -294,4 +291,3 @@ test_files:
 - spec/stubs/fake_request.rb
 - spec/style_sheet_list_spec.rb
 - spec/version_spec.rb
-has_rdoc: