stylesheet 0.1.0 → 0.1.1

data/README.md

@@ -8,52 +8,66 @@ Get styles from a document:
 
 ```ruby
 document = Stylesheet::Document.new("http://sportspyder.com")
+=> #<Document location:http://sportspyder.com/>
+
 document.style_sheets
+=> [#<Stylesheet::CssStyleSheet:0x007fa905c58c20>, 
+    #<Stylesheet::CssStyleSheet:0x007fa905c5f430>, 
+    #<Stylesheet::CssStyleSheet:0x007fa905c5e968>]
 ```
 
 Get attributes of a stylesheet: 
 
 ```ruby
 sheet = document.style_sheets[0]
-puts sheet.href
-puts sheet.type
+=> #<Stylesheet::CssStyleSheet:0x007fa905c58c20>
+
+sheet.href
+=> "http://sportspyder.com/assets/application-26ff2c8d54ab9cd8e74af60fc650390e.css"
+
+sheet.type
+=> "text/css"
 ```
 
 Get stylesheet media definitions: 
 
 ```ruby
-sheet = document.style_sheets[0]
-sheet.media.each do |media| 
-  puts media
-end
+sheet.media.map {|medium| medium }
+=> ["screen"]
 ```
 
 Get rules defined in a stylesheet: 
 
 ```ruby
 sheet = Stylesheet::CssStyleSheet.new("http://sportspyder.com/stylesheets/screen.css")
-sheet.css_rules.each do |rule|
-  puts rule.css_text
-  puts rule.selector_text
-end
+=> #<Stylesheet::CssStyleSheet:0x007fa905c58c20>
+
+rule = sheet.css_rules[0]
+=> #<Stylesheet::CssStyleRule>
+
+rule.css_text
+=> "iframe.editor{width:580px;height:150px;border:1px solid #ccc;background-color:#fff}"
+
+rule.selector_text
+=> "iframe.editor"
 ```
 
 Get declarations defined in a style rules: 
 
 ```ruby
-sheet = document.style_sheets[0]
-rule  = sheet.css_rules[0]
-puts rule.style[0]
-puts rule.style.border
+rule.style[0]
+=> "width:580px"
+
+rule.style.border
+=> "1px solid #ccc"
 ```
 
 ## Installation
 
-```
-gem install stylesheet
-```
-```
-gem "stylesheet"
+To install Stylesheet, add the gem to your Gemfile: 
+
+```ruby
+gem "stylesheet", "~> 0.1.0"
 ```
 
 ## LICENSE

data/lib/stylesheet/css_import_rule.rb

@@ -12,7 +12,9 @@ module Stylesheet
     end
 
     def style_sheet
-      @style_sheet ||= CssStyleSheet.new(location.href)
+      @style_sheet ||= CssStyleSheet.new(:href       => location.href,
+                                         :owner_rule => self,
+                                         :parent     => parent_style_sheet)
     end
 
     def self.matches_rule?(text)

data/lib/stylesheet/css_rule_list.rb

@@ -1,7 +1,7 @@
 module Stylesheet
   class CssRuleList
     extend Forwardable
-    def_delegators :@rules, :length, :size, :[], :each, :to_s
+    def_delegators :@rules, :length, :size, :[], :each, :insert, :delete_at, :to_s
     include Enumerable
 
     def initialize(rules, parent = nil)
@@ -11,10 +11,13 @@ module Stylesheet
     def item(index)
       @rules[index]
     end
-    
+
     private
     
     def parse(rules, parent)
+      # clean out comments
+      rules = rules.gsub(/\/\*[\s\S]*?\*\//, '')
+      
       # clean extraneous whitespace
       rules = rules.to_s.gsub(/\s+/m, " ").gsub(/([\};])\s/, '\1')
 

data/lib/stylesheet/css_style_declaration.rb

@@ -1,35 +1,36 @@
 module Stylesheet
   class CssStyleDeclaration
     extend Forwardable
-    def_delegators :@declarations, :length, :size, :[], :each, :<<, :push, :delete, :to_s
+    def_delegators :@declarations_list, :length, :size, :[], :each, :<<, :push, :delete, :to_s
     include Enumerable
 
-    attr_reader :parent_rule
+    attr_reader :declarations, :parent_rule
 
     def initialize(options={})
+      @declarations = Hash.new("")
       @parent_rule  = options[:parent_rule]
       self.css_text = options[:css_text]
     end
 
     def css_text=(css_text)
-      @declarations, @rules = [], Hash.new("")
+      @declarations_list = []
 
       css_text.to_s.strip.chomp(";").split(";").each do |declaration|
         property, value = declaration.split(":", 2)
-        @declarations << declaration.strip
-        @rules[Inflector.camelize(property.strip)] = parse_value(value.strip)
+        @declarations_list << declaration.strip
+        @declarations[property.strip] = parse_value(value.strip)
       end
     end
 
     def css_text      
-      css_text = @declarations.join("; ")
+      css_text = @declarations_list.join("; ")
       css_text += ";" if css_text != ""
     end
 
     alias_method :to_s, :css_text
 
     def method_missing(name, *args)
-      @rules[name.to_s]
+      @declarations[Inflector.dasherize(name.to_s)]
     end
 
     private

data/lib/stylesheet/css_style_sheet.rb

@@ -1,9 +1,9 @@
 module Stylesheet
   class CssStyleSheet
     attr_accessor :parent, :title
-    attr_reader :href, :media
+    attr_reader :href, :media, :owner_rule
     attr_writer :disabled, :type
-    
+
     def initialize(args)
       if args.kind_of?(String)
         init_with_url(args)
@@ -11,18 +11,19 @@ module Stylesheet
         init_with_hash(args)
       end
     end
-    
+
     def init_with_url(url)
       self.href    = url
       self.media   = ""
       self.content = nil
     end
-    
+
     def init_with_hash(args)
-      @parent  = args[:parent]
-      @title   = args[:title]
-      @type    = args[:type]
-      
+      @parent     = args[:parent]
+      @title      = args[:title]
+      @type       = args[:type]
+      @owner_rule = args[:owner_rule]
+
       self.href     = args[:href]
       self.location = args[:location]
       self.media    = args[:media]
@@ -32,25 +33,25 @@ module Stylesheet
     def disabled?
       @disabled || false
     end
-    
+
     def type
       @type || "text/css"
     end
-    
+
     def href=(url)
       return unless url
       @url  = url
       @href = location.to_s
     end
-    
+
     def media=(media)
       @media ||= MediaList.new(media)
     end
-    
+
     def content=(content)
       @content = content if content != ""
     end
-    
+
     def content
       @content ||= request_content
     end
@@ -62,14 +63,22 @@ module Stylesheet
     alias_method :rules, :css_rules 
 
     def parent_style_sheet
-      parent
+      @parent if @owner_rule
+    end
+
+    def delete_rule(index)
+      @css_rules.delete_at(index)
+    end
+
+    def insert_rule(rule, index)
+      @css_rules.insert(index, rule)
     end
-    
+
     def location
       return if inline_css?
       @location ||= Location.new(@url, parent && parent.location)
     end
-    
+
     def location=(location)
       return unless location
 
@@ -83,7 +92,7 @@ module Stylesheet
     def standalone_css?
       !parent
     end
-    
+
     def inline_css?
       !@url || @url == ""
     end

data/lib/stylesheet/request.rb

@@ -8,12 +8,12 @@ module Stylesheet
 
       curl.body_str
 
-    rescue Stylsheet::Error
+    rescue Stylesheet::Error
       raise
 
     # re-raise external library errors in our namespace
     rescue => error
-      raise Stylsheet::Error.new("#{error.class}: #{error.message}")
+      raise Stylesheet::Error.new("#{error.class}: #{error.message}")
     end
 
     def user_agent

data/lib/stylesheet/version.rb

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

data/spec/css_import_rule_spec.rb

@@ -21,9 +21,9 @@ describe CssImportRule do
     let(:parent) do 
       CssStyleSheet.new("http://example.com/css_import/stylesheets/screen.css")
     end
-    
+
     let(:rule_url) { "http://example.com/css_import/stylesheets/import1.css"  }
-    
+
     it "parses an url from the style rule" do 
       css_text = "@import url(\"http://example.com/css_import/stylesheets/import1.css\");" 
     

data/spec/css_rule_list_spec.rb

@@ -23,7 +23,19 @@ describe CssRuleList do
       src: url(\"http://example.com/fonts/VeraSeBd.ttf\");
     }"
   end
-  
+
+  let(:style_w_comments) do     
+    "body {
+      color: #444;
+      background-color: #535353;
+    }
+
+    /* style paragraphs */
+    p {
+      font-size: 90%;
+    }"
+  end
+
   describe ".new" do 
     it "parses charset rules" do 
       rules = CssRuleList.new(styles)
@@ -49,6 +61,13 @@ describe CssRuleList do
       rules = CssRuleList.new(styles)
       expect(rules[4]).to be_kind_of(CssFontFaceRule)
     end
+
+    it "removes comments" do 
+      rules = CssRuleList.new(style_w_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
   end
   
   describe "#[]" do 

data/spec/css_style_declaration_spec.rb

@@ -51,6 +51,17 @@ describe CssStyleDeclaration do
     end
   end
 
+  describe "rules" do 
+    it "returns a hash of rules" do 
+      expected = {"color"              => "#444", 
+                  "font-size"          => "12px", 
+                  "font-family"        => "Arial, Verdana", 
+                  "border-left"        => "1px solid red", 
+                  "border-right-width" => "1px", 
+                  "background-color"   => "#535353"}
+      expect(declaration.declarations).to eq expected
+    end
+  end
 
   describe "#parent_rule" do 
     it "returns the parent css style rule" do 

data/spec/css_style_sheet_spec.rb

@@ -90,15 +90,20 @@ describe CssStyleSheet do
     end
   end
 
-  describe "#owner_node" do 
-    it "references owning node" do 
+  describe "#parent_style_sheet" do 
+    let(:parent) do 
+      CssStyleSheet.new("http://example.com/css_import/stylesheets/screen.css")
+    end
 
+    it "should be nil for non-imported sheets" do 
+      expect(parent.parent_style_sheet).to be_nil
     end
-  end
-  
-  describe "#parent_style_sheet" do 
+
     it "references parent style sheet" do 
+      text = "@import url(\"import1.css\");" 
+      rule = CssImportRule.new(:css_text => text, :parent_style_sheet => parent)
 
+      expect(rule.style_sheet.parent_style_sheet).to eq parent
     end
   end
 
@@ -138,20 +143,46 @@ describe CssStyleSheet do
   end
   
   describe "#owner_rule" do 
+    let(:parent) do 
+      CssStyleSheet.new("http://example.com/css_import/stylesheets/screen.css")
+    end
+
+    it "should be nil for non-imported sheets" do 
+      expect(parent.owner_rule).to be_nil
+    end
+
     it "references the owner rule" do 
+      text = "@import url(\"import1.css\");" 
+      rule = CssImportRule.new(:css_text => text, :parent_style_sheet => parent)
 
+      expect(rule.style_sheet.owner_rule).to eq rule
     end
   end
   
   describe "#delete_rule" do 
     it "deletes a rule from the css rules" do 
+      css = "div {\n  background-color: #aaa;\n} span {\n  color: #444; \n}"
+      sheet = CssStyleSheet.new(:content => css)
 
+      sheet.css_rules
+      expect(sheet.css_rules.length).to eq 2
+
+      sheet.delete_rule(0)
+      expect(sheet.css_rules.length).to eq 1
+      expect(sheet.css_rules[0].css_text).to eq "span { color: #444;}"
     end
   end
   
   describe "#insert_rule" do 
     it "adds a rule to the css rules" do 
+      css = "div {\n  background-color: #aaa;\n} span {\n  color: #444; \n}"
+      sheet = CssStyleSheet.new(:content => css)
+
+      expect(sheet.css_rules.length).to eq 2
 
+      sheet.insert_rule("#blanc { color: white }", 0); 
+      expect(sheet.css_rules.length).to eq 3
+      
     end
   end
 end

data/spec/request_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Stylesheet do
+  describe "#get" do 
+    it "must return results" do
+      request = Request.new
+
+      # body = request.get("http://google.com")
+      # expect(body).to include "<html"
+    end
+  end
+end

data/stylesheet.gemspec

@@ -6,7 +6,7 @@ require 'stylesheet/version'
 Gem::Specification.new do |gem|
   gem.name          = "stylesheet"
   gem.version       = Stylesheet::VERSION
-  gem.summary       = %q{Stylesheet is a CSS style sheet parser}
+  gem.summary       = %q{A CSS parser based on the DOM API}
   gem.description   = gem.summary
 
   gem.required_ruby_version = '>= 1.9.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylesheet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -123,7 +123,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-description: Stylesheet is a CSS style sheet parser
+description: A CSS parser based on the DOM API
 email:
 - derek@sportspyder.com
 executables: []
@@ -205,6 +205,7 @@ files:
 - spec/inflector_spec.rb
 - spec/location_spec.rb
 - spec/media_list_spec.rb
+- spec/request_spec.rb
 - spec/spec_helper.rb
 - spec/stubs/fake_request.rb
 - spec/style_sheet_list_spec.rb
@@ -234,7 +235,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Stylesheet is a CSS style sheet parser
+summary: A CSS parser based on the DOM API
 test_files:
 - features/document_styles.feature
 - features/rule_declarations.feature
@@ -287,6 +288,7 @@ test_files:
 - spec/inflector_spec.rb
 - spec/location_spec.rb
 - spec/media_list_spec.rb
+- spec/request_spec.rb
 - spec/spec_helper.rb
 - spec/stubs/fake_request.rb
 - spec/style_sheet_list_spec.rb