deadweight 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/deadweight.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deadweight}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aanand Prasad"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2010-01-18}
   s.default_executable = %q{deadweight}
   s.email = %q{aanand.prasad@gmail.com}
   s.executables = ["deadweight"]
@@ -36,28 +36,25 @@ Gem::Specification.new do |s|
      "test/fixtures/style.css",
      "test/rake_task_test.rb",
      "test/test_helper.rb",
-     "vendor/gems/css_parser-0.9.1/CHANGELOG",
-     "vendor/gems/css_parser-0.9.1/LICENSE",
-     "vendor/gems/css_parser-0.9.1/README",
-     "vendor/gems/css_parser-0.9.1/lib/css_parser.rb",
-     "vendor/gems/css_parser-0.9.1/lib/css_parser/parser.rb",
-     "vendor/gems/css_parser-0.9.1/lib/css_parser/regexps.rb",
-     "vendor/gems/css_parser-0.9.1/lib/css_parser/rule_set.rb",
-     "vendor/gems/css_parser-0.9.1/test/fixtures/import-circular-reference.css",
-     "vendor/gems/css_parser-0.9.1/test/fixtures/import-with-media-types.css",
-     "vendor/gems/css_parser-0.9.1/test/fixtures/import1.css",
-     "vendor/gems/css_parser-0.9.1/test/fixtures/simple.css",
-     "vendor/gems/css_parser-0.9.1/test/fixtures/subdir/import2.css",
-     "vendor/gems/css_parser-0.9.1/test/test_css_parser_basic.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_css_parser_downloading.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_css_parser_media_types.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_css_parser_misc.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_css_parser_regexps.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_helper.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_merging.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_rule_set.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_rule_set_creating_shorthand.rb",
-     "vendor/gems/css_parser-0.9.1/test/test_rule_set_expanding_shorthand.rb"
+     "vendor/gems/css_parser-1.0.0/lib/css_parser.rb",
+     "vendor/gems/css_parser-1.0.0/lib/css_parser/parser.rb",
+     "vendor/gems/css_parser-1.0.0/lib/css_parser/regexps.rb",
+     "vendor/gems/css_parser-1.0.0/lib/css_parser/rule_set.rb",
+     "vendor/gems/css_parser-1.0.0/test/fixtures/import-circular-reference.css",
+     "vendor/gems/css_parser-1.0.0/test/fixtures/import-with-media-types.css",
+     "vendor/gems/css_parser-1.0.0/test/fixtures/import1.css",
+     "vendor/gems/css_parser-1.0.0/test/fixtures/simple.css",
+     "vendor/gems/css_parser-1.0.0/test/fixtures/subdir/import2.css",
+     "vendor/gems/css_parser-1.0.0/test/test_css_parser_basic.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_css_parser_downloading.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_css_parser_media_types.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_css_parser_misc.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_css_parser_regexps.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_helper.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_merging.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_rule_set.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_rule_set_creating_shorthand.rb",
+     "vendor/gems/css_parser-1.0.0/test/test_rule_set_expanding_shorthand.rb"
   ]
   s.homepage = %q{http://github.com/aanand/deadweight}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/deadweight.rb

@@ -42,35 +42,40 @@ class Deadweight
     end
   end
 
-  # Find all unused CSS selectors and return them as an array.
-  def run
-    css = CssParser::Parser.new
+  def add_css!(css)
+    parser = CssParser::Parser.new
+    parser.add_block!(css)
 
-    @stylesheets.each do |path|
-      css.add_block!(fetch(path))
+    selector_count = 0
+
+    parser.each_selector do |selector, declarations, specificity|
+      next if @unused_selectors.include?(selector)
+      next if selector =~ @ignore_selectors
+      next if has_pseudo_classes(selector) and @unused_selectors.include?(strip(selector))
+
+      @unused_selectors << selector
+      @parsed_rules[selector] = declarations
+
+      selector_count += 1
     end
 
-    css.add_block!(rules)
+    selector_count
+  end
 
+  # Find all unused CSS selectors and return them as an array.
+  def run
     @parsed_rules     = {}
     @unused_selectors = []
 
-    css.each_selector do |selector, declarations, specificity|
-      unless @unused_selectors.include?(selector)
-        unless selector =~ ignore_selectors
-          @unused_selectors << selector
-          @parsed_rules[selector] = declarations
-        end
-      end
+    @stylesheets.each do |path|
+      new_selector_count = add_css!(fetch(path))
+      log.puts("  found #{new_selector_count} selectors".yellow)
     end
 
-    # Remove selectors with pseudo classes that already have an equivalent
-    # without the pseudo class. Keep the ones that don't, we need to test
-    # them.
-    @unused_selectors.each do |selector|
-      if has_pseudo_classes(selector) && @unused_selectors.include?(strip(selector))
-        @unused_selectors.delete(selector)
-      end
+    if @rules and !@rules.empty?
+      new_selector_count = add_css!(@rules)
+      log.puts
+      log.puts("Added #{new_selector_count} extra selectors".yellow)
     end
 
     total_selectors = @unused_selectors.size

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/lib/css_parser.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 require 'uri'
-require 'md5'
+require 'digest/md5'
 require 'zlib'
 require 'iconv'
 require 'css_parser/rule_set'

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/lib/css_parser/parser.rb

@@ -15,7 +15,7 @@ module CssParser
   # [<tt>import</tt>] Follow <tt>@import</tt> rules. Boolean, default is <tt>true</tt>.
   # [<tt>io_exceptions</tt>] Throw an exception if a link can not be found. Boolean, default is <tt>true</tt>.
   class Parser
-    USER_AGENT   = "Ruby CSS Parser/#{VERSION} (http://code.dunae.ca/css_parser/)"
+    USER_AGENT   = "Ruby CSS Parser/#{RUBY_VERSION} (http://code.dunae.ca/css_parser/)"
 
     STRIP_CSS_COMMENTS_RX = /\/\*.*?\*\//m
     STRIP_HTML_COMMENTS_RX = /\<\!\-\-|\-\-\>/m

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/lib/css_parser/regexps.rb

@@ -2,17 +2,17 @@ module CssParser
   # :stopdoc:
   # Base types
   RE_NL = Regexp.new('(\n|\r\n|\r|\f)')
-  RE_NON_ASCII = Regexp.new('([\x00-\xFF])', Regexp::IGNORECASE)  #[^\0-\177]
-  RE_UNICODE = Regexp.new('(\\\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])*)', Regexp::IGNORECASE | Regexp::EXTENDED | Regexp::MULTILINE)
+  RE_NON_ASCII = Regexp.new('([\x00-\xFF])', Regexp::IGNORECASE, 'n')  #[^\0-\177]
+  RE_UNICODE = Regexp.new('(\\\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])*)', Regexp::IGNORECASE | Regexp::EXTENDED | Regexp::MULTILINE, 'n')
   RE_ESCAPE = Regexp.union(RE_UNICODE, '|(\\\\[^\n\r\f0-9a-f])')
-  RE_IDENT = Regexp.new("[\-]?([_a-z]|#{RE_NON_ASCII}|#{RE_ESCAPE})([_a-z0-9\-]|#{RE_NON_ASCII}|#{RE_ESCAPE})*", Regexp::IGNORECASE)
+  RE_IDENT = Regexp.new("[\-]?([_a-z]|#{RE_NON_ASCII}|#{RE_ESCAPE})([_a-z0-9\-]|#{RE_NON_ASCII}|#{RE_ESCAPE})*", Regexp::IGNORECASE, 'n')
 
   # General strings
   RE_STRING1 = Regexp.new('(\"(.[^\n\r\f\\"]*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\")')
   RE_STRING2 = Regexp.new('(\'(.[^\n\r\f\\\']*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\')')
   RE_STRING = Regexp.union(RE_STRING1, RE_STRING2)
 
-  RE_URI = Regexp.new('(url\([\s]*([\s]*' + RE_STRING.to_s + '[\s]*)[\s]*\))|(url\([\s]*([!#$%&*\-~]|' + RE_NON_ASCII.to_s + '|' + RE_ESCAPE.to_s + ')*[\s]*)\)', Regexp::IGNORECASE | Regexp::EXTENDED  | Regexp::MULTILINE)
+  RE_URI = Regexp.new('(url\([\s]*([\s]*' + RE_STRING.to_s + '[\s]*)[\s]*\))|(url\([\s]*([!#$%&*\-~]|' + RE_NON_ASCII.to_s + '|' + RE_ESCAPE.to_s + ')*[\s]*)\)', Regexp::IGNORECASE | Regexp::EXTENDED  | Regexp::MULTILINE, 'n')
   URI_RX = /url\(("([^"]*)"|'([^']*)'|([^)]*))\)/im
 
   # Initial parsing

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/lib/css_parser/rule_set.rb

@@ -48,6 +48,11 @@ module CssParser
     #
     # If the property already exists its value will be over-written.
     def add_declaration!(property, value)
+      if value.nil? or value.empty?
+        @declarations.delete(property)
+        return
+      end
+      
       value.gsub!(/;\Z/, '')
       is_important = !value.gsub!(CssParser::IMPORTANT_IN_PROPERTY_RX, '').nil?
       property = property.downcase.strip
@@ -84,13 +89,14 @@ module CssParser
     end
 
     # Return all declarations as a string.
+    #--
+    # TODO: Clean-up regexp doesn't seem to work
+    #++
     def declarations_to_s(options = {})
      options = {:force_important => false}.merge(options)
      str = ''
-     each_declaration do |prop, val, is_important|
-       importance = (options[:force_important] || is_important) ? ' !important' : ''
-       str += "#{prop}: #{val}#{importance}; "
-     end 
+     importance = options[:force_important] ? ' !important' : ''
+     each_declaration { |prop, val| str += "#{prop}: #{val}#{importance}; " }
      str.gsub(/^[\s]+|[\n\r\f\t]*|[\s]+$/mx, '').strip
     end
 
@@ -138,6 +144,7 @@ private
       @selectors = selectors.split(',') 
     end
 
+public
     # Split shorthand dimensional declarations (e.g. <tt>margin: 0px auto;</tt>)
     # into their constituent parts.
     def expand_dimensions_shorthand! # :nodoc:
@@ -372,9 +379,5 @@ private
       end
 
     end
-
-
-
-
   end
 end

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/test/test_css_parser_regexps.rb

@@ -1,3 +1,4 @@
+# coding: iso-8859-1
 require File.dirname(__FILE__) + '/test_helper'
 
 # Test cases for CSS regular expressions

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/test/test_helper.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../'))
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
-require 'rubygems'
-require 'test/unit'
-require 'css_parser'
-require 'net/http'
-require 'open-uri'
-require 'WEBrick'
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../'))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
+require 'rubygems'
+require 'test/unit'
+require 'css_parser'
+require 'net/http'
+require 'open-uri'
+require 'WEBrick'

data/vendor/gems/{css_parser-0.9.1 → css_parser-1.0.0}/test/test_rule_set.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
+require "set"
 
 # Test cases for parsing CSS blocks
 class RuleSetTests < Test::Unit::TestCase
@@ -32,7 +33,7 @@ class RuleSetTests < Test::Unit::TestCase
     expected = [
        {:selector => "#content p", :declarations => "color: #fff;", :specificity => 101},
        {:selector => "a", :declarations => "color: #fff;", :specificity => 1}
-    ]    
+    ]
     
     actual = []
     rs = RuleSet.new('#content p, a', 'color: #fff;')
@@ -44,13 +45,13 @@ class RuleSetTests < Test::Unit::TestCase
   end
 
   def test_each_declaration
-    expected = [
+    expected = Set.new([
        {:property => 'margin', :value => '1px -0.25em', :is_important => false},
        {:property => 'background', :value => 'white none no-repeat', :is_important => true},
        {:property => 'color', :value => '#fff', :is_important => false}
-    ]    
+    ])
     
-    actual = []
+    actual = Set.new
     rs = RuleSet.new(nil, 'color: #fff; Background: white none no-repeat !important; margin: 1px -0.25em;')
     rs.each_declaration do |prop, val, imp|
       actual << {:property => prop, :value => val, :is_important => imp}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deadweight
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Aanand Prasad
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -05:00
+date: 2010-01-18 00:00:00 -05:00
 default_executable: deadweight
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,28 +50,25 @@ files:
 - test/fixtures/style.css
 - test/rake_task_test.rb
 - test/test_helper.rb
-- vendor/gems/css_parser-0.9.1/CHANGELOG
-- vendor/gems/css_parser-0.9.1/LICENSE
-- vendor/gems/css_parser-0.9.1/README
-- vendor/gems/css_parser-0.9.1/lib/css_parser.rb
-- vendor/gems/css_parser-0.9.1/lib/css_parser/parser.rb
-- vendor/gems/css_parser-0.9.1/lib/css_parser/regexps.rb
-- vendor/gems/css_parser-0.9.1/lib/css_parser/rule_set.rb
-- vendor/gems/css_parser-0.9.1/test/fixtures/import-circular-reference.css
-- vendor/gems/css_parser-0.9.1/test/fixtures/import-with-media-types.css
-- vendor/gems/css_parser-0.9.1/test/fixtures/import1.css
-- vendor/gems/css_parser-0.9.1/test/fixtures/simple.css
-- vendor/gems/css_parser-0.9.1/test/fixtures/subdir/import2.css
-- vendor/gems/css_parser-0.9.1/test/test_css_parser_basic.rb
-- vendor/gems/css_parser-0.9.1/test/test_css_parser_downloading.rb
-- vendor/gems/css_parser-0.9.1/test/test_css_parser_media_types.rb
-- vendor/gems/css_parser-0.9.1/test/test_css_parser_misc.rb
-- vendor/gems/css_parser-0.9.1/test/test_css_parser_regexps.rb
-- vendor/gems/css_parser-0.9.1/test/test_helper.rb
-- vendor/gems/css_parser-0.9.1/test/test_merging.rb
-- vendor/gems/css_parser-0.9.1/test/test_rule_set.rb
-- vendor/gems/css_parser-0.9.1/test/test_rule_set_creating_shorthand.rb
-- vendor/gems/css_parser-0.9.1/test/test_rule_set_expanding_shorthand.rb
+- vendor/gems/css_parser-1.0.0/lib/css_parser.rb
+- vendor/gems/css_parser-1.0.0/lib/css_parser/parser.rb
+- vendor/gems/css_parser-1.0.0/lib/css_parser/regexps.rb
+- vendor/gems/css_parser-1.0.0/lib/css_parser/rule_set.rb
+- vendor/gems/css_parser-1.0.0/test/fixtures/import-circular-reference.css
+- vendor/gems/css_parser-1.0.0/test/fixtures/import-with-media-types.css
+- vendor/gems/css_parser-1.0.0/test/fixtures/import1.css
+- vendor/gems/css_parser-1.0.0/test/fixtures/simple.css
+- vendor/gems/css_parser-1.0.0/test/fixtures/subdir/import2.css
+- vendor/gems/css_parser-1.0.0/test/test_css_parser_basic.rb
+- vendor/gems/css_parser-1.0.0/test/test_css_parser_downloading.rb
+- vendor/gems/css_parser-1.0.0/test/test_css_parser_media_types.rb
+- vendor/gems/css_parser-1.0.0/test/test_css_parser_misc.rb
+- vendor/gems/css_parser-1.0.0/test/test_css_parser_regexps.rb
+- vendor/gems/css_parser-1.0.0/test/test_helper.rb
+- vendor/gems/css_parser-1.0.0/test/test_merging.rb
+- vendor/gems/css_parser-1.0.0/test/test_rule_set.rb
+- vendor/gems/css_parser-1.0.0/test/test_rule_set_creating_shorthand.rb
+- vendor/gems/css_parser-1.0.0/test/test_rule_set_expanding_shorthand.rb
 has_rdoc: true
 homepage: http://github.com/aanand/deadweight
 licenses: []

data/vendor/gems/css_parser-0.9.1/CHANGELOG

@@ -1,13 +0,0 @@
-=== Ruby CSS Parser CHANGELOG
-
-==== Version 0.9.1
- * Fixed RuleSet#declaration_to_s so it would respect <tt>!important</tt> 
-   rules (thanks to Dana - http://github.com/DanaDanger)
-
-==== Version 0.9
- * Initial version forked from Premailer project
-
-==== TODO: Future
- * border shorthand/folding support
- * re-implement caching on CssParser.merge
- * correctly parse http://www.webstandards.org/files/acid2/test.html

data/vendor/gems/css_parser-0.9.1/LICENSE

@@ -1,21 +0,0 @@
-=== Ruby CSS Parser License
-
-Copyright (c) 2007 Alex Dunae
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/vendor/gems/css_parser-0.9.1/README

@@ -1,58 +0,0 @@
-=== Ruby CSS Parser
-
-Load, parse and cascade CSS rule sets in Ruby.
-
-==== Setup
-
-Install the gem from RubyGems.
-
-   gem install css_parser
-
-Done.
-
-==== An example
-  require 'css_parser'
-  include CssParser
-
-  parser = CssParser::Parser.new
-  parser.load_file!('http://example.com/styles/style.css')
-
-  # lookup a rule by a selector
-  parser.find('#content')
-  #=> 'font-size: 13px; line-height: 1.2;'
-
-  # lookup a rule by a selector and media type
-  parser.find('#content', [:screen, :handheld])
-
-  # iterate through selectors by media type
-  parser.each_selector(:screen) do |selector, declarations, specificity|
-    ...
-  end
-
-  # add a block of CSS
-  css = <<-EOT
-    body { margin: 0 1em; }
-  EOT
-
-  parser.add_block!(css)
-
-  # output all CSS rules in a single stylesheet
-  parser.to_s
-  => #content { font-size: 13px; line-height: 1.2; }
-     body { margin: 0 1em; }
-
-==== Testing
-
-You can run the suite of unit tests using <tt>rake test</tt>.
-
-The download/import tests require that WEBrick is installed.  The tests set up
-a temporary server on port 12000 and pull down files from the <tt>test/fixtures/</tt> 
-directory.
-
-==== Credits and code
-
-By Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-08.
-
-Thanks to Dana (http://github.com/DanaDanger) for the 0.9.1 update.
-
-Made on Vancouver Island.