csscss 1.3.1 → 1.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0813cfe3a3c5ea373702b3e9a666ab1f7c89a99d
+  data.tar.gz: e0c6d6a8927eaf0486c3345cea4829fb0845d85f
+SHA512:
+  metadata.gz: 232d3550de49a5f655cab3f68981f3d8b58bfd4c7465a8aee565d0f3e27b7a282c611a5434ce4283d6daa34c1f4e5ef62c143e676a2b2f041b0bed2da3cce8fa
+  data.tar.gz: 8e1ea90d3ef93a39dc721ac4e19463dc9fd248f4dc888602a05f4a370a5d4da1ac742e33031d08c32fdf3d532f53d6fe7443493cb7ec7f90d1cfbe784797402b

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p195

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.3.2 - 6/22/2013 ##
+
+* Fixes attribute parsing bug that includes comments with braces
+* Fixes parsing bug with empty media selectors #67
+* Fixes parsing bug with quoted brackets #72
+* Fixes parsing bug with nested media queries #73
+* Removes --compass-with-config deprecation
+* Adds a CONTRIBUTING.md file with instructions
+
 ## 1.3.1 - 4/20/2013 ##
 
 * Fixes --ignore-sass-mixins bug with @importing

data/CONTRIBUTING.md

@@ -0,0 +1,53 @@
+# Contributing to csscss
+
+First of all: Thanks!
+
+## Bugs & Feature Requests
+
+You can file bugs on the [issues
+tracker](https://github.com/zmoazeni/csscss/issues), and tag them with
+'bug'. Feel free to discuss features there, too.
+
+## Good report structure
+
+Please include the following four things in your report:
+
+1. The smallest CSS snippet to explain the problem.
+2. What you did.
+3. What you expected to happen.
+4. What happened instead.
+
+The more information the better.
+
+## Contributing Code
+
+It's easy to contribute code to csscss:
+
+1. Fork csscss.
+2. Create a topic branch - `git checkout -b my_branch`
+3. Push to your branch - `git push origin my_branch`
+4. Make sure the code follows the contributing guidelines below.
+5. Create a [Pull Request](http://help.github.com/pull-requests/) from your
+   branch.
+6. That's it!
+
+## First Time OSS Contributors
+
+Submitting your first pull request can be a little daunting. If this is
+your first Open Source contribution, please mention it in your pull
+request and I'll help guide you through the process.
+
+## Contributing Guidelines
+
+* Make sure your code follows typical [ruby
+conventions](https://github.com/bbatsov/ruby-style-guide).
+* Make sure the test suite is green. A simple `bundle exec rake test`
+will run all the tests.
+* Include a CHANGELOG entry with your change. Add an `(Unreleased)`
+section at the top if one doesn't exist.
+* Try to keep the git commits squashed and concise. Keep tests and code
+changes together in the same commit. Keep only logical changes together
+in a single commit.
+* I strongly encourage [well written git commit
+messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* Make sure all whitespace is trimmed from the end of lines.

data/CONTRIBUTORS.md

@@ -4,3 +4,5 @@
 * Ivan Lazarevic @kopipejst
 * Matt DuVall @mduvall twitter:@mduvall_
 * Mekka Okereke @mekka @mekkaokereke
+* JoseLuis Torres @joseluistorres twitter:@joseluis_torres
+* Paul Simpson @prsimp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csscss (1.3.1)
+    csscss (1.3.2)
       colorize
       parslet (~> 1.5)
 
@@ -17,12 +17,12 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    debugger (1.5.0)
+    debugger (1.6.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
+    debugger-ruby_core_source (1.2.2)
     fssm (0.2.10)
     less (2.3.1)
       commonjs (~> 0.2.6)

data/README.md

@@ -63,6 +63,13 @@ LESS requires an additional javascript runtime.
 rubies, and [therubyrhino](https://rubygems.org/gems/therubyrhino) on
 jruby.
 
+## Why doesn't csscss automatically remove duplications for me? ##
+
+I have been asked this a lot, but csscss is intentionally designed this
+way. Check out [this
+post](http://connectionrequired.com/blog/2013/04/why-csscss-doesnt-remove-duplication-for-you/)
+for my reasoning.
+
 ## I found bugs ##
 
 This is still a new and evolving project. I heartily welcome feedback.

data/lib/csscss/cli.rb

@@ -98,10 +98,7 @@ module Csscss
           enable_compass if @compass = compass
         end
 
-        opts.on("--compass-with-config config", "Enable compass extensions when parsing sass/scss and pass config file",
-                "DEPRECATED: use --compass --require path/to/config.rb instead."
-               ) do |config|
-          deprecate("Use --compass --require #{config} instead of --compass-with-config #{config}")
+        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

data/lib/csscss/parser/css.rb

@@ -12,26 +12,22 @@ module Csscss
       class Parser < Parslet::Parser
         include Common
 
-        rule(:comment) {
-          (space? >> str('/*') >> (str('*/').absent? >> any).repeat >> str('*/') >> space?).as(:comment)
-        }
-
-        rule(:css_space?) {
-          comment.repeat(1) | space?
+        rule(:raw_comment) {
+          space? >> str('/*') >> (str('*/').absent? >> any).repeat >> str('*/') >> space?
         }
+        rule(:comment) { raw_comment.as(:comment) }
 
         rule(:blank_attribute) { str(";") >> space? }
 
+        rule(:attribute_value) { any_quoted { any } | (str('/*').absent? >> match["^;}"]) | raw_comment }
+
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
           str(":") >>
-          (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) >>
+          (
+            (stri("data:").absent? >> attribute_value) |
+            (stri("data:").present? >> attribute_value.repeat(1) >> str(";") >> attribute_value.repeat(1))
+          ).repeat(1).as(:value) >>
           str(";").maybe >>
           space?
         }
@@ -70,7 +66,8 @@ module Csscss
             str("@") >>
             match["^{}"].repeat(1) >>
             str("{") >>
-            (comment | ruleset).repeat(0) >>
+            space? >>
+            (comment | ruleset | nested_ruleset).repeat(1) >>
             str("}") >>
             space?
           ).as(:nested_ruleset)
@@ -98,8 +95,8 @@ module Csscss
       end
 
       class Transformer < Parslet::Transform
-        rule(nested_ruleset: sequence(:rulesets)) {
-          rulesets
+        rule(nested_ruleset: subtree(:rulesets)) { |context|
+          context[:rulesets].flatten
         }
 
         rule(import: simple(:import)) { [] }

data/lib/csscss/version.rb

@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/csscss/parser/common_test.rb

@@ -139,6 +139,14 @@ module Csscss::Parser
         @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
+      
+      it "parses specials characters" do
+        @parser.between('"', '"') { @parser.symbol("{") }.must_parse '"{"'
+        @parser.between('"', '"') { @parser.symbol("}") }.must_parse '"}"'
+        @parser.between('"', '"') { @parser.symbol("%") }.must_parse '"%"'
+        @parser.double_quoted { @parser.symbol("{") }.must_parse %("{")
+        @parser.single_quoted { @parser.symbol('{') }.must_parse %('{')
+      end
     end
   end
 end

data/test/csscss/parser/css_test.rb

@@ -23,14 +23,14 @@ module Csscss::Parser
         end
 
         it "parses comments" do
-          @parser.css_space?.must_parse "/* foo */"
-          @parser.css_space?.must_parse %$
+          @parser.comment.must_parse "/* foo */"
+          @parser.comment.must_parse %$
           /* foo
            * bar
            */
           $
 
-          @parser.css_space?.must_parse %$
+          @parser.comment.repeat(1).must_parse %$
             /* foo */
             /* bar */
           $
@@ -63,11 +63,13 @@ module Csscss::Parser
           */
           .bar { border: 1px solid black /* sdflk */ }
           .baz { background: white /* sdflk */ }
+          .baz2 { background: white /* {sdflk} */ }
         $
 
         trans(css).must_equal([
           rs(sel(".bar"), [dec("border", "1px solid black /* sdflk */")]),
-          rs(sel(".baz"), [dec("background", "white /* sdflk */")])
+          rs(sel(".baz"), [dec("background", "white /* sdflk */")]),
+          rs(sel(".baz2"), [dec("background", "white /* {sdflk} */")])
         ])
       end
 
@@ -117,6 +119,15 @@ module Csscss::Parser
             }
           }
 
+          @media only screen {
+            @-webkit-keyframes webkitSiblingBugfix {
+              from { position: relative; }
+              to { position: relative; }
+            }
+
+            a { position: relative }
+          }
+
           h1 {
             outline: 1px;
           }
@@ -125,10 +136,34 @@ module Csscss::Parser
         trans(css).must_equal([
           rs(sel("#foo"), [dec("background-color", "black")]),
           rs(sel("#bar"), [dec("display", "none")]),
+          rs(sel("from"), [dec("position", "relative")]),
+          rs(sel("to"), [dec("position", "relative")]),
+          rs(sel("a"), [dec("position", "relative")]),
           rs(sel("h1"), [dec("outline", "1px")])
         ])
       end
 
+      it "recognizes empty @media queries with no spaces" do
+        css = %$
+          @media (min-width: 768px) and (max-width: 979px) {}
+        $
+
+        trans(css).must_equal([
+          rs(sel("@media (min-width: 768px) and (max-width: 979px)"), []),
+        ])
+      end
+
+      it "recognizes empty @media queries with spaces" do
+        css = %$
+          @media (min-width: 768px) and (max-width: 979px) {
+          }
+        $
+
+        trans(css).must_equal([
+          rs(sel("@media (min-width: 768px) and (max-width: 979px)"), []),
+        ])
+      end
+
       it "ignores @import statements" do
         css = %$
           @import "foo.css";
@@ -210,6 +245,47 @@ module Csscss::Parser
                             dec("display", "block")])
         ])
       end
+
+      it "parses attributes with special characters" do
+        css = %$
+
+        #menu a::before {
+            content: "{";
+            left: -6px;
+        }
+
+        #menu a::after {
+            content: "}";
+            right: -6px;
+        }
+
+        #menu a::weird {
+            content: "@";
+            up: -2px;
+        }
+
+        #menu a::after_all {
+            content: '{';
+            right: -6px;
+        }
+
+        $
+
+        trans(css).must_equal([
+          rs(sel("#menu a::before"), [dec("content", '"{"'),
+            dec("left", "-6px")
+            ]),
+          rs(sel("#menu a::after"), [dec("content", '"}"'),
+            dec("right", "-6px")
+            ]),
+          rs(sel("#menu a::weird"), [dec("content", '"@"'),
+              dec("up", "-2px")
+            ]),
+          rs(sel("#menu a::after_all"), [dec("content", "'{'"),
+              dec("right", "-6px")
+            ])
+        ])
+      end
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 1.3.2
 platform: ruby
 authors:
 - Zach Moazeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,17 +27,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: csscss will parse any CSS files you give it and let you know which rulesets
@@ -53,8 +48,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
 - Gemfile.lock
@@ -111,30 +108,26 @@ files:
 - test/test_helper.rb
 homepage: http://zmoazeni.github.io/csscss/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4485977171346278397
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A CSS redundancy analyzer that analyzes redundancy.
 test_files:
 - test/csscss/json_reporter_test.rb