From 90bca96cd982666116007c81eee87aa786777ed5 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 27 Apr 2013 20:41:24 -0400
Subject: [PATCH 01/39] Adds ruby-version

This is rvm and rbenv agnostic
---
 .ruby-version | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..9a5700d
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+ruby-2.0.0-p0

From 1e3b3b7fecef96480e6437920c9c69aef29a2bec Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sun, 28 Apr 2013 09:11:08 -0400
Subject: [PATCH 02/39] Added blurb on why csscss doesn't remove duplications

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index b229466..e835212 100644
--- a/README.md
+++ b/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.

From c3e18363d73c2467e72b258f0ec1e615b6d1c4bd Mon Sep 17 00:00:00 2001
From: Carson McDonald <carson@ioncannon.net>
Date: Fri, 3 May 2013 06:39:54 -0400
Subject: [PATCH 03/39] Add tests for empty nested rulesets.

---
 test/csscss/parser/css_test.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/csscss/parser/css_test.rb b/test/csscss/parser/css_test.rb
index ad0c45b..f8838db 100644
--- a/test/csscss/parser/css_test.rb
+++ b/test/csscss/parser/css_test.rb
@@ -131,6 +131,27 @@ module Css
         ])
       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";

From f5c5d3b78e1c7625beeb559a7af404d68c7701bb Mon Sep 17 00:00:00 2001
From: Carson McDonald <carson@ioncannon.net>
Date: Fri, 3 May 2013 06:40:53 -0400
Subject: [PATCH 04/39] Require at least one child ruleset.

---
 lib/csscss/parser/css.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/csscss/parser/css.rb b/lib/csscss/parser/css.rb
index 7a954c7..cb799a2 100644
--- a/lib/csscss/parser/css.rb
+++ b/lib/csscss/parser/css.rb
@@ -66,7 +66,7 @@ class Parser < Parslet::Parser
             str("@") >>
             match["^{}"].repeat(1) >>
             str("{") >>
-            (comment | ruleset).repeat(0) >>
+            (comment | ruleset).repeat(1) >>
             str("}") >>
             space?
           ).as(:nested_ruleset)

From d760bff29ec4229b797417171b5fa7430f109108 Mon Sep 17 00:00:00 2001
From: Paul Simpson <prsimp@gmail.com>
Date: Fri, 3 May 2013 22:42:01 -0700
Subject: [PATCH 05/39] Added contribution guidelines

---
 CONTRIBUTING.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..f43e190
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,39 @@
+# Contributing to csscss
+
+First of all: thanks!
+
+The main way to contribute to csscss is to write some code! Here's how:
+
+1. Fork csscss
+2. Create a topic branch - `git checkout -b my_branch`
+3. Push to your branch - `git push origin my_branch`
+4. Create a [Pull Request](http://help.github.com/pull-requests/) from your
+   branch
+5. That's it!
+
+If you're not doing some sort of refactoring, a CHANGELOG entry is appropriate.
+Please include them in pull requests adding features or fixing bugs.
+
+## Tests
+
+csscss uses minitest for testing.
+
+A simple `bundle exec rake` will run all the tests. Make sure they pass when
+you submit a pull request.
+
+Please include tests with your pull request.
+
+## 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. What you did.
+2. What you expected to happen.
+3. What happened instead.
+
+The more information the better.

From e2a75c6776ae5c73cffe81ecac47f26542b0b60d Mon Sep 17 00:00:00 2001
From: JoseLuis Torres <joseluis@powhow.com>
Date: Tue, 14 May 2013 22:44:04 -0500
Subject: [PATCH 06/39] adding the validation for single special character in
 attribute #70

---
 lib/csscss/parser/css.rb          |  4 ++--
 test/csscss/parser/common_test.rb |  6 ++++++
 test/csscss/parser/css_test.rb    | 33 +++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/lib/csscss/parser/css.rb b/lib/csscss/parser/css.rb
index 7a954c7..986d8f3 100644
--- a/lib/csscss/parser/css.rb
+++ b/lib/csscss/parser/css.rb
@@ -19,14 +19,14 @@ class Parser < Parslet::Parser
 
         rule(:blank_attribute) { str(";") >> space? }
 
-        rule(:attribute_value) { (str('/*').absent? >> match["^;}"]) | raw_comment }
+        rule(:attribute_value) { (str('"') >> any >> str('"')) | (str('/*').absent? >> match["^;}"]) | raw_comment }
 
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
           str(":") >>
           (
             (stri("data:").absent? >> attribute_value) |
-            (stri("data:").present? >> attribute_value.repeat(1) >> str(";") >> attribute_value.repeat(1))
+            (stri("data:").present? >> attribute_value.repeat(1) >> str(";") >> attribute_value.repeat(1)) 
           ).repeat(1).as(:value) >>
           str(";").maybe >>
           space?
diff --git a/test/csscss/parser/common_test.rb b/test/csscss/parser/common_test.rb
index 41c4b92..43c0f15 100644
--- a/test/csscss/parser/common_test.rb
+++ b/test/csscss/parser/common_test.rb
@@ -139,6 +139,12 @@ class CommonTest
         @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 '"%"'
+      end
     end
   end
 end
diff --git a/test/csscss/parser/css_test.rb b/test/csscss/parser/css_test.rb
index ad0c45b..bf0dd7e 100644
--- a/test/csscss/parser/css_test.rb
+++ b/test/csscss/parser/css_test.rb
@@ -212,6 +212,39 @@ module Css
                             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;
+        }
+
+        $
+
+        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")
+            ])
+        ])
+      end
     end
   end
 end

From 6370bfe5ae0bc5df8028e41c3412527a97b5f07d Mon Sep 17 00:00:00 2001
From: JoseLuis Torres <joseluis@powhow.com>
Date: Wed, 15 May 2013 21:21:04 -0500
Subject: [PATCH 07/39] adding the any quoted to the fix #70

---
 lib/csscss/parser/css.rb          | 2 +-
 test/csscss/parser/common_test.rb | 2 ++
 test/csscss/parser/css_test.rb    | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/csscss/parser/css.rb b/lib/csscss/parser/css.rb
index 986d8f3..245241e 100644
--- a/lib/csscss/parser/css.rb
+++ b/lib/csscss/parser/css.rb
@@ -19,7 +19,7 @@ class Parser < Parslet::Parser
 
         rule(:blank_attribute) { str(";") >> space? }
 
-        rule(:attribute_value) { (str('"') >> any >> str('"')) | (str('/*').absent? >> match["^;}"]) | raw_comment }
+        rule(:attribute_value) { (any_quoted {any}) | (str('/*').absent? >> match["^;}"]) | raw_comment }
 
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
diff --git a/test/csscss/parser/common_test.rb b/test/csscss/parser/common_test.rb
index 43c0f15..c803bce 100644
--- a/test/csscss/parser/common_test.rb
+++ b/test/csscss/parser/common_test.rb
@@ -144,6 +144,8 @@ class CommonTest
         @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
diff --git a/test/csscss/parser/css_test.rb b/test/csscss/parser/css_test.rb
index bf0dd7e..3c1f7df 100644
--- a/test/csscss/parser/css_test.rb
+++ b/test/csscss/parser/css_test.rb
@@ -231,6 +231,11 @@ module Css
             up: -2px;
         }
 
+        #menu a::after_all {
+            content: '{';
+            right: -6px;
+        }
+
         $
 
         trans(css).must_equal([
@@ -242,6 +247,9 @@ module Css
             ]),
           rs(sel("#menu a::weird"), [dec("content", '"@"'),
               dec("up", "-2px")
+            ]),
+          rs(sel("#menu a::after_all"), [dec("content", "'{'"),
+              dec("right", "-6px")
             ])
         ])
       end

From 8b68d5e263bdec85670dde0d277642898a820010 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 16:32:33 -0400
Subject: [PATCH 08/39] Adds a CHANGELOG entry for Carson's change

refs: #67
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08b367d..3db20bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## (Unreleased) ##
 
 * Fixes attribute parsing bug that includes comments with braces
+* Fixes parsing bug with empty media selectors
 
 ## 1.3.1 - 4/20/2013 ##
 

From 90f875d27621ef0110bb2601b295d13e6eb00cbd Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 16:44:19 -0400
Subject: [PATCH 09/39] Removes unnecessary parens and whitespace

---
 lib/csscss/parser/css.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/csscss/parser/css.rb b/lib/csscss/parser/css.rb
index a30a307..947995c 100644
--- a/lib/csscss/parser/css.rb
+++ b/lib/csscss/parser/css.rb
@@ -19,14 +19,14 @@ class Parser < Parslet::Parser
 
         rule(:blank_attribute) { str(";") >> space? }
 
-        rule(:attribute_value) { (any_quoted {any}) | (str('/*').absent? >> match["^;}"]) | raw_comment }
+        rule(:attribute_value) { any_quoted { any } | (str('/*').absent? >> match["^;}"]) | raw_comment }
 
         rule(:attribute) {
           match["^:{}"].repeat(1).as(:property) >>
           str(":") >>
           (
             (stri("data:").absent? >> attribute_value) |
-            (stri("data:").present? >> attribute_value.repeat(1) >> str(";") >> attribute_value.repeat(1)) 
+            (stri("data:").present? >> attribute_value.repeat(1) >> str(";") >> attribute_value.repeat(1))
           ).repeat(1).as(:value) >>
           str(";").maybe >>
           space?

From 9962f1d877e02e519ab15068274aaf2e0d234804 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 16:46:31 -0400
Subject: [PATCH 10/39] Adds CHANGELOG entry for Jose's bug fix and lists him
 in CONTRIBUTORS

---
 CHANGELOG.md    | 3 ++-
 CONTRIBUTORS.md | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3db20bf..ceda421 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 ## (Unreleased) ##
 
 * Fixes attribute parsing bug that includes comments with braces
-* Fixes parsing bug with empty media selectors
+* Fixes parsing bug with empty media selectors #67
+* Fixes parsing bug with quoted brackets #72
 
 ## 1.3.1 - 4/20/2013 ##
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 492bdb3..d190464 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -4,3 +4,4 @@
 * Ivan Lazarevic @kopipejst
 * Matt DuVall @mduvall twitter:@mduvall_
 * Mekka Okereke @mekka @mekkaokereke
+* JoseLuis Torres @joseluistorres twitter:@joseluis_torres

From 7e7e9fd64659819c040636a31f87ac825d02f5c2 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 16:47:16 -0400
Subject: [PATCH 11/39] Bump ruby version to latest v2

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 9a5700d..95a5ad2 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.0.0-p0
+ruby-2.0.0-p195

From 23c53af07ec2db1275011c78fbf8e38ef83209e7 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 16:54:20 -0400
Subject: [PATCH 12/39] Upgrade debugger version

This is failing in travisci, I assume it's because it's using an older
version
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8a089c2..ee979b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)

From 78013bf3b725bd317a3e239b3c23c34588141a7b Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 17:28:07 -0400
Subject: [PATCH 13/39] Fixes a bug with nested media queries

There was a double issue, one with spacing and apparently media queries
can be nested.
---
 CHANGELOG.md                   |  1 +
 lib/csscss/parser/css.rb       |  7 ++++---
 test/csscss/parser/css_test.rb | 12 ++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ceda421..9fff4f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * 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
 
 ## 1.3.1 - 4/20/2013 ##
 
diff --git a/lib/csscss/parser/css.rb b/lib/csscss/parser/css.rb
index 947995c..d0c6973 100644
--- a/lib/csscss/parser/css.rb
+++ b/lib/csscss/parser/css.rb
@@ -66,7 +66,8 @@ class Parser < Parslet::Parser
             str("@") >>
             match["^{}"].repeat(1) >>
             str("{") >>
-            (comment | ruleset).repeat(1) >>
+            space? >>
+            (comment | ruleset | nested_ruleset).repeat(1) >>
             str("}") >>
             space?
           ).as(:nested_ruleset)
@@ -94,8 +95,8 @@ class Parser < Parslet::Parser
       end
 
       class Transformer < Parslet::Transform
-        rule(nested_ruleset: sequence(:rulesets)) {
-          rulesets
+        rule(nested_ruleset: subtree(:rulesets)) { |context|
+          context[:rulesets].flatten
         }
 
         rule(import: simple(:import)) { [] }
diff --git a/test/csscss/parser/css_test.rb b/test/csscss/parser/css_test.rb
index 72d3133..68e25d1 100644
--- a/test/csscss/parser/css_test.rb
+++ b/test/csscss/parser/css_test.rb
@@ -119,6 +119,15 @@ module Css
             }
           }
 
+          @media only screen {
+            @-webkit-keyframes webkitSiblingBugfix {
+              from { position: relative; }
+              to { position: relative; }
+            }
+
+            a { position: relative }
+          }
+
           h1 {
             outline: 1px;
           }
@@ -127,6 +136,9 @@ module Css
         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

From 0609a87356daa0ffd935b3eb780b33172576d578 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 17:35:26 -0400
Subject: [PATCH 14/39] Removes --compass-with-config deprecation

The config file that is passed in needs to run in the Compass context,
so it's not just a normal ruby load/require.

(Sorta) fixes #63
---
 CHANGELOG.md      | 1 +
 lib/csscss/cli.rb | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fff4f6..816d938 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * 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
 
 ## 1.3.1 - 4/20/2013 ##
 
diff --git a/lib/csscss/cli.rb b/lib/csscss/cli.rb
index 9ca13fa..0adec9e 100644
--- a/lib/csscss/cli.rb
+++ b/lib/csscss/cli.rb
@@ -98,10 +98,7 @@ def parse(argv)
           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

From beb449eee16b108b8e5ca739c390cc054b11da4b Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 17:47:46 -0400
Subject: [PATCH 15/39] Expanding Paul's original contributing doc

---
 CHANGELOG.md    |  1 +
 CONTRIBUTING.md | 68 +++++++++++++++++++++++++++++--------------------
 CONTRIBUTORS.md |  1 +
 3 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 816d938..abef3ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * 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 ##
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f43e190..fc1d02f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,39 +1,53 @@
 # Contributing to csscss
 
-First of all: thanks!
-
-The main way to contribute to csscss is to write some code! Here's how:
-
-1. Fork csscss
-2. Create a topic branch - `git checkout -b my_branch`
-3. Push to your branch - `git push origin my_branch`
-4. Create a [Pull Request](http://help.github.com/pull-requests/) from your
-   branch
-5. That's it!
-
-If you're not doing some sort of refactoring, a CHANGELOG entry is appropriate.
-Please include them in pull requests adding features or fixing bugs.
-
-## Tests
-
-csscss uses minitest for testing.
-
-A simple `bundle exec rake` will run all the tests. Make sure they pass when
-you submit a pull request.
-
-Please include tests with your pull request.
+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.
+tracker](https://github.com/zmoazeni/csscss/issues), and tag them with
+'bug'. Feel free to discuss features there, too.
 
-### Good report structure
+## Good report structure
 
 Please include the following four things in your report:
 
-1. What you did.
-2. What you expected to happen.
-3. What happened instead.
+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.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d190464..30a5a63 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -5,3 +5,4 @@
 * Matt DuVall @mduvall twitter:@mduvall_
 * Mekka Okereke @mekka @mekkaokereke
 * JoseLuis Torres @joseluistorres twitter:@joseluis_torres
+* Paul Simpson @prsimp

From 5efdb3b00690c6d99285948274326674ae6a2417 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 17:50:48 -0400
Subject: [PATCH 16/39] Bumping version to v1.3.2 and updating the CHANGELOG

---
 CHANGELOG.md          | 2 +-
 lib/csscss/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abef3ca..36f85cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## (Unreleased) ##
+## 1.3.2 - 6/22/2013 ##
 
 * Fixes attribute parsing bug that includes comments with braces
 * Fixes parsing bug with empty media selectors #67
diff --git a/lib/csscss/version.rb b/lib/csscss/version.rb
index b122c60..aec9959 100644
--- a/lib/csscss/version.rb
+++ b/lib/csscss/version.rb
@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

From 138c53002a46ad946a47b3eea9e723a3773ace87 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Sat, 22 Jun 2013 17:51:18 -0400
Subject: [PATCH 17/39] I'm never going to remember this bump

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ee979b8..62004dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csscss (1.3.1)
+    csscss (1.3.2)
       colorize
       parslet (~> 1.5)
 

From cc640c678e5d0b31d91e59d955722a59e8a6b42a Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 15 Oct 2013 12:30:35 -0400
Subject: [PATCH 18/39] Adds section for extensions

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index e835212..b829e1c 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,13 @@ LESS requires an additional javascript runtime.
 rubies, and [therubyrhino](https://rubygems.org/gems/therubyrhino) on
 jruby.
 
+## Are there any community extensions? ##
+
+* [compass-csscss](https://github.com/Comcast/compass-csscss) integrates csscss with compass projects.
+* [grunt-csscss](https://github.com/peterkeating/grunt-csscss) a [grunt](http://gruntjs.com/) task to automatically run csscss.
+
+_Please submit [an issue](https://github.com/zmoazeni/csscss/issues/new) if you know of any others._
+
 ## Why doesn't csscss automatically remove duplications for me? ##
 
 I have been asked this a lot, but csscss is intentionally designed this

From 69118a8e6499ba1d60a8dfc8d15c78d03e6cf741 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 15 Oct 2013 12:33:05 -0400
Subject: [PATCH 19/39] Link to compass

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b829e1c..4e51efb 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ jruby.
 
 ## Are there any community extensions? ##
 
-* [compass-csscss](https://github.com/Comcast/compass-csscss) integrates csscss with compass projects.
+* [compass-csscss](https://github.com/Comcast/compass-csscss) integrates csscss with [compass](http://compass-style.org/) projects.
 * [grunt-csscss](https://github.com/peterkeating/grunt-csscss) a [grunt](http://gruntjs.com/) task to automatically run csscss.
 
 _Please submit [an issue](https://github.com/zmoazeni/csscss/issues/new) if you know of any others._

From f34468d0eb19004f7ac423bdaa82fcc02ceadfe3 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:08:31 -0400
Subject: [PATCH 20/39] Use v2.1.2 for dev

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 95a5ad2..ec6b00f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.0.0-p195
+ruby-2.1.2

From acd9093ad94fbfdc42596760a2813c6e4588f978 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:10:23 -0400
Subject: [PATCH 21/39] Dump debugger for byebug

---
 Gemfile             | 20 ++++++++++----------
 Gemfile.lock        | 12 +++++-------
 test/just_parse.rb  |  2 +-
 test/test_helper.rb | 12 ++++++------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 46e2ea9..f34d154 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,16 +4,16 @@ source 'https://rubygems.org'
 gemspec
 
 # optional runtime dependencies
-gem "sass"
-gem "compass"
-gem "less"
-gem "therubyracer", :platform => :mri
+gem 'sass'
+gem 'compass'
+gem 'less'
+gem 'therubyracer', :platform => :mri
 
-gem "rake", :require => false
-gem "debugger"
+gem 'rake', :require => false
+gem 'byebug'
 
-gem "minitest"
-gem "m"
-gem "minitest-rg"
+gem 'minitest'
+gem 'm'
+gem 'minitest-rg'
 
-gem "ruby-prof"
+gem 'ruby-prof'
diff --git a/Gemfile.lock b/Gemfile.lock
index 62004dd..a790aad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,20 +9,18 @@ GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
+    byebug (3.1.2)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
     chunky_png (1.2.7)
     colorize (0.5.8)
-    columnize (0.3.6)
+    columnize (0.8.9)
     commonjs (0.2.6)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    debugger (1.6.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
     fssm (0.2.10)
     less (2.3.1)
       commonjs (~> 0.2.6)
@@ -47,9 +45,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   compass
   csscss!
-  debugger
   less
   m
   minitest
diff --git a/test/just_parse.rb b/test/just_parse.rb
index ef9f1f6..47c7249 100644
--- a/test/just_parse.rb
+++ b/test/just_parse.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require "debugger"
+require "byebug"
 require "csscss"
 
 raise "need a file name" unless ARGV[0]
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d0c7ea5..4679d7a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,11 +1,11 @@
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "minitest/autorun"
-require "minitest/rg"
-require "debugger"
+require 'minitest/autorun'
+require 'minitest/rg'
+require 'byebug'
 
-require "csscss"
+require 'csscss'
 
 module TypeHelpers
   def sel(s)

From e838aafa8aceb608bc48865363f7f94b49be4da8 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:18:28 -0400
Subject: [PATCH 22/39] Upgrade parslet to at least v1.6.1

It includes the optimization fixes so we don't need to monkey patch it
anymore

v1.6.1 and my optimization monkey patch do not play well with each
other, so lets use at least v1.6.1 and dump it
---
 Gemfile.lock                        |  6 +--
 csscss.gemspec                      |  2 +-
 lib/csscss.rb                       |  1 -
 lib/csscss/parslet_optimizations.rb | 77 -----------------------------
 4 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 lib/csscss/parslet_optimizations.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index a790aad..9b33215 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     csscss (1.3.2)
       colorize
-      parslet (~> 1.5)
+      parslet (>= 1.6.1, < 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
     chunky_png (1.2.7)
-    colorize (0.5.8)
+    colorize (0.7.3)
     columnize (0.8.9)
     commonjs (0.2.6)
     compass (0.12.2)
@@ -31,7 +31,7 @@ GEM
     method_source (0.8.1)
     minitest (2.12.1)
     minitest-rg (1.1.0)
-    parslet (1.5.0)
+    parslet (1.6.1)
       blankslate (~> 2.0)
     rake (10.0.3)
     ref (1.0.4)
diff --git a/csscss.gemspec b/csscss.gemspec
index 07a2f31..85304e8 100644
--- a/csscss.gemspec
+++ b/csscss.gemspec
@@ -19,6 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9"
 
-  gem.add_dependency "parslet", "~> 1.5"
+  gem.add_dependency "parslet", ">= 1.6.1", "< 2.0"
   gem.add_dependency "colorize"
 end
diff --git a/lib/csscss.rb b/lib/csscss.rb
index 29076ff..62f3d42 100644
--- a/lib/csscss.rb
+++ b/lib/csscss.rb
@@ -5,7 +5,6 @@
 
 require "colorize"
 require "parslet"
-require "csscss/parslet_optimizations"
 
 require "csscss/version"
 require "csscss/cli"
diff --git a/lib/csscss/parslet_optimizations.rb b/lib/csscss/parslet_optimizations.rb
deleted file mode 100644
index 32b7130..0000000
--- a/lib/csscss/parslet_optimizations.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# These are my multibyte optimizations for parslet.
-# More information can be found: 
-# https://github.com/kschiess/parslet/issues/73
-# https://github.com/kschiess/parslet/pull/74
-# https://github.com/zmoazeni/parslet/tree/optimized-multibyte-parsing
-
-require 'strscan'
-require 'forwardable'
-
-module Parslet
-  class Source
-    extend Forwardable
-
-    def initialize(str)
-      raise ArgumentError unless str.respond_to?(:to_str)
-
-      @str = StringScanner.new(str)
-
-      @line_cache = LineCache.new
-      @line_cache.scan_for_line_endings(0, str)
-    end
-
-    def matches?(pattern)
-      regexp = pattern.is_a?(String) ? Regexp.new(Regexp.escape(pattern)) : pattern
-      !@str.match?(regexp).nil?
-    end
-    alias match matches?
-
-    def consume(n)
-      original_pos = @str.pos
-      slice_str = n.times.map { @str.getch }.join
-      slice = Parslet::Slice.new(
-        slice_str,
-        original_pos,
-        @line_cache)
-
-      return slice
-    end
-
-    def chars_left
-      @str.rest_size
-    end
-
-    def_delegator :@str, :pos
-    def pos=(n)
-      if n > @str.string.bytesize
-        @str.pos = @str.string.bytesize
-      else
-        @str.pos = n
-      end
-    end
-
-
-    class LineCache
-      def scan_for_line_endings(start_pos, buf)
-        return unless buf
-
-        buf = StringScanner.new(buf)
-        return unless buf.exist?(/\n/)
-
-        ## If we have already read part or all of buf, we already know about
-        ## line ends in that portion. remove it and correct cur (search index)
-        if @last_line_end && start_pos < @last_line_end
-          # Let's not search the range from start_pos to last_line_end again.
-          buf.pos = @last_line_end - start_pos
-        end
-
-        ## Scan the string for line endings; store the positions of all endings
-        ## in @line_ends. 
-        while buf.skip_until(/\n/)
-          @last_line_end = start_pos + buf.pos
-          @line_ends << @last_line_end
-        end
-      end
-    end
-  end
-end

From affde6e9f6ce5b062c3b04de7eee0ab6943f65e0 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:35:24 -0400
Subject: [PATCH 23/39] update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36f85cf..4ee940b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## (unreleased)
+
+* Upgrades parslet dependency to v1.6.1 and drops optimization monkeypatch
+
 ## 1.3.2 - 6/22/2013 ##
 
 * Fixes attribute parsing bug that includes comments with braces

From 0630d341252dd4e576151f7fa228432655ab92f8 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:39:43 -0400
Subject: [PATCH 24/39] Use correct terminology

---
 CHANGELOG.md                 |  1 +
 lib/csscss/reporter.rb       |  2 +-
 test/csscss/reporter_test.rb | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ee940b..39e3e4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## (unreleased)
 
 * Upgrades parslet dependency to v1.6.1 and drops optimization monkeypatch
+* Use correct terminology "declartions" instead of "rules" in the output
 
 ## 1.3.2 - 6/22/2013 ##
 
diff --git a/lib/csscss/reporter.rb b/lib/csscss/reporter.rb
index 8509872..96f428c 100644
--- a/lib/csscss/reporter.rb
+++ b/lib/csscss/reporter.rb
@@ -13,7 +13,7 @@ def report(options = {})
         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})
+        io.puts %Q(#{selector_groups.join(", ")} AND #{last_selector} share #{maybe_color(count, :red, should_color)} declaration#{"s" if count > 1})
         if verbose
           declarations.each {|dec| io.puts("  - #{maybe_color(dec, :yellow, should_color)}") }
         end
diff --git a/test/csscss/reporter_test.rb b/test/csscss/reporter_test.rb
index 17d3607..eb8fcbf 100644
--- a/test/csscss/reporter_test.rb
+++ b/test/csscss/reporter_test.rb
@@ -12,19 +12,19 @@ module Csscss
       })
 
      expected =<<-EXPECTED
-{.foo} AND {.bar} share 2 rules
-{h1, h2}, {.foo} AND {.baz} share 1 rule
-{h1, h2} AND {.bar} share 1 rule
+{.foo} AND {.bar} share 2 declarations
+{h1, h2}, {.foo} AND {.baz} share 1 declaration
+{h1, h2} AND {.bar} share 1 declaration
 EXPECTED
      reporter.report(color:false).must_equal expected
 
      expected =<<-EXPECTED
-{.foo} AND {.bar} share 2 rules
+{.foo} AND {.bar} share 2 declarations
   - width: 1px
   - border: black
-{h1, h2}, {.foo} AND {.baz} share 1 rule
+{h1, h2}, {.foo} AND {.baz} share 1 declaration
   - display: none
-{h1, h2} AND {.bar} share 1 rule
+{h1, h2} AND {.bar} share 1 declaration
   - position: relative
 EXPECTED
      reporter.report(verbose:true, color:false).must_equal expected

From 10248693b620b366a716318a037a30c3d7e0903c Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:40:34 -0400
Subject: [PATCH 25/39] Bump version for release

---
 CHANGELOG.md          | 2 +-
 Gemfile.lock          | 2 +-
 lib/csscss/version.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39e3e4f..024f5ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## (unreleased)
+## 1.3.3 - 5/30/2014 ##
 
 * Upgrades parslet dependency to v1.6.1 and drops optimization monkeypatch
 * Use correct terminology "declartions" instead of "rules" in the output
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b33215..ded9c99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csscss (1.3.2)
+    csscss (1.3.3)
       colorize
       parslet (>= 1.6.1, < 2.0)
 
diff --git a/lib/csscss/version.rb b/lib/csscss/version.rb
index aec9959..7623093 100644
--- a/lib/csscss/version.rb
+++ b/lib/csscss/version.rb
@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

From f6059f3d0728ff639ef283f4de3798795f392e06 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:41:14 -0400
Subject: [PATCH 26/39] Test against 2.1.2

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 222078e..7f4a405 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2

From d88a744f328dea516be0bfbca22ff3851c0b9c23 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 30 May 2014 20:42:03 -0400
Subject: [PATCH 27/39] Stop testing against 1.9.3

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7f4a405..4d1ff2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.2

From 691fe8aceb6e49c7c401fb709a5bedf177b35728 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Fri, 29 Aug 2014 15:50:07 -0400
Subject: [PATCH 28/39] Adds gulp to the list

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4e51efb..5367f7e 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ jruby.
 
 * [compass-csscss](https://github.com/Comcast/compass-csscss) integrates csscss with [compass](http://compass-style.org/) projects.
 * [grunt-csscss](https://github.com/peterkeating/grunt-csscss) a [grunt](http://gruntjs.com/) task to automatically run csscss.
+* [gulp-csscss](https://www.npmjs.org/package/gulp-csscss/) a [gulp](http://gulpjs.com/) task to automatically run csscss.
 
 _Please submit [an issue](https://github.com/zmoazeni/csscss/issues/new) if you know of any others._
 

From 6d2ac0301335412249c590418dadadae58923a20 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Mon, 26 Nov 2018 14:26:37 -0500
Subject: [PATCH 29/39] A couple Readme tweaks

---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5367f7e..ea7df7d 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ _Please submit [an issue](https://github.com/zmoazeni/csscss/issues/new) if you
 
 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/)
+post](https://connectionrequired.com/blog/2013/04/why-csscss-doesnt-remove-duplication-for-you)
 for my reasoning.
 
 ## I found bugs ##
@@ -87,12 +87,6 @@ If you find any issues, please report them on
 Please include the smallest CSS snippet to describe the issue and the
 output you expect to see.
 
-## Who are you? ##
-
-My name is [Zach Moazeni](https://twitter.com/zmoazeni). I work for [an
-awesome company](http://www.getharvest.com/). And [we're
-hiring!](http://www.getharvest.com/careers)
-
 ## I'm a dev, I can help ##
 
 Awesome! Thanks! Here are the steps I ask:

From 00664a60fcf90646820af13cdee4b609aed2a08d Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Mon, 26 Nov 2018 18:32:23 -0500
Subject: [PATCH 30/39] Relocking the dependencies

---
 Gemfile.lock | 54 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ded9c99..33ae5c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,37 +8,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    blankslate (2.1.2.4)
-    byebug (3.1.2)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-    chunky_png (1.2.7)
-    colorize (0.7.3)
-    columnize (0.8.9)
-    commonjs (0.2.6)
+    byebug (10.0.2)
+    chunky_png (1.3.11)
+    colorize (0.8.1)
+    commonjs (0.2.7)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    debugger-linecache (1.2.0)
+    ffi (1.9.25)
     fssm (0.2.10)
-    less (2.3.1)
-      commonjs (~> 0.2.6)
-    libv8 (3.11.8.17)
-    m (1.3.1)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
+    libv8 (3.16.14.19)
+    m (1.5.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
-    method_source (0.8.1)
-    minitest (2.12.1)
-    minitest-rg (1.1.0)
-    parslet (1.6.1)
-      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)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    minitest-rg (5.2.0)
+      minitest (~> 5.0)
+    parslet (1.8.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    ref (2.0.0)
+    ruby-prof (0.17.0)
+    sass (3.7.2)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
 
 PLATFORMS
@@ -56,3 +59,6 @@ DEPENDENCIES
   ruby-prof
   sass
   therubyracer
+
+BUNDLED WITH
+   1.16.4

From 414f7c759a5f54639f14994c8232161e92c9bc96 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Mon, 26 Nov 2018 18:32:56 -0500
Subject: [PATCH 31/39] Fixes test

---
 test/csscss/sass_include_extensions_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/csscss/sass_include_extensions_test.rb b/test/csscss/sass_include_extensions_test.rb
index 76ace2e..13f0ea8 100644
--- a/test/csscss/sass_include_extensions_test.rb
+++ b/test/csscss/sass_include_extensions_test.rb
@@ -61,7 +61,7 @@ module Csscss
   /* CSSCSS END MIXIN: foo */ }
       CSS
 
-        Sass::Engine.new("@import '#{f.path}'", syntax: :scss, cache: false).render.must_equal(css)
+        Sass::Engine.new("@import '#{File.basename(f.path)}'", syntax: :scss, cache: false, load_paths: ["/tmp"]).render.must_equal(css)
       end
     end
   end

From b8b03c35576eb0e409845d8ecd317abcd2a0e7aa Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Mon, 26 Nov 2018 18:35:52 -0500
Subject: [PATCH 32/39] Bump version file

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index ec6b00f..73462a5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.1.2
+2.5.1

From 37e5e331a4b465ba433a9e4ae1515b8cbe43bc25 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 09:53:49 -0500
Subject: [PATCH 33/39] Use best practice when declaring structs

---
 lib/csscss/types.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/csscss/types.rb b/lib/csscss/types.rb
index 32afd3a..976475b 100644
--- a/lib/csscss/types.rb
+++ b/lib/csscss/types.rb
@@ -1,5 +1,5 @@
 module Csscss
-  class Declaration < Struct.new(:property, :value, :parents)
+  Declaration = Struct.new(:property, :value, :parents) do
     def self.from_csspool(dec)
       new(dec.property.to_s.downcase, dec.expressions.join(" ").downcase)
     end
@@ -79,7 +79,7 @@ def normalize_value(value)
     end
   end
 
-  class Selector < Struct.new(:selectors)
+  Selector = Struct.new(:selectors) do
     def self.from_parser(selectors)
       new(selectors.to_s.strip)
     end
@@ -97,6 +97,5 @@ def inspect
     end
   end
 
-  class Ruleset < Struct.new(:selectors, :declarations)
-  end
+  Ruleset = Struct.new(:selectors, :declarations)
 end

From 97c0941966434e407e51a9d62ef7c3046e96c733 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 09:58:03 -0500
Subject: [PATCH 34/39] Add docker-ruby command

---
 docker-ruby | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 docker-ruby

diff --git a/docker-ruby b/docker-ruby
new file mode 100755
index 0000000..9c06fbd
--- /dev/null
+++ b/docker-ruby
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run -it --rm -v $(pwd):/app -v csscss_gem_data:/usr/local/bundle -w /app ruby $@

From 709fb6aeed31b46177d25adb5aa4f5bc99edd91c Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 09:58:55 -0500
Subject: [PATCH 35/39] Remove unnecessary method

---
 lib/csscss/types.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/csscss/types.rb b/lib/csscss/types.rb
index 976475b..3d01f4d 100644
--- a/lib/csscss/types.rb
+++ b/lib/csscss/types.rb
@@ -1,9 +1,5 @@
 module Csscss
   Declaration = Struct.new(:property, :value, :parents) do
-    def self.from_csspool(dec)
-      new(dec.property.to_s.downcase, dec.expressions.join(" ").downcase)
-    end
-
     def self.from_parser(property, value, clean = true)
       value = value.to_s
       property = property.to_s

From a0c0e7e964315c521de7946e2e9f10e876357e9f Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 10:04:01 -0500
Subject: [PATCH 36/39] Use latest ruby version

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d1ff2e..b7360ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.2
+  - 2.5

From 9a503419e895039457c7194e99cfaf720c698c65 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 10:09:07 -0500
Subject: [PATCH 37/39] Allow docker version to be changed

Also test other versions in travis
---
 .travis.yml | 2 ++
 docker-ruby | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b7360ae..9323019 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 2.5
+  - 2.4
+  - 2.3
diff --git a/docker-ruby b/docker-ruby
index 9c06fbd..33ea97f 100755
--- a/docker-ruby
+++ b/docker-ruby
@@ -1,2 +1,3 @@
 #!/bin/bash
-docker run -it --rm -v $(pwd):/app -v csscss_gem_data:/usr/local/bundle -w /app ruby $@
+VERSION=${VERSION:-latest}
+docker run -it --rm -v $(pwd):/app -v csscss_gem_data:/usr/local/bundle -w /app ruby:$VERSION $@

From 01eb85320eda32ee4d9e77614d80bb11be45e835 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 10:11:14 -0500
Subject: [PATCH 38/39] Fixes warning about shadowing

---
 lib/csscss/cli.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/csscss/cli.rb b/lib/csscss/cli.rb
index 0adec9e..2b8430d 100644
--- a/lib/csscss/cli.rb
+++ b/lib/csscss/cli.rb
@@ -64,7 +64,7 @@ def execute
     end
 
     def parse(argv)
-      opts = OptionParser.new do |opts|
+      options = OptionParser.new do |opts|
         opts.banner  = "Usage: csscss [files..]"
         opts.version = Csscss::VERSION
 
@@ -128,11 +128,11 @@ def parse(argv)
           print_help(opts)
         end
       end
-      opts.parse!(argv)
+      options.parse!(argv)
 
-      print_help(opts) if argv.empty?
+      print_help(options) if argv.empty?
     rescue OptionParser::ParseError
-      print_help(opts)
+      print_help(options)
     end
 
     def print_help(opts)

From bac3e424b2deddbeade08677b9958533c52828e6 Mon Sep 17 00:00:00 2001
From: Zach Moazeni <zach.moazeni@gmail.com>
Date: Tue, 27 Nov 2018 12:45:07 -0500
Subject: [PATCH 39/39] Ignore vscode settings

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4288db2..fd69015 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 _site
+.vscode