csscss 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.1 - 3/28/2013 ##
+
+* Changes coloring to the selectors and declarations
+* Fixes bug where some duplicates weren't being combined #1
+
 ## 0.2.0 - 3/24/2013 ##
 
 * Colorizes text output.

data/Gemfile.lock

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

data/lib/csscss/redundancy_analyzer.rb

@@ -87,16 +87,20 @@ module Csscss
 
       # combines selector keys by common declarations
       final_inverted_matches = inverted_matches.dup
-      inverted_matches.to_a[0..-2].each_with_index do |(selector_group1, declarations1), index|
+      inverted_matches.to_a.each_with_index do |(selector_group1, declarations1), index|
+        keys = [selector_group1]
         inverted_matches.to_a[(index + 1)..-1].each do |selector_group2, declarations2|
-          if declarations1 == declarations2
-            final_inverted_matches.delete(selector_group1)
+          if declarations1 == declarations2 && final_inverted_matches[selector_group2]
+            keys << selector_group2
             final_inverted_matches.delete(selector_group2)
-            key = (selector_group1 + selector_group2).sort.uniq
-            final_inverted_matches[key] ||= []
-            final_inverted_matches[key].concat(declarations1 + declarations2).uniq!
           end
         end
+
+        if keys.size > 1
+          final_inverted_matches.delete(selector_group1)
+          key = keys.flatten.sort.uniq
+          final_inverted_matches[key] = declarations1
+        end
       end
 
       # sort hash by number of matches

data/lib/csscss/reporter.rb

@@ -10,12 +10,12 @@ module Csscss
 
       io = StringIO.new
       @redundancies.each do |selector_groups, declarations|
-        selector_groups = selector_groups.map {|selectors| maybe_color("{#{selectors}}", :red, should_color) }
+        selector_groups = selector_groups.map {|selectors| "{#{maybe_color(selectors, :red, should_color)}}" }
         last_selector = selector_groups.pop
         count = declarations.size
         io.puts %Q(#{selector_groups.join(", ")} AND #{last_selector} share #{maybe_color(count, :red, should_color)} rule#{"s" if count > 1})
         if verbose
-          declarations.each {|dec| io.puts(maybe_color("  - #{dec}", :yellow, should_color)) }
+          declarations.each {|dec| io.puts("  - #{maybe_color(dec, :yellow, should_color)}") }
         end
       end
 

data/lib/csscss/version.rb

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

data/test/csscss/redundancy_analyzer_test.rb

@@ -76,10 +76,68 @@ module Csscss
           -moz-box-shadow: 1px 1px 10px #CCCCCC;
           -webkit-box-shadow: 1px 1px 10px #CCCCCC;
         }
+
+        .bar2 {
+          background: white;
+
+          -webkit-border-radius: 4px;
+          -moz-border-radius: 4px;
+          box-shadow: 1px 1px 10px #CCCCCC;
+          -moz-box-shadow: 1px 1px 10px #CCCCCC;
+          -webkit-box-shadow: 1px 1px 10px #CCCCCC;
+        }
       $
 
       redundancies = RedundancyAnalyzer.new(css).redundancies(3)
-      redundancies[[sel(".bar"), sel(".baz")]].size.must_equal(5)
+      redundancies[[sel(".bar"), sel(".bar2"), sel(".baz")]].size.must_equal(5)
+    end
+
+    it "correctly finds counts with 3+ shared rules" do
+      css = %$
+        .foo1 {
+          background: white;
+
+          -webkit-border-radius: 4px;
+          -moz-border-radius: 4px;
+          box-shadow: 1px 1px 10px #CCCCCC;
+          -moz-box-shadow: 1px 1px 10px #CCCCCC;
+          -webkit-box-shadow: 1px 1px 10px #CCCCCC;
+        }
+
+        .foo2 {
+          background: white;
+
+          -webkit-border-radius: 4px;
+          -moz-border-radius: 4px;
+          box-shadow: 1px 1px 10px #CCCCCC;
+          -moz-box-shadow: 1px 1px 10px #CCCCCC;
+          -webkit-box-shadow: 1px 1px 10px #CCCCCC;
+        }
+
+        .foo3 {
+          background: white;
+
+          -webkit-border-radius: 4px;
+          -moz-border-radius: 4px;
+          box-shadow: 1px 1px 10px #CCCCCC;
+          -moz-box-shadow: 1px 1px 10px #CCCCCC;
+          -webkit-box-shadow: 1px 1px 10px #CCCCCC;
+        }
+
+        .foo4 {
+          background: white;
+
+          -webkit-border-radius: 4px;
+          -moz-border-radius: 4px;
+          box-shadow: 1px 1px 10px #CCCCCC;
+          -moz-box-shadow: 1px 1px 10px #CCCCCC;
+          -webkit-box-shadow: 1px 1px 10px #CCCCCC;
+        }
+      $
+
+      redundancies = RedundancyAnalyzer.new(css).redundancies
+      redundancies.keys.size.must_equal 1
+      redundancies[[sel(".foo1"), sel(".foo2"), sel(".foo3"), sel(".foo4")]].size.must_equal(6)
     end
 
     it "also matches shorthand rules" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-29 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: -2897207436893680163
+      hash: -1849161592586961535
 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: -2897207436893680163
+      hash: -1849161592586961535
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25