csscss 0.0.1 → 0.1.0

data/test/csscss/parser/margin_test.rb

@@ -0,0 +1,50 @@
+require "test_helper"
+
+module Csscss::Parser
+  module Margin
+    describe Margin do
+      include CommonParserTests
+
+      before do
+        @parser = Parser.new
+        @trans = Transformer.new
+      end
+
+      it "converts shorthand rules to longhand" do
+        trans("1px 10% inherit auto").must_equal([
+          dec("margin-top", "1px"),
+          dec("margin-right", "10%"),
+          dec("margin-bottom", "inherit"),
+          dec("margin-left", "auto")
+        ])
+
+        trans("1px 10% inherit").must_equal([
+          dec("margin-top", "1px"),
+          dec("margin-right", "10%"),
+          dec("margin-bottom", "inherit"),
+          dec("margin-left", "10%")
+        ])
+
+        trans("1px 10%").must_equal([
+          dec("margin-top", "1px"),
+          dec("margin-right", "10%"),
+          dec("margin-bottom", "1px"),
+          dec("margin-left", "10%")
+        ])
+
+        trans("1px").must_equal([
+          dec("margin-top", "1px"),
+          dec("margin-right", "1px"),
+          dec("margin-bottom", "1px"),
+          dec("margin-left", "1px")
+        ])
+      end
+
+      it "tries the parse and returns false if it doesn't work" do
+        @parser.try_parse("foo").must_equal(false)
+        parsed = @parser.try_parse("1px")
+        parsed[:margin][:top].must_equal("1px")
+      end
+    end
+  end
+end

data/test/csscss/parser/outline_test.rb

@@ -0,0 +1,26 @@
+require "test_helper"
+
+module Csscss::Parser
+  module Outline
+    describe self do
+      include CommonParserTests
+
+      before do
+        @parser = Parser.new
+        @trans = Transformer.new
+      end
+
+      it "converts shorthand rules to longhand" do
+        trans("1px solid blue").must_equal([
+          dec("outline-width", "1px"),
+          dec("outline-style", "solid"),
+          dec("outline-color", "blue")
+        ])
+
+        trans("solid").must_equal([
+          dec("outline-style", "solid")
+        ])
+      end
+    end
+  end
+end

data/test/csscss/parser/padding_test.rb

@@ -0,0 +1,50 @@
+require "test_helper"
+
+module Csscss::Parser
+  module Padding
+    describe Padding do
+      include CommonParserTests
+
+      before do
+        @parser = Parser.new
+        @trans = Transformer.new
+      end
+
+      it "converts shorthand rules to longhand" do
+        trans("1px 10% inherit 4em").must_equal([
+          dec("padding-top", "1px"),
+          dec("padding-right", "10%"),
+          dec("padding-bottom", "inherit"),
+          dec("padding-left", "4em")
+        ])
+
+        trans("1px 10% inherit").must_equal([
+          dec("padding-top", "1px"),
+          dec("padding-right", "10%"),
+          dec("padding-bottom", "inherit"),
+          dec("padding-left", "10%")
+        ])
+
+        trans("1px 10%").must_equal([
+          dec("padding-top", "1px"),
+          dec("padding-right", "10%"),
+          dec("padding-bottom", "1px"),
+          dec("padding-left", "10%")
+        ])
+
+        trans("1px").must_equal([
+          dec("padding-top", "1px"),
+          dec("padding-right", "1px"),
+          dec("padding-bottom", "1px"),
+          dec("padding-left", "1px")
+        ])
+      end
+
+      it "tries the parse and returns false if it doesn't work" do
+        @parser.try_parse("foo").must_equal(false)
+        parsed = @parser.try_parse("1px")
+        parsed[:padding][:top].must_equal("1px")
+      end
+    end
+  end
+end

data/test/csscss/redundancy_analyzer_test.rb

@@ -2,6 +2,8 @@ require "test_helper"
 
 module Csscss
   describe RedundancyAnalyzer do
+    include TypeHelpers
+
     it "finds and trims redundant rule_sets" do
       css = %$
         h1, h2 { display: none; position: relative; outline:none}
@@ -11,17 +13,17 @@ module Csscss
       $
 
       RedundancyAnalyzer.new(css).redundancies.must_equal({
-        [sel(".bar"), sel(%w(h1 h2))] => [dec("outline", "none"), dec("position", "relative")],
+        [sel(".bar"), sel("h1, h2")] => [dec("outline", "none"), dec("position", "relative")],
         [sel(".bar"), sel(".foo")] => [dec("width", "1px")],
-        [sel(".baz"), sel(".foo"), sel(%w(h1 h2))] => [dec("display", "none")]
+        [sel(".baz"), sel(".foo"), sel("h1, h2")] => [dec("display", "none")]
       })
 
       RedundancyAnalyzer.new(css).redundancies.first.must_equal [
-        [sel(".bar"), sel(%w(h1 h2))] , [dec("outline", "none"), dec("position", "relative")]
+        [sel(".bar"), sel("h1, h2")] , [dec("outline", "none"), dec("position", "relative")]
       ]
 
       RedundancyAnalyzer.new(css).redundancies(2).must_equal({
-        [sel(".bar"), sel(%w(h1 h2))] => [dec("outline", "none"), dec("position", "relative")]
+        [sel(".bar"), sel("h1, h2")] => [dec("outline", "none"), dec("position", "relative")]
       })
     end
 
@@ -79,5 +81,125 @@ module Csscss
       redundancies = RedundancyAnalyzer.new(css).redundancies(3)
       redundancies[[sel(".bar"), sel(".baz")]].size.must_equal(5)
     end
+
+    it "also matches shorthand rules" do
+      css = %$
+        .foo { background-color: #fff }
+        .bar { background: #fff top }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".foo")] => [dec("background-color", "#fff")]
+      })
+    end
+
+    it "keeps full shorthand together" do
+      css = %$
+        .baz { background-color: #fff }
+        .foo { background: #fff top }
+        .bar { background: #fff top }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".foo")] => [dec("background", "#fff top")],
+        [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("background-color", "#fff")]
+      })
+    end
+
+    it "doesn't consolidate explicit short/longhand" do
+      css = %$
+        .foo { background-color: #fff }
+        .bar { background: #fff }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".foo")] => [dec("background-color", "#fff")]
+      })
+
+      css = %$
+        .bar { background: #fff }
+        .foo { background-color: #fff }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".foo")] => [dec("background-color", "#fff")]
+      })
+    end
+
+    it "3-way case consolidation" do
+      css = %$
+        .bar { background: #fff }
+        .baz { background: #fff top }
+        .foo { background-color: #fff }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("background-color", "#fff")]
+      })
+    end
+
+    it "handles border and border-top matches appropriately" do
+      css = %$
+        .bar { border: 1px solid #fff }
+        .baz { border-top: 1px solid #fff }
+        .foo { border-top-width: 1px }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".baz")] => [dec("border-top", "1px solid #fff")],
+        [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("border-top-width", "1px")]
+      })
+    end
+
+    it "reduces border matches appropriately" do
+      css = %$
+        .bar { border: 1px solid #FFF }
+        .baz { border: 1px solid #FFF }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".baz")] => [dec("border", "1px solid #fff")]
+      })
+
+      css = %$
+        .bar { border: 4px solid #4F4F4F }
+        .baz { border: 4px solid #4F4F4F }
+        .foo { border: 4px solid #3A86CE }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".baz")] => [dec("border", "4px solid #4f4f4f")],
+        [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("border-style", "solid"), dec("border-width", "4px")]
+      })
+
+      RedundancyAnalyzer.new(css).redundancies(2).must_equal({
+        [sel(".bar"), sel(".baz"), sel(".foo")] => [dec("border-style", "solid"), dec("border-width", "4px")]
+      })
+    end
+
+    it "reduces padding and margin" do
+      css = %$
+        .bar { padding: 4px; margin: 5px }
+        .baz { padding-bottom: 4px}
+        .foo { margin-right: 5px }
+      $
+
+      RedundancyAnalyzer.new(css).redundancies.must_equal({
+        [sel(".bar"), sel(".baz")] => [dec("padding-bottom", "4px")],
+        [sel(".bar"), sel(".foo")] => [dec("margin-right", "5px")]
+      })
+    end
+
+    # TODO: someday
+    # it "reports duplication within the same selector" do
+    #   css = %$
+    #     .bar { background: #fff top; background-color: #fff }
+    #   $
+
+    #   # TODO: need to update the reporter for this
+    #   RedundancyAnalyzer.new(css).redundancies.must_equal({
+    #     [sel(".bar")] => [dec("background-color", "#fff")]
+    #   })
+    # end
   end
 end

data/test/csscss/reporter_test.rb

@@ -2,11 +2,13 @@ require "test_helper"
 
 module Csscss
   describe Reporter do
+    include TypeHelpers
+
     it "formats string result" do
       reporter = Reporter.new({
         [sel(".foo"), sel(".bar")] => [dec("width", "1px"), dec("border", "black")],
-        [sel(%w(h1 h2)), sel(".foo"), sel(".baz")] => [dec("display", "none")],
-        [sel(%w(h1 h2)), sel(".bar")] => [dec("position", "relative")]
+        [sel("h1, h2"), sel(".foo"), sel(".baz")] => [dec("display", "none")],
+        [sel("h1, h2"), sel(".bar")] => [dec("position", "relative")]
       })
 
      expected =<<-EXPECTED

data/test/csscss/types_test.rb

@@ -0,0 +1,73 @@
+require "test_helper"
+
+module Csscss
+  describe Declaration do
+    it "< and > checks parents" do
+      dec1 = Declaration.new("background", "#fff")
+      dec2 = Declaration.new("background", "#fff")
+      dec3 = Declaration.new("background-color", "#fff", [dec1])
+      dec4 = Declaration.new("background-color", "#fff", nil)
+
+      dec1.must_be :>, dec3
+      dec3.must_be :<, dec1
+
+      dec1.wont_be :>, dec4
+      dec1.wont_be :>, dec2
+      dec4.wont_be :>, dec1
+    end
+
+    it "checks ancestory against all parents" do
+      dec1 = Declaration.new("border", "#fff")
+      dec2 = Declaration.new("border", "#fff top")
+      dec3 = Declaration.new("border-top", "#fff", [dec1, dec2])
+
+      dec1.must_be :>, dec3
+      dec2.must_be :>, dec3
+
+      dec1.wont_be :>, dec1
+      dec2.wont_be :>, dec1
+      dec1.wont_be :>, dec2
+      dec3.wont_be :>, dec1
+    end
+
+    it "is a derivative if it has parents" do
+      dec1 = Declaration.new("background", "#fff")
+      dec1.wont_be :derivative?
+      Declaration.new("background-color", "#fff", [dec1]).must_be :derivative?
+    end
+
+    it "ignores parents when checking equality" do
+      dec1 = Declaration.new("background", "#fff")
+      dec2 = Declaration.new("background-color", "#fff", [dec1])
+      dec3 = Declaration.new("background-color", "#fff", nil)
+
+      dec1.wont_equal dec2
+      dec2.wont_equal dec1
+
+      dec2.must_equal dec3
+      dec3.must_equal dec2
+
+      dec2.hash.must_equal dec3.hash
+      dec3.hash.must_equal dec2.hash
+      dec3.hash.wont_equal dec1.hash
+
+      dec2.must_be :eql?, dec3
+      dec3.must_be :eql?, dec2
+      dec2.wont_be :eql?, dec1
+    end
+
+    it "derivatives are handled correctly in a hash" do
+      dec1 = Declaration.new("background", "#fff")
+      dec2 = Declaration.new("background-color", "#fff", [dec1])
+      dec3 = Declaration.new("background-color", "#fff", nil)
+
+      h = {}
+      h[dec2] = false
+      h[dec3] = true
+
+      h.keys.size.must_equal 1
+      h[dec2].must_equal true
+      h[dec3].must_equal true
+    end
+  end
+end

data/test/just_parse.rb

@@ -0,0 +1,8 @@
+#! /usr/bin/env ruby
+
+require "debugger"
+require "csscss"
+
+raise "need a file name" unless ARGV[0]
+contents = File.read(ARGV[0])
+rule_sets = Csscss::Parser::Css.parse(contents)

data/test/test_helper.rb

@@ -7,19 +7,62 @@ require "debugger"
 
 require "csscss"
 
-MiniTest::Spec.add_setup_hook do
+module TypeHelpers
   def sel(s)
-    Csscss::Selector.new(Array(s))
+    Csscss::Selector.new(s)
   end
 
   def dec(p, v)
     Csscss::Declaration.new(p, v)
   end
 
-  def cmatch(selectors, decs)
-    Csscss::Match.new(selectors, decs)
+  def rs(selectors, decs)
+    Csscss::Ruleset.new(selectors, decs)
   end
 end
 
-Debugger.settings[:autoeval] = true
-Debugger.settings[:autolist] = 1
+module MiniTest::Assertions
+  def assert_parse(parser, string)
+    assert parser.parse(string)
+  rescue Parslet::ParseFailed => ex
+    assert false, ex.cause.ascii_tree
+  end
+
+  def assert_not_parse(parser, string)
+    parser.parse(string)
+    assert false, "expected #{parser} to not successfully parse \"#{string}\" and it did"
+  rescue Parslet::ParseFailed => ex
+    assert ex
+  end
+end
+
+Parslet::Atoms::DSL.infect_an_assertion :assert_parse, :must_parse, :do_not_flip
+Parslet::Atoms::DSL.infect_an_assertion :assert_not_parse, :wont_parse, :do_not_flip
+
+module CommonParserTests
+  def self.included(base)
+    base.instance_eval do
+      include Helpers
+      include TypeHelpers
+
+      describe "common parser tests" do
+        it "parses inherit" do
+          trans("inherit").must_equal([])
+        end
+
+        it "doesn't parse unknown values" do
+          @parser.wont_parse("foo")
+        end
+      end
+    end
+  end
+
+  module Helpers
+    def trans(s)
+      @trans.apply(@parser.parse(s))
+    rescue Parslet::ParseFailed => e
+      puts e.cause.ascii_tree
+      raise e
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: csspool
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -52,9 +36,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec.default
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -62,14 +47,49 @@ files:
 - csscss.gemspec
 - lib/csscss.rb
 - lib/csscss/cli.rb
+- lib/csscss/json_reporter.rb
+- lib/csscss/parser/background.rb
+- lib/csscss/parser/base.rb
+- lib/csscss/parser/border.rb
+- lib/csscss/parser/border_color.rb
+- lib/csscss/parser/border_side.rb
+- lib/csscss/parser/border_style.rb
+- lib/csscss/parser/border_width.rb
+- lib/csscss/parser/color.rb
+- lib/csscss/parser/common.rb
+- lib/csscss/parser/css.rb
+- lib/csscss/parser/font.rb
+- lib/csscss/parser/list_style.rb
+- lib/csscss/parser/margin.rb
+- lib/csscss/parser/multi_side_transformer.rb
+- lib/csscss/parser/outline.rb
+- lib/csscss/parser/padding.rb
+- lib/csscss/parslet_optimizations.rb
 - lib/csscss/redundancy_analyzer.rb
 - lib/csscss/reporter.rb
 - lib/csscss/types.rb
 - lib/csscss/version.rb
+- test/csscss/json_reporter_test.rb
+- test/csscss/parser/background_test.rb
+- test/csscss/parser/border_color_test.rb
+- test/csscss/parser/border_side_test.rb
+- test/csscss/parser/border_style_test.rb
+- test/csscss/parser/border_test.rb
+- test/csscss/parser/border_width_test.rb
+- test/csscss/parser/color_test.rb
+- test/csscss/parser/common_test.rb
+- test/csscss/parser/css_test.rb
+- test/csscss/parser/font_test.rb
+- test/csscss/parser/list_style_test.rb
+- test/csscss/parser/margin_test.rb
+- test/csscss/parser/outline_test.rb
+- test/csscss/parser/padding_test.rb
 - test/csscss/redundancy_analyzer_test.rb
 - test/csscss/reporter_test.rb
+- test/csscss/types_test.rb
+- test/just_parse.rb
 - test/test_helper.rb
-homepage: ''
+homepage: http://zmoazeni.github.com/csscss/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -83,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4262444302933628003
+      hash: -4598443269162371706
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,14 +112,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4262444302933628003
+      hash: -4598443269162371706
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A CSS redundancy analyzer that analyzes redundancy.
+summary: csscss will parse any CSS files you give it and let you know which rulesets
+  have duplicated declarations.
 test_files:
+- test/csscss/json_reporter_test.rb
+- test/csscss/parser/background_test.rb
+- test/csscss/parser/border_color_test.rb
+- test/csscss/parser/border_side_test.rb
+- test/csscss/parser/border_style_test.rb
+- test/csscss/parser/border_test.rb
+- test/csscss/parser/border_width_test.rb
+- test/csscss/parser/color_test.rb
+- test/csscss/parser/common_test.rb
+- test/csscss/parser/css_test.rb
+- test/csscss/parser/font_test.rb
+- test/csscss/parser/list_style_test.rb
+- test/csscss/parser/margin_test.rb
+- test/csscss/parser/outline_test.rb
+- test/csscss/parser/padding_test.rb
 - test/csscss/redundancy_analyzer_test.rb
 - test/csscss/reporter_test.rb
+- test/csscss/types_test.rb
+- test/just_parse.rb
 - test/test_helper.rb

data/.rspec.default

@@ -1 +0,0 @@
---debug