Adds --no-match-shorthand so users can opt out of shorthand matching

I'm fine with keeping shorthand matching the default, but I respect some
people don't like it.

refs: zmoazeni#20

Author: zmoazeni

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Adds --compass-with-config that lets users specify a config
 * Fixes parser error bug when trying to parse blank files
 * Fixes bug where rules from multiple files aren't consolidated
+* Adds --no-match-shorthand to allow users to opt out of shorthand matching
 
 ## 1.0.0 - 4/7/2013 ##
 

lib/csscss/cli.rb

@@ -8,6 +8,7 @@ def initialize(argv)
       @compass            = false
       @ignored_properties = []
       @ignored_selectors  = []
+      @match_shorthand   = true
     end
 
     def run
@@ -47,7 +48,8 @@ def execute
         redundancies = RedundancyAnalyzer.new(all_contents).redundancies(
           minimum:            @minimum,
           ignored_properties: @ignored_properties,
-          ignored_selectors:  @ignored_selectors
+          ignored_selectors:  @ignored_selectors,
+          match_shorthand:    @match_shorthand
         )
 
         if @json
@@ -108,6 +110,10 @@ def parse(argv)
           enable_compass(config)
         end
 
+        opts.on("--[no-]match-shorthand", "Expands shorthand rules and matches on explicit rules (default is true)") do |match_shorthand|
+          @match_shorthand = match_shorthand
+        end
+
         opts.on("-j", "--[no-]json", "Output results in JSON") do |j|
           @json = j
         end

lib/csscss/redundancy_analyzer.rb

@@ -9,6 +9,7 @@ def redundancies(opts = {})
       minimum            = opts[:minimum]
       ignored_properties = opts[:ignored_properties] || []
       ignored_selectors  = opts[:ignored_selectors] || []
+      match_shorthand    = opts.fetch(:match_shorthand, true)
 
       rule_sets = Parser::Css.parse(@raw_css)
       matches = {}
@@ -20,7 +21,7 @@ def redundancies(opts = {})
         rule_set.declarations.each do |dec|
           next if ignored_properties.include?(dec.property)
 
-          if parser = shorthand_parser(dec.property)
+          if match_shorthand && parser = shorthand_parser(dec.property)
             if new_decs = parser.parse(dec.property, dec.value)
               if dec.property == "border"
                 %w(border-top border-right border-bottom border-left).each do |property|

test/csscss/redundancy_analyzer_test.rb

@@ -184,6 +184,15 @@ module Csscss
       })
     end
 
+    it "doesn't match shorthand when explicitly turned off" do
+      css = %$
+        .foo { background-color: #fff }
+        .bar { background: #fff }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies(match_shorthand:false).must_equal({})
+    end
+
     it "3-way case consolidation" do
       css = %$
         .bar { background: #fff }