csscss 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.2.0 - 4/14/2013 ##
+
+* 0 and 0px are now reconciled as redundancies
+* Disables color support by default for windows & ruby < 2.0
+* Fixes bug where unquoted url(data...) isn't parsed correctly
+* Adds support for LESS files
+
 ## 1.1.0 - 4/12/2013 ##
 
 * Fixes bug where CLI --no-color wasn't respected

data/CONTRIBUTORS.md

@@ -2,3 +2,5 @@
 * Carson McDonald @carsonmcdonald
 * Martin Kuckert @MKuckert
 * Ivan Lazarevic @kopipejst
+* Matt DuVall @mduvall twitter:@mduvall_
+* Mekka Okereke @mekka @mekkaokereke

data/Gemfile

@@ -6,6 +6,8 @@ gemspec
 # optional runtime dependencies
 gem "sass"
 gem "compass"
+gem "less"
+gem "therubyracer", :platform => :mri
 
 gem "rake", :require => false
 gem "debugger"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csscss (1.1.0)
+    csscss (1.2.0)
       colorize
       parslet (~> 1.5)
 
@@ -12,6 +12,7 @@ GEM
     chunky_png (1.2.7)
     colorize (0.5.8)
     columnize (0.3.6)
+    commonjs (0.2.6)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -23,6 +24,9 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.0)
     fssm (0.2.10)
+    less (2.3.1)
+      commonjs (~> 0.2.6)
+    libv8 (3.11.8.17)
     m (1.3.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -32,8 +36,12 @@ GEM
     parslet (1.5.0)
       blankslate (~> 2.0)
     rake (10.0.3)
+    ref (1.0.4)
     ruby-prof (0.13.0)
     sass (3.2.7)
+    therubyracer (0.11.4)
+      libv8 (~> 3.11.8.12)
+      ref
 
 PLATFORMS
   ruby
@@ -42,9 +50,11 @@ DEPENDENCIES
   compass
   csscss!
   debugger
+  less
   m
   minitest
   minitest-rg
   rake
   ruby-prof
   sass
+  therubyracer

data/README.md

@@ -45,11 +45,20 @@ rulesets that have fewer matches.
 
     $ csscss -n 10 -v path/to/style.css # ignores rulesets with < 10 matches
 
-If you prefer writing in sass, you can also parse your sass/scss files.
+If you prefer writing in [sass](http://sass-lang.com/), you can also parse your sass/scss files.
 
     $ gem install sass
     $ csscss path/to/style.scss
 
+If you prefer writing in [LESS](http://lesscss.org/), you can also parse your LESS files.
+
+    $ gem install less
+    $ csscss path/to/style.less
+
+LESS requires an additional javascript runtime.
+[v8/therubyracer](https://rubygems.org/gems/therubyracer) on most
+rubies, and [therubyrhino](https://rubygems.org/gems/therubyrhino) on
+jruby.
 
 ## I found bugs ##
 

data/lib/csscss/cli.rb

@@ -3,12 +3,12 @@ module Csscss
     def initialize(argv)
       @argv               = argv
       @verbose            = false
-      @color              = true
+      @color              = !windows_1_9
       @minimum            = 3
       @compass            = false
       @ignored_properties = []
       @ignored_selectors  = []
-      @match_shorthand   = true
+      @match_shorthand    = true
     end
 
     def run
@@ -16,31 +16,22 @@ module Csscss
       execute
     end
 
+    private
     def execute
       warn_old_debug_flag if ENV["CSSCSS_DEBUG"]
 
-      all_contents = @argv.map do |filename|
-        if %w(.scss .sass).include?(File.extname(filename).downcase) && !(filename =~ URI.regexp)
-          begin
-            require "sass"
-          rescue LoadError
-            abort "Must install sass gem before parsing sass/scss files"
-          end
-
-          sass_options = {cache:false}
-          sass_options[:load_paths] = Compass.configuration.sass_load_paths if @compass
-          begin
-            Sass::Engine.for_file(filename, sass_options).render
-          rescue Sass::SyntaxError => e
-            if e.message =~ /compass/ && !@compass
-              puts "Enable --compass option to use compass's extensions"
-              exit 1
-            else
-              raise e
-            end
-          end
+      all_contents= @argv.map do |filename|
+        if filename =~ URI.regexp
+          load_css_file(filename)
         else
-          open(filename) {|f| f.read }
+          case File.extname(filename).downcase
+          when ".scss", ".sass"
+            load_sass_file(filename)
+          when ".less"
+            load_less_file(filename)
+          else
+            load_css_file(filename)
+          end
         end
       end.join("\n")
 
@@ -80,7 +71,7 @@ module Csscss
           @verbose = v
         end
 
-        opts.on("--[no-]color", "Colorize output (default is true)") do |c|
+        opts.on("--[no-]color", "Colorize output (default is #{@color})") do |c|
           @color = c
         end
 
@@ -133,7 +124,6 @@ module Csscss
       print_help(opts)
     end
 
-    private
     def print_help(opts)
       puts opts
       exit
@@ -155,6 +145,51 @@ module Csscss
       abort "Must install compass gem before enabling its extensions"
     end
 
+    def windows_1_9
+      RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ && RUBY_VERSION =~ /^1\.9/
+    end
+
+    def gem_installed?(gem_name)
+      begin
+        require gem_name
+        true
+      rescue LoadError
+        false
+      end
+    end
+
+    def load_sass_file(filename)
+      if !gem_installed?("sass") then
+        abort 'Must install the "sass" gem before parsing sass/scss files'
+      end
+
+      sass_options = {cache:false}
+      sass_options[:load_paths] = Compass.configuration.sass_load_paths if @compass
+      begin
+        Sass::Engine.for_file(filename, sass_options).render
+      rescue Sass::SyntaxError => e
+        if e.message =~ /compass/ && !@compass
+          puts "Enable --compass option to use compass's extensions"
+          exit 1
+        else
+          raise e
+        end
+      end
+    end
+
+    def load_less_file(filename)
+      if !gem_installed?("less") then
+        abort 'Must install the "less" gem before parsing less files'
+      end
+
+      contents = load_css_file(filename)
+      Less::Parser.new.parse(contents).to_css
+    end
+
+    def load_css_file(filename)
+      open(filename) {|f| f.read }
+    end
+
     class << self
       def run(argv)
         new(argv).run

data/lib/csscss/parser/common.rb

@@ -5,17 +5,19 @@ module Csscss
 
       UNITS = %w(px em ex in cm mm pt pc)
 
-      rule(:space)      { match['\s'].repeat(1) }
-      rule(:space?)     { space.maybe }
-      rule(:number)     { match["0-9"] }
-      rule(:numbers)    { number.repeat(1) }
-      rule(:decimal)    { numbers >> str(".").maybe >> numbers.maybe }
-      rule(:percent)    { decimal >> stri("%") >> space? }
-      rule(:length)     { decimal >> stri_list(UNITS) >> space?  }
-      rule(:identifier) { match["a-zA-Z"].repeat(1) }
-      rule(:inherit)    { stri("inherit") }
-      rule(:eof)        { any.absent? }
-      rule(:nada)       { any.repeat.as(:nada) }
+      rule(:space)           { match['\s'].repeat(1) }
+      rule(:space?)          { space.maybe }
+      rule(:number)          { match["0-9"] }
+      rule(:numbers)         { number.repeat(1) }
+      rule(:decimal)         { numbers >> str(".").maybe >> numbers.maybe }
+      rule(:percent)         { decimal >> stri("%") >> space? }
+      rule(:non_zero_length) { decimal >> stri_list(UNITS) >> space?  }
+      rule(:zero_length)     { match["0"] }
+      rule(:length)          { zero_length | non_zero_length }
+      rule(:identifier)      { match["a-zA-Z"].repeat(1) }
+      rule(:inherit)         { stri("inherit") }
+      rule(:eof)             { any.absent? }
+      rule(:nada)            { any.repeat.as(:nada) }
 
       rule(:http) {
         (match['a-zA-Z0-9.:/\-'] | str('\(') | str('\)')).repeat >> space?
@@ -29,7 +31,7 @@ module Csscss
         stri("url") >> parens do
           (any_quoted { http } >> space?) |
           (any_quoted { data } >> space?) |
-          http
+          data | http
         end
       }
 

data/lib/csscss/parser/css.rb

@@ -25,7 +25,13 @@ module Csscss
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
           str(":") >>
-          match["^;}"].repeat(1).as(:value) >>
+          (match["^;}"].repeat(1).capture(:stuff) >> dynamic {|source, context|
+            if context.captures[:stuff].to_s =~ /data:/
+              str(";") >> match["^;}"].repeat(1)
+            else
+              any.present?
+            end
+          }).as(:value) >>
           str(";").maybe >>
           space?
         }

data/lib/csscss/redundancy_analyzer.rb

@@ -65,7 +65,6 @@ module Csscss
         end
       end
 
-
       # trims any derivative declarations alongside shorthand
       inverted_matches.each do |selectors, declarations|
         redundant_derivatives = declarations.select do |dec|

data/lib/csscss/types.rb

@@ -30,14 +30,15 @@ module Csscss
 
     def ==(other)
       if other.respond_to?(:property) && other.respond_to?(:value)
-        property == other.property && value == other.value
+        # using eql? tanks performance
+        property == other.property && normalize_value(value) == normalize_value(other.value)
       else
         false
       end
     end
 
     def hash
-      [property, value].hash
+      [property, normalize_value(value)].hash
     end
 
     def eql?(other)
@@ -67,6 +68,15 @@ module Csscss
         "<#{self.class} #{to_s}>"
       end
     end
+
+    private
+    def normalize_value(value)
+      if value =~ /^0(#{Csscss::Parser::Common::UNITS.join("|")}|%)$/
+        "0"
+      else
+        value
+      end
+    end
   end
 
   class Selector < Struct.new(:selectors)

data/lib/csscss/version.rb

@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/csscss/parser/common_test.rb

@@ -106,6 +106,8 @@ module Csscss::Parser
         @parser.length.must_parse "123px"
         @parser.length.must_parse "123EM"
         @parser.length.must_parse "1.23Pt"
+        @parser.length.must_parse "0"
+        @parser.length.wont_parse "1"
       end
     end
 
@@ -115,15 +117,16 @@ module Csscss::Parser
         @parser.http.must_parse 'foo\(bar\).jpg'
         @parser.http.must_parse 'http://foo\(bar\).jpg'
         @parser.http.must_parse 'http://foo.com/baz/\(bar\).jpg'
-        @parser.http.must_parse '//foo.com/foo.jpg'
-        @parser.http.must_parse 'https://foo.com/foo.jpg'
-        @parser.http.must_parse 'http://foo100.com/foo.jpg'
-        @parser.http.must_parse 'http://foo-bar.com/foo.jpg'
+        @parser.http.must_parse "//foo.com/foo.jpg"
+        @parser.http.must_parse "https://foo.com/foo.jpg"
+        @parser.http.must_parse "http://foo100.com/foo.jpg"
+        @parser.http.must_parse "http://foo-bar.com/foo.jpg"
       end
 
       it "parses data" do
-        @parser.data.must_parse 'data:image/jpg;base64,IMGDATAGOESHERE=='
-        @parser.data.must_parse 'data:image/svg+xml;base64,IMGDATAGOESHERE4/5/h/1+=='
+        @parser.data.must_parse "data:image/jpg;base64,IMGDATAGOESHERE=="
+        @parser.data.must_parse "data:image/svg+xml;base64,IMGDATAGOESHERE4/5/h/1+=="
+        @parser.data.must_parse "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAACECAYAAABRaEHiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHRJREFUeNqkUjESwCAIw+T/X/UHansdkLTQDnXgCAHNEW2tZbDz/Aq994bzqoY5Z8wEwiEcmmfwiRK+EGOMTVBrtz4mY9kEAyz6+E3sJ7MWBs1PaUy1lHLLmgTqElltNxLiINTBbWi0Vj5DZC9CaqZEOwQYAPhxY/7527NfAAAAAElFTkSuQmCC"
       end
 
       it "parses urls" do
@@ -133,6 +136,7 @@ module Csscss::Parser
         @parser.url.must_parse "url('foo.jpg')"
         @parser.url.must_parse "url('foo.jpg'  )"
         @parser.url.must_parse 'url(foo\(bar\).jpg)'
+        @parser.url.must_parse "url(data:image/svg+xml;base64,IMGDATAGOESHERE4/5/h/1+==)"
         @parser.url.must_parse "url('data:image/svg+xml;base64,IMGDATAGOESHERE4/5/h/1+==')"
       end
     end

data/test/csscss/parser/css_test.rb

@@ -134,6 +134,39 @@ module Csscss::Parser
           rs(sel("h1"), [dec("display", "none")])
         ])
       end
+
+      it "parses attributes with encoded data that include semicolons" do
+        trans(%$
+            .foo1 {
+              background: rgb(123, 123, 123) url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAACECAYAAABRaEHiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHRJREFUeNqkUjESwCAIw+T/X/UHansdkLTQDnXgCAHNEW2tZbDz/Aq994bzqoY5Z8wEwiEcmmfwiRK+EGOMTVBrtz4mY9kEAyz6+E3sJ7MWBs1PaUy1lHLLmgTqElltNxLiINTBbWi0Vj5DZC9CaqZEOwQYAPhxY/7527NfAAAAAElFTkSuQmCC) repeat-x;
+              display: block;
+            }
+
+            .foo2 {
+              background: white url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAACECAYAAABRaEHiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHRJREFUeNqkUjESwCAIw+T/X/UHansdkLTQDnXgCAHNEW2tZbDz/Aq994bzqoY5Z8wEwiEcmmfwiRK+EGOMTVBrtz4mY9kEAyz6+E3sJ7MWBs1PaUy1lHLLmgTqElltNxLiINTBbWi0Vj5DZC9CaqZEOwQYAPhxY/7527NfAAAAAElFTkSuQmCC) repeat-x
+            }
+
+            .foo3 {
+              outline: 1px;
+              background: white url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAACECAYAAABRaEHiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHRJREFUeNqkUjESwCAIw+T/X/UHansdkLTQDnXgCAHNEW2tZbDz/Aq994bzqoY5Z8wEwiEcmmfwiRK+EGOMTVBrtz4mY9kEAyz6+E3sJ7MWBs1PaUy1lHLLmgTqElltNxLiINTBbWi0Vj5DZC9CaqZEOwQYAPhxY/7527NfAAAAAElFTkSuQmCC) repeat-x;
+              display: block;
+            }
+
+            .foo4 {
+              background: blue url(images/bg-bolt-inactive.png) no-repeat 99% 5px;
+              display: block;
+            }
+        $).must_equal([
+          rs(sel(".foo1"), [dec("background", "rgb(123, 123, 123) url(data:image/png;base64,ivborw0kggoaaaansuheugaaaaeaaacecayaaabraehiaaaagxrfwhrtb2z0d2fyzqbbzg9izsbjbwfnzvjlywr5ccllpaaaahrjrefuenqkujeswcaiw+t/x/uhansdkltqdnxgcahnew2tzbdz/aq994bzqoy5z8wewiecmmfwirk+egomtvbrtz4my9keayz6+e3sj7mwbs1pauy1lhllmgtqelltnxliintbbwi0vj5dzc9caqzeowqyaphxy/7527nfaaaaaelftksuqmcc) repeat-x"),
+                            dec("display", "block")]),
+          rs(sel(".foo2"), [dec("background", "white url(data:image/png;base64,ivborw0kggoaaaansuheugaaaaeaaacecayaaabraehiaaaagxrfwhrtb2z0d2fyzqbbzg9izsbjbwfnzvjlywr5ccllpaaaahrjrefuenqkujeswcaiw+t/x/uhansdkltqdnxgcahnew2tzbdz/aq994bzqoy5z8wewiecmmfwirk+egomtvbrtz4my9keayz6+e3sj7mwbs1pauy1lhllmgtqelltnxliintbbwi0vj5dzc9caqzeowqyaphxy/7527nfaaaaaelftksuqmcc) repeat-x")]),
+          rs(sel(".foo3"), [dec("outline", "1px"),
+                            dec("background", "white url(data:image/png;base64,ivborw0kggoaaaansuheugaaaaeaaacecayaaabraehiaaaagxrfwhrtb2z0d2fyzqbbzg9izsbjbwfnzvjlywr5ccllpaaaahrjrefuenqkujeswcaiw+t/x/uhansdkltqdnxgcahnew2tzbdz/aq994bzqoy5z8wewiecmmfwirk+egomtvbrtz4my9keayz6+e3sj7mwbs1pauy1lhllmgtqelltnxliintbbwi0vj5dzc9caqzeowqyaphxy/7527nfaaaaaelftksuqmcc) repeat-x"),
+                            dec("display", "block")]),
+          rs(sel(".foo4"), [dec("background", "blue url(images/bg-bolt-inactive.png) no-repeat 99% 5px"),
+                            dec("display", "block")])
+        ])
+      end
     end
   end
 end

data/test/csscss/redundancy_analyzer_test.rb

@@ -275,6 +275,18 @@ module Csscss
       })
     end
 
+    it "matches 0 and 0px" do
+      css = %$
+        .bar { padding: 0; }
+        .foo { padding: 0px; }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".foo")] => [dec("padding", "0")]
+      })
+    end
+
+
     # TODO: someday
     # it "reports duplication within the same selector" do
     #   css = %$

data/test/csscss/types_test.rb

@@ -69,5 +69,13 @@ module Csscss
       h[dec2].must_equal true
       h[dec3].must_equal true
     end
+
+    it "equates 0 length with and without units" do
+      Declaration.new("padding", "0px").must_equal Declaration.new("padding", "0")
+      Declaration.new("padding", "0%").must_equal Declaration.new("padding", "0")
+      Declaration.new("padding", "0").must_equal Declaration.new("padding", "0em")
+
+      Declaration.new("padding", "1").wont_equal Declaration.new("padding", "1px")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -506187209623006521
+      hash: 4177886489285701178
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25