csscss 0.2.1 → 1.0.0

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0 - 4/7/2013 ##
+
+* Allows the user to specify ignored properties and selectors
+* Better parse error messages
+
 ## 0.2.1 - 3/28/2013 ##
 
 * Changes coloring to the selectors and declarations

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csscss (0.2.1)
+    csscss (1.0.0)
       colorize
       parslet (~> 1.5)
 

data/lib/csscss/cli.rb

@@ -1,11 +1,13 @@
 module Csscss
   class CLI
     def initialize(argv)
-      @argv    = argv
-      @verbose = false
-      @color   = true
-      @minimum = 3
-      @compass = false
+      @argv               = argv
+      @verbose            = false
+      @color              = true
+      @minimum            = 3
+      @compass            = false
+      @ignored_properties = []
+      @ignored_selectors  = []
     end
 
     def run
@@ -40,7 +42,9 @@ module Csscss
           open(filename) {|f| f.read }
         end
 
-        RedundancyAnalyzer.new(contents).redundancies(@minimum)
+        RedundancyAnalyzer.new(contents).redundancies(minimum:           @minimum,
+                                                     ignored_properties: @ignored_properties,
+                                                     ignored_selectors:  @ignored_selectors)
       end
 
       combined_redundancies = all_redundancies.inject({}) do |combined, redundancies|
@@ -61,8 +65,13 @@ module Csscss
       end
 
     rescue Parslet::ParseFailed => e
-      puts "Had a problem parsing the css"
-      puts e.cause.ascii_tree
+      line, column = e.cause.source.line_and_column
+      puts "Had a problem parsing the css at line: #{line}, column: #{column}".red
+      if ENV['CSSCSS_DEBUG'] == 'true'
+        puts e.cause.ascii_tree.red
+      else
+        puts "Run with CSSCSS_DEBUG=true for verbose parser errors".red
+      end
       exit 1
     end
 
@@ -83,6 +92,14 @@ module Csscss
           @minimum = n
         end
 
+        opts.on("--ignore-properties property1,property2,...", Array, "Ignore these properties when finding matches") do |ignored_properties|
+          @ignored_properties = ignored_properties
+        end
+
+        opts.on('--ignore-selectors "selector1","selector2",...', Array, "Ignore these selectors when finding matches") do |ignored_selectors|
+          @ignored_selectors = ignored_selectors
+        end
+
         opts.on("-V", "--version", "Show version") do |v|
           puts opts.ver
           exit

data/lib/csscss/redundancy_analyzer.rb

@@ -5,13 +5,20 @@ module Csscss
       @raw_css = raw_css
     end
 
-    def redundancies(minimum = nil)
+    def redundancies(opts = {})
+      minimum            = opts[:minimum]
+      ignored_properties = opts[:ignored_properties] || []
+      ignored_selectors  = opts[:ignored_selectors] || []
+
       rule_sets = Parser::Css.parse(@raw_css)
       matches = {}
       parents = {}
       rule_sets.each do |rule_set|
+        next if ignored_selectors.include?(rule_set.selectors.selectors)
+        sel = rule_set.selectors
+
         rule_set.declarations.each do |dec|
-          sel = rule_set.selectors
+          next if ignored_properties.include?(dec.property)
 
           if parser = shorthand_parser(dec.property)
             if new_decs = parser.parse(dec.property, dec.value)

data/lib/csscss/version.rb

@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

data/test/csscss/redundancy_analyzer_test.rb

@@ -22,7 +22,7 @@ module Csscss
         [sel(".bar"), sel("h1, h2")] , [dec("outline", "none"), dec("position", "relative")]
       ]
 
-      RedundancyAnalyzer.new(css).redundancies(2).must_equal({
+      RedundancyAnalyzer.new(css).redundancies(minimum:2).must_equal({
         [sel(".bar"), sel("h1, h2")] => [dec("outline", "none"), dec("position", "relative")]
       })
     end
@@ -88,7 +88,7 @@ module Csscss
         }
       $
 
-      redundancies = RedundancyAnalyzer.new(css).redundancies(3)
+      redundancies = RedundancyAnalyzer.new(css).redundancies(minimum:3)
       redundancies[[sel(".bar"), sel(".bar2"), sel(".baz")]].size.must_equal(5)
     end
 
@@ -230,7 +230,7 @@ module Csscss
         [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("border-style", "solid"), dec("border-width", "4px")]
       })
 
-      RedundancyAnalyzer.new(css).redundancies(2).must_equal({
+      RedundancyAnalyzer.new(css).redundancies(minimum:2).must_equal({
         [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("border-style", "solid"), dec("border-width", "4px")]
       })
     end
@@ -248,6 +248,24 @@ module Csscss
       })
     end
 
+    it "ignores specific properties" do
+      css = %$
+        h1, h2 { display: none; position: relative; outline:none}
+        .foo { DISPLAY: none; width: 1px }
+        .bar { position: relative; width: 1px; outline: none }
+        .baz { display: none }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies(ignored_properties:%w(display outline)).must_equal({
+        [sel(".bar"), sel("h1, h2")] => [dec("position", "relative")],
+        [sel(".bar"), sel(".foo")] => [dec("width", "1px")],
+      })
+
+      RedundancyAnalyzer.new(css).redundancies(ignored_properties:%w(display outline), ignored_selectors:%w(.foo)).must_equal({
+        [sel(".bar"), sel("h1, h2")] => [dec("position", "relative")]
+      })
+    end
+
     # TODO: someday
     # it "reports duplication within the same selector" do
     #   css = %$

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1849161592586961535
+      hash: 2330083466520748341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1849161592586961535
+      hash: 2330083466520748341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25