csscss 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.1.0 - 4/12/2013 ##
+
+* Fixes bug where CLI --no-color wasn't respected
+* Added ruby version requirement for >= 1.9
+* Added CONTRIBUTORS.md
+* Fixes bugs with urls that have dashes in them
+* Fixes bugs with urls containing encoded data (usually images)
+* Deprecates CSSCSS_DEBUG in favor of --show-parser-errors
+* Fixes line/column output during parser errors
+* --compass now grabs config.rb by default if it exists
+* 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 ##
 
 * Allows the user to specify ignored properties and selectors

data/CONTRIBUTORS.md

@@ -0,0 +1,4 @@
+* Zach Moazeni <zach.moazeni@gmail.com> @zmoazeni
+* Carson McDonald @carsonmcdonald
+* Martin Kuckert @MKuckert
+* Ivan Lazarevic @kopipejst

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/zmoazeni/csscss.png?branch=master)](https://travis-ci.org/zmoazeni/csscss)
+[![Code Climate](https://codeclimate.com/github/zmoazeni/csscss.png)](https://codeclimate.com/github/zmoazeni/csscss)
 
 ## What is it? ##
 
@@ -20,6 +21,8 @@ First you need to install it. It is currently packaged as a ruby gem:
 
     $ gem install csscss
 
+Note: csscss only works on ruby 1.9.x and up. It will have trouble with ruby 1.8.x.
+
 Then you can run it in at the command line against CSS files.
 
     $ csscss path/to/styles.css path/to/other-styles.css

data/csscss.gemspec

@@ -10,13 +10,15 @@ Gem::Specification.new do |gem|
   gem.email         = ["zach.moazeni@gmail.com"]
   gem.summary       = %q{A CSS redundancy analyzer that analyzes redundancy.}
   gem.description   = %q{csscss will parse any CSS files you give it and let you know which rulesets have duplicated declarations.}
-  gem.homepage      = "http://zmoazeni.github.com/csscss/"
+  gem.homepage      = "http://zmoazeni.github.io/csscss/"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.required_ruby_version = ">= 1.9"
+
   gem.add_dependency "parslet", "~> 1.5"
   gem.add_dependency "colorize"
 end

data/lib/csscss/cli.rb

@@ -8,6 +8,7 @@ module Csscss
       @compass            = false
       @ignored_properties = []
       @ignored_selectors  = []
+      @match_shorthand   = true
     end
 
     def run
@@ -16,14 +17,14 @@ module Csscss
     end
 
     def execute
+      warn_old_debug_flag if ENV["CSSCSS_DEBUG"]
 
-      all_redundancies = @argv.map do |filename|
-        contents = if %w(.scss .sass).include?(File.extname(filename).downcase) && !(filename =~ URI.regexp)
+      all_contents = @argv.map do |filename|
+        if %w(.scss .sass).include?(File.extname(filename).downcase) && !(filename =~ URI.regexp)
           begin
             require "sass"
           rescue LoadError
-            puts "Must install sass gem before parsing sass/scss files"
-            exit 1
+            abort "Must install sass gem before parsing sass/scss files"
           end
 
           sass_options = {cache:false}
@@ -41,36 +42,31 @@ module Csscss
         else
           open(filename) {|f| f.read }
         end
-
-        RedundancyAnalyzer.new(contents).redundancies(minimum:           @minimum,
-                                                     ignored_properties: @ignored_properties,
-                                                     ignored_selectors:  @ignored_selectors)
-      end
-
-      combined_redundancies = all_redundancies.inject({}) do |combined, redundancies|
-        if combined.empty?
-          redundancies
+      end.join("\n")
+
+      unless all_contents.strip.empty?
+        redundancies = RedundancyAnalyzer.new(all_contents).redundancies(
+          minimum:            @minimum,
+          ignored_properties: @ignored_properties,
+          ignored_selectors:  @ignored_selectors,
+          match_shorthand:    @match_shorthand
+        )
+
+        if @json
+          puts JSONReporter.new(redundancies).report
         else
-          combined.merge(redundancies) do |_, v1, v2|
-            (v1 + v2).uniq
-          end
+          report = Reporter.new(redundancies).report(verbose:@verbose, color:@color)
+          puts report unless report.empty?
         end
       end
 
-      if @json
-        puts JSONReporter.new(combined_redundancies).report
-      else
-        report = Reporter.new(combined_redundancies).report(verbose:@verbose, color:true)
-        puts report unless report.empty?
-      end
-
     rescue Parslet::ParseFailed => e
-      line, column = e.cause.source.line_and_column
+      line, column = e.cause.source.line_and_column(e.cause.pos)
       puts "Had a problem parsing the css at line: #{line}, column: #{column}".red
-      if ENV['CSSCSS_DEBUG'] == 'true'
+      if @show_parser_errors || ENV['CSSCSS_DEBUG'] == 'true'
         puts e.cause.ascii_tree.red
       else
-        puts "Run with CSSCSS_DEBUG=true for verbose parser errors".red
+        puts "Run with --show-parser-errors for verbose parser errors".red
       end
       exit 1
     end
@@ -84,7 +80,7 @@ module Csscss
           @verbose = v
         end
 
-        opts.on("--[no-]color", "Colorizes output") do |c|
+        opts.on("--[no-]color", "Colorize output (default is true)") do |c|
           @color = c
         end
 
@@ -105,21 +101,27 @@ module Csscss
           exit
         end
 
-        opts.on("--[no-]compass", "Enables compass extensions when parsing sass/scss") do |compass|
-          if @compass = compass
-            begin
-              require "compass"
-            rescue LoadError
-              puts "Must install compass gem before enabling its extensions"
-              exit 1
-            end
-          end
+        opts.on("--[no-]compass", "Enable compass extensions when parsing sass/scss (default is false)") do |compass|
+          enable_compass if @compass = compass
+        end
+
+        opts.on("--compass-with-config config", "Enable compass extensions when parsing sass/scss and pass config file") do |config|
+          @compass = true
+          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
 
+        opts.on("--show-parser-errors", "Print verbose parser errors") do |show_parser_errors|
+          @show_parser_errors = show_parser_errors
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           print_help(opts)
         end
@@ -137,6 +139,22 @@ module Csscss
       exit
     end
 
+    def warn_old_debug_flag
+      $stderr.puts "CSSCSS_DEBUG is now deprecated. Use --show-parser-errors instead".red
+    end
+
+    def enable_compass(config = nil)
+      require "compass"
+
+      if config
+        Compass.add_configuration(config)
+      else
+        Compass.add_configuration("config.rb") if File.exist?("config.rb")
+      end
+    rescue LoadError
+      abort "Must install compass gem before enabling its extensions"
+    end
+
     class << self
       def run(argv)
         new(argv).run

data/lib/csscss/parser/common.rb

@@ -18,12 +18,17 @@ module Csscss
       rule(:nada)       { any.repeat.as(:nada) }
 
       rule(:http) {
-        (match['a-zA-Z.:/'] | str('\(') | str('\)')).repeat >> space?
+        (match['a-zA-Z0-9.:/\-'] | str('\(') | str('\)')).repeat >> space?
+      }
+
+      rule(:data) {
+        stri("data:") >> match['a-zA-Z0-9.:/+;,=\-'].repeat >> space?
       }
 
       rule(:url) {
         stri("url") >> parens do
           (any_quoted { http } >> space?) |
+          (any_quoted { data } >> space?) |
           http
         end
       }

data/lib/csscss/redundancy_analyzer.rb

@@ -9,6 +9,7 @@ module Csscss
       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 @@ module Csscss
         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|

data/lib/csscss/version.rb

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

data/test/csscss/parser/common_test.rb

@@ -115,6 +115,15 @@ 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'
+      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+=='
       end
 
       it "parses urls" do
@@ -124,6 +133,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+==')"
       end
     end
   end

data/test/csscss/redundancy_analyzer_test.rb

@@ -68,7 +68,7 @@ module Csscss
         .baz {
           margin: 3px 3px 30px 3px;
           padding: 10px 30px;
-          background: white url(images/bg-bolt-inactive.png) no-repeat 99% 5px;
+          background: blue url(images/bg-bolt-inactive.png) no-repeat 99% 5px;
 
           -webkit-border-radius: 4px;
           -moz-border-radius: 4px;
@@ -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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -55,6 +55,7 @@ files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTORS.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -106,7 +107,7 @@ files:
 - test/csscss/types_test.rb
 - test/just_parse.rb
 - test/test_helper.rb
-homepage: http://zmoazeni.github.com/csscss/
+homepage: http://zmoazeni.github.io/csscss/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -117,10 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2330083466520748341
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2330083466520748341
+      hash: -506187209623006521
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25