csscss 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.1 - 4/20/2013 ##
+
+* Fixes --ignore-sass-mixins bug with @importing
+
 ## 1.3.0 - 4/20/2013 ##
 
 * Adds --require switch for user configuration

data/Gemfile.lock

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

data/README.md

@@ -29,7 +29,7 @@ Then you can run it in at the command line against CSS files.
 
     {.contact .content .primary} and {article, #comments} share 5 rules
     {.profile-picture}, {.screenshot img} and {a.blurb img} share 4 rules
-    {.work h2:first-child, .archive h2:first-child, .missing h2:first-child, .about h2, .contact h2} and {body.home h2} share 4 rules
+    {.work h2:first-child, .contact h2} and {body.home h2} share 4 rules
     {article.blurb:hover} and {article:hover} share 3 rules
 
 Run it in a verbose mode to see all the duplicated styles.
@@ -45,11 +45,14 @@ rulesets that have fewer matches.
 
     $ csscss -n 10 -v path/to/style.css # ignores rulesets with < 10 matches
 
-If you prefer writing in [sass](http://sass-lang.com/), you can also parse your sass/scss files.
+If you prefer writing in [Sass](http://sass-lang.com/), you can also parse your sass/scss files.
 
     $ gem install sass
     $ csscss path/to/style.scss
 
+Sass users may be interested in the `--ignore-sass-mixins`
+experimental flag that won't match duplicate declarations from including mixins.
+
 If you prefer writing in [LESS](http://lesscss.org/), you can also parse your LESS files.
 
     $ gem install less

data/lib/csscss/cli.rb

@@ -172,16 +172,12 @@ module Csscss
 
     def load_sass_file(filename)
       abort 'Must install the "sass" gem before parsing sass/scss files' unless gem_installed?("sass")
+      require "csscss/sass_include_extensions" if @ignore_sass_mixins
 
       sass_options = {cache:false}
       sass_options[:load_paths] = Compass.configuration.sass_load_paths if @compass
       begin
-        tree = Sass::Engine.for_file(filename, sass_options).to_tree
-        if @ignore_sass_mixins
-          require "csscss/sass_include_extensions"
-          Csscss::SassMixinVisitor.visit(tree)
-        end
-        tree.render
+        Sass::Engine.for_file(filename, sass_options).render
       rescue Sass::SyntaxError => e
         if e.message =~ /compass/ && !@compass
           puts "Enable --compass option to use compass's extensions"

data/lib/csscss/sass_include_extensions.rb

@@ -1,19 +1,20 @@
 require "sass"
 
-module Csscss
-  class SassMixinVisitor < Sass::Tree::Visitors::Base
-    def self.visit(root)
-      new.send(:visit, root)
-    end
+Sass::Tree::MixinDefNode.class_eval do
+  def children
+    first_child = @children.first
 
-    def visit_mixindef(node)
-      begin_comment = Sass::Tree::CommentNode.new(["/* CSSCSS START MIXIN: #{node.name} */"], :normal)
-      end_comment = Sass::Tree::CommentNode.new(["/* CSSCSS END MIXIN: #{node.name} */"], :normal)
+    # not sure why/how we can get here with empty children, but it
+    # causes issues
+    unless @children.empty? || (first_child.is_a?(Sass::Tree::CommentNode) && first_child.value.first =~ /CSSCSS START/)
+      begin_comment = Sass::Tree::CommentNode.new(["/* CSSCSS START MIXIN: #{name} */"], :normal)
+      end_comment = Sass::Tree::CommentNode.new(["/* CSSCSS END MIXIN: #{name} */"], :normal)
 
       begin_comment.options = end_comment.options = {}
-
-      node.children.unshift(begin_comment)
-      node.children.push(end_comment)
+      @children.unshift(begin_comment)
+      @children.push(end_comment)
     end
+
+    @children
   end
 end

data/lib/csscss/version.rb

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

data/test/csscss/sass_include_extensions_test.rb

@@ -1,9 +1,10 @@
 require "test_helper"
+require "tempfile"
 require "csscss/sass_include_extensions"
 
 module Csscss
   describe "sass import extensions" do
-    it "should do something" do
+    it "should add comments before and after mixin properties" do
       scss =<<-SCSS
       @mixin foo {
         font: {
@@ -37,9 +38,31 @@ h1 {
   /* CSSCSS END MIXIN: bar */ }
       CSS
 
-      tree = Sass::Engine.new(scss, syntax: :scss).to_tree
-      Csscss::SassMixinVisitor.visit(tree)
-      tree.render.must_equal(css)
+      Sass::Engine.new(scss, syntax: :scss, cache: false).render.must_equal(css)
+    end
+
+    it "should insert comments even with imported stylesheets" do
+      Tempfile.open(['foo', '.scss']) do |f|
+        f << <<-SCSS
+          @mixin foo {
+            outline: 1px;
+          }
+
+          h1 {
+            @include foo;
+          }
+        SCSS
+        f.close
+
+        css =<<-CSS
+h1 {
+  /* CSSCSS START MIXIN: foo */
+  outline: 1px;
+  /* CSSCSS END MIXIN: foo */ }
+      CSS
+
+        Sass::Engine.new("@import '#{f.path}'", syntax: :scss, cache: false).render.must_equal(css)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2367732181301313903
+      hash: -4485977171346278397
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25