Fixes bug where --ignore-sass-mixins isn't respected in @imports

There is a `@children.empty?` edgecase that I can't recreate in the
tests but I'm seeing on a private codebase. It would be nice to
red/green test that bit of the conditional.

refs: zmoazeni#62

Author: zmoazeni

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

lib/csscss/cli.rb

@@ -172,16 +172,12 @@ def gem_installed?(gem_name)
 
     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"

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

test/csscss/sass_include_extensions_test.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require "tempfile"
 require "csscss/sass_include_extensions"
 
 module Csscss
@@ -37,9 +38,31 @@ module Csscss
   /* 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