color_parser 0.1.0 → 1.0.0

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/stylesheet/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')         { "spec" }
+  watch(%r{^lib/color_parser/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')           { "spec" }
 end
 

data/README.md

@@ -13,31 +13,16 @@ page = ColorParser::Page.new("http://google.com/")
 colors = page.colors
 ```
 
-Get stylesheets on a given webpage
-
-```ruby
-page = ColorParser::Page.new("http://google.com/")
-stylesheets = page.stylesheets
-```
+## Installation
 
-Get images on a given webpage
+To install ColorParser, add the gem to your Gemfile: 
 
 ```ruby
-page = ColorParser::Page.new("http://google.com/")
-images = page.images
-```
-
-## Installation
-
-```
-gem install color_parser
-```
-```
-gem "color_parser"
+gem "color_parser", "~> 0.1.0"
 ```
 
 ## LICENSE
 
-Copyright (c) 2012 Derek DeVries
+Copyright (c) 2013 Derek DeVries
 
 Released under the [MIT License](http://www.opensource.org/licenses/MIT)

data/color_parser.gemspec

@@ -20,9 +20,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-
-  gem.add_runtime_dependency("curb",     "~> 0.8")
-  gem.add_runtime_dependency("nokogiri", "~> 1.5")
+  
+  gem.add_runtime_dependency("stylesheet", "~> 0.1.3")
 
   gem.add_development_dependency("rake")
   gem.add_development_dependency("rspec", "~> 2.9")

data/lib/color_parser.rb

@@ -1,57 +1,13 @@
 require 'uri'
 require 'curb'
 require 'nokogiri'
+require 'stylesheet'
 
 require 'color_parser/errors'
 require 'color_parser/version'
-require 'color_parser/request'
 require 'color_parser/page'
 require 'color_parser/stylesheet'
 require 'color_parser/color'
-require 'color_parser/image'
 
 module ColorParser
-  # Build url of an asset based on the relative/absolute url
-  def self.parse_asset(doc_url, asset_url)
-    doc_host,   doc_path,   doc_query   = self.parse_url(doc_url)
-    asset_host, asset_path, asset_query = self.parse_url(asset_url)
-
-    # absolute path
-    host, path, query = if asset_url.include?("http")
-      [asset_host, asset_path, asset_query]
-
-    # root relative
-    elsif asset_url[0,1] == "/"
-      [doc_host, asset_path, asset_query]
-
-    # relative
-    else
-      path = File.expand_path("#{doc_path.gsub(/[^\/]*$/, "")}#{asset_path}", "/")
-      [doc_host, path, asset_query]
-    end
-
-    "http://#{host}#{path}#{"?"+query if query}"
-  end
-
-  # parse url parts
-  def self.parse_url(url)
-    begin
-      uri = URI.parse(url.strip)
-    rescue URI::InvalidURIError
-      uri = URI.parse(URI.escape(url.strip))
-    end
-
-    [uri.host, (uri.path != "" ? uri.path : "/"), uri.query]
-  end
-
-
-  # Request
-
-  def self.request=(request)
-    @request = request
-  end
-
-  def self.request
-    @request ||= Request.new
-  end
 end

data/lib/color_parser/page.rb

@@ -1,14 +1,19 @@
 module ColorParser
   # a webpage
   class Page
-    attr_reader :url, :host, :path, :query, :text, :doc
+    attr_reader :url, :text
 
     def initialize(url)
-      @url = url
-      @host, @path, @query = ColorParser.parse_url(url)
+      @style_document = self.class.style_document.new(url)
 
-      @text ||= ColorParser.request.get(url)
-      @doc  ||= Nokogiri::HTML(@text)
+      @url  = @style_document.location.href
+      @text = @style_document.text
+    end
+
+    def stylesheets
+      @stylesheets ||= @style_document.style_sheets.map do |style_sheet|
+        Stylesheet.new(style_sheet)
+      end
     end
 
     def colors
@@ -28,61 +33,13 @@ module ColorParser
       colors.sort {|a,b| b[1]<=>a[1] }.map {|clr| clr.first }
     end
 
-    def images
-      @images ||= inline_images + stylesheet_images
-    end
 
-    def stylesheets
-      @stylesheets ||= inline_styles + external_styles
+    def self.style_document
+      @style_document ||= ::Stylesheet::Document
     end
 
-
-    private
-
-    # find all inline styles and build new stylesheet from them
-    def inline_styles
-      doc.css("style").map do |style|
-        Stylesheet.new(text: style.inner_html, 
-                       type: "inline", 
-                       url:  "http://#{host}#{path}")
-      end
-    end
-
-    def external_styles
-      styles = []
-
-      doc.css("link[rel='stylesheet']").each do |style|
-        next unless href = style["href"]
-
-        asset_url = ColorParser.parse_asset(url, href)
-        next unless text = ColorParser.request.get(asset_url)
-
-        css = Stylesheet.new(text: text, 
-                             type: "external", 
-                             url:  asset_url)
-        styles << css
-      end
-
-      styles
-    end
-
-    def inline_images
-      images = []
-
-      doc.css("img").map do |image|
-        next unless src = image["src"]
-        next unless src.match(/gif|jpg|jpeg|png|bmp/)
-
-        asset_url = ColorParser.parse_asset(url, src)
-        images << Image.new(asset_url)
-      end
-
-      images
-    end
-
-    def stylesheet_images
-      [stylesheets.map {|style| style.images }].flatten
+    def self.style_document=(style_document)
+      @style_document = style_document
     end
   end
-
 end

data/lib/color_parser/stylesheet.rb

@@ -1,23 +1,9 @@
 module ColorParser
-  # a set of css selectors
+
   class Stylesheet
-    attr_reader :url, :type, :host, :path, :query, :text
     
-    def initialize(options)
-      @type  = options[:type]
-      @text  = options[:text]
-      @url   = options[:url]
-
-      @host, @path, @query = ColorParser.parse_url(url)
-    end
-
-    def name
-      path.split("/").last
-    end
-
-    # get imported stylesheets
-    def stylesheets
-      @stylesheets ||= imported_stylesheets
+    def initialize(style_sheet)
+      @style_sheet = style_sheet
     end
 
     # gst list of colors from styles
@@ -28,87 +14,44 @@ module ColorParser
     def bg_colors
       @bg_colors ||= parse_colors(bg_properties)
     end
-
+    
     def text_colors
       @text_colors ||= parse_colors(text_properties)
     end
-
+    
     def border_colors
       @border_colors ||= parse_colors(border_properties)
     end
 
-
-    def images
-      images = []
-
-      image_properties.each do |key, value|
-        if value.include?("url") && match = value.match(/url\(['"]?([^'")]+)/)
-          asset_url = ColorParser.parse_asset(url, match[1])
-          images << Image.new(asset_url)
-        end
-      end
-
-      images
-    end
-
-
-    # groups of css selectors (including imported styles)
-    def selectors
-      selectors = {}
-
-      text.scan(/([^\s\}]+)[\s]*?\{(.*?)\}/m).each do |match|
-        selector, rule = match
-        selectors[selector] ||= []
-        selectors[selector] << rule.strip 
-      end
-
-      # imported styles
-      stylesheets.each do |style| 
-        style.selectors.each do |selector, rule| 
-          selectors[selector] ||= []
-          selectors[selector] += rule
+    def rules
+      rules = {}
+      
+      ([@style_sheet] + style_sheets).each do |css|
+        css.style_rules.each do |rule|
+          rules[rule.selector_text] ||= {}
+          rules[rule.selector_text].merge!(rule.style.declarations)
         end
       end
 
-      selectors
+      rules
     end
 
     # split up selectors into properties, and return property key/value pairs
     def properties
       properties = []
 
-      selectors.each do |selector, rules| 
-        rules.each do |rule|
-          rule.split(";").each do |property| 
-            props = property.split(":", 2).map {|v| v.strip }
-            properties << props if props.size == 2
-          end
-        end
+      rules.values.each do |declarations|
+        declarations.each {|property, value| properties << [property, value] }
       end
-
+      
       properties
     end
 
-
     private
 
-    def imported_stylesheets
-      return [] unless text.include?("@import")
-
-      styles = []
-      text.scan(/@import(?:\surl|\s)(.*?)[;\n]+/).each do |style|
-        style_path = style.first.gsub(/['"\(\);]/, "")
-
-        asset_url = ColorParser.parse_asset(url, style_path)
-        next unless text = ColorParser.request.get(asset_url)
-
-        css = Stylesheet.new(text: text, 
-                             type: "imported", 
-                             url:  asset_url)
-        styles << css
-      end
-
-      styles
+    # get imported stylesheets
+    def style_sheets
+      @style_sheets ||= @style_sheet.import_rules.map {|rule| rule.style_sheet }
     end
 
     # find properties that might have a color
@@ -119,7 +62,7 @@ module ColorParser
          "border-left-color", "color", "outline-color"].include?(key)
       end
     end
-    
+
     # properties with bg colors
     def bg_properties 
       color_properties.select {|key, value| key.include?("background") }
@@ -137,11 +80,6 @@ module ColorParser
       end
     end
 
-    # find properties that might have an image
-    def image_properties
-      color_properties.select {|key, value| key.include?("background") }
-    end
-
     def parse_colors(property_list)
       colors = {}
       

data/lib/color_parser/version.rb

@@ -1,3 +1,3 @@
 module ColorParser
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/spec/fixtures/css_color/stylesheets/color_styles.css

@@ -1,34 +1,34 @@
 /* color names - 008080 */
-div {
+div.one {
   background-color: teal;
 }
 
 /* hex */
-div {
+div.two {
   color: #386ec0;
 }
 
 /* hex short */
-div {
+div.three {
   color: #c0c;
 }
 
 /* rgb -- 718ad7 */
-div {
+div.four {
   color: rgb(113,138,215);
 }
 
 /* rgb spaces -- 3a5dc4 */
-div {
+div.five {
   color: rgb(58, 93, 196);
 }
 
 /* rgba -- 29469e */
-div {
+div.six {
   color: rgba(41,70,158,0.5);
 }
 
 /* rgba spaces -- 3f6aeb */
-div {
+div.seven {
   color: rgba(63, 106, 235, 0.5);
 }

data/spec/fixtures/css_color/stylesheets/frequency.css

@@ -1,34 +1,34 @@
 /* backgrounds */
-div {
+div.one {
   background-color: #3a5dc4;
 }
-div {
+div.two {
   background: #386ec0 url("/images/something.png");
 }
-div {
+div.three {
   background: #386ec0 url("/images/something.png");
 }
 
 
 /* text */
-div {
+div.four {
   color: #718ad7;
 }
-h1 {
+h1.five {
   color: #386ec0;
 }
-h2 {
+h2.six {
   color: #386ec0;
 }
 
 /* borders */
-div {
+div.seven {
   border-color: #718ad7;
 }
-div {
+div.eight {
   border: 1px solid #3a5dc4;
 }
-div {
+div.nine {
   border: 1px solid #3a5dc4;
 }