haml-edge 2.3.201 → 2.3.202

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.201
+2.3.202

data/VERSION

@@ -1 +1 @@
-2.3.201
+2.3.202

data/lib/haml/exec.rb

@@ -594,7 +594,7 @@ END
           'By default, this is inferred from the input filename.',
           'If there is none, defaults to css.') do |name|
           @options[:from] = name.downcase.to_sym
-          unless [:css, :scss, :sass].include?(@options[:from])
+          unless [:css, :scss, :sass, :sass2].include?(@options[:from])
             raise "Unknown format for sass-convert --from: #{name}"
           end
         end

data/lib/sass/engine.rb

@@ -588,6 +588,7 @@ WARNING
       end
 
       return silent ? "//" : "/* */" if content.empty?
+      content.each {|l| l.gsub!(/^\* /, '')}
       content.map! {|l| (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '') unless removed_first
       content.last.gsub!(%r{ ?\*/ *$}, '')

data/lib/sass/tree/comment_node.rb

@@ -59,10 +59,11 @@ module Sass::Tree
         else
           content.gsub!(/\n( \*|\/\/)/, "\n  ")
           spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
+          sep = silent ? "\n//" : "\n *"
           if spaces >= 2
-            content
+            content.gsub(/\n  /, sep)
           else
-            content.gsub(/\n#{' ' * spaces}/, "\n  ")
+            content.gsub(/\n#{' ' * spaces}/, sep)
           end
         end
 

data/test/sass/conversion_test.rb

@@ -251,9 +251,9 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 // foo
-   bar
-     baz
-   bang
+// bar
+//   baz
+// bang
 
 foo bar
   a: b
@@ -309,9 +309,9 @@ SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
 /* foo
-   bar
-     baz
-   bang
+ * bar
+ *   baz
+ * bang
 
 foo bar
   a: b
@@ -337,9 +337,9 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 /* foo
-   bar
-     baz
-   bang
+ * bar
+ *   baz
+ * bang
 
 foo bar
   a: b
@@ -358,8 +358,8 @@ SCSS
     assert_scss_to_sass <<SASS, <<SCSS
 foo
   /*      foo
-     bar
-         baz
+   * bar
+   *     baz
   a: b
 SASS
 foo {
@@ -387,8 +387,8 @@ SASS
   def test_immediately_preceding_comments
     assert_renders <<SASS, <<SCSS
 /* Foo
-   Bar
-   Baz
+ * Bar
+ * Baz
 .foo#bar
   a: b
 SASS
@@ -401,8 +401,8 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 // Foo
-   Bar
-   Baz
+// Bar
+// Baz
 =foo
   a: b
 SASS

data/test/sass/css2sass_test.rb

@@ -105,20 +105,20 @@ elephant.rawr
   rampages: excessively
 
 /* actual multiline
-  comment
+ *comment
 
 span.turkey
   isdinner: true
 
 .turducken
   /* Sounds funny
-     doesn't it
+   * doesn't it
   chimera: not_really
 
 #overhere
   bored: sorta
   /*                  it's for a good
-     cause
+   * cause
   better_than: thread_pools
 
 #one_more

data/test/sass/engine_test.rb

@@ -1304,6 +1304,18 @@ foo {
 CSS
   end
 
+  def test_loud_comments_with_starred_lines
+    assert_equal(<<CSS, render(<<SASS))
+/* This is a comment that
+ * continues to the second line.
+ * And even to the third! */
+CSS
+/* This is a comment that
+ * continues to the second line.
+ * And even to the third!
+SASS
+  end
+
   def test_comment_indentation_at_beginning_of_doc
     assert_equal <<CSS, render(<<SASS)
 /* foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.201
+  version: 2.3.202
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 -04:00
+date: 2010-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency