haml-edge 3.1.25 → 3.1.26

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.25
+3.1.26

data/VERSION

@@ -1 +1 @@
-3.1.25
+3.1.26

data/lib/haml/util.rb

@@ -128,9 +128,13 @@ module Haml
     # @param enum [Enumerable]
     # @return [Array] The enumerable with strings merged
     def merge_adjacent_strings(enum)
-      e = enum.inject([]) do |a, e|
-        if e.is_a?(String) && a.last.is_a?(String)
-          a.last << e
+      enum.inject([]) do |a, e|
+        if e.is_a?(String)
+          if a.last.is_a?(String)
+            a.last << e
+          else
+            a << e.dup
+          end
         else
           a << e
         end

data/lib/sass/engine.rb

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

data/lib/sass/tree/rule_node.rb

@@ -53,8 +53,11 @@ module Sass::Tree
     # @param rule [Array<String, Sass::Script::Node>]
     #   The CSS rule. See \{#rule}
     def initialize(rule)
-      @rule = Haml::Util.strip_string_array(
-        Haml::Util.merge_adjacent_strings(rule))
+      #p rule
+      merged = Haml::Util.merge_adjacent_strings(rule)
+      #p merged
+      @rule = Haml::Util.strip_string_array(merged)
+      #p @rule
       @tabs = 0
       super()
     end

data/test/haml/util_test.rb

@@ -64,6 +64,9 @@ class UtilTest < Test::Unit::TestCase
   def test_merge_adjacent_strings
     assert_equal(["foo bar baz", :bang, "biz bop", 12],
       merge_adjacent_strings(["foo ", "bar ", "baz", :bang, "biz", " bop", 12]))
+    str = "foo"
+    assert_equal(["foo foo foo", :bang, "foo foo", 12],
+      merge_adjacent_strings([str, " ", str, " ", str, :bang, str, " ", str, 12]))
   end
 
   def test_intersperse

data/test/sass/engine_test.rb

@@ -1423,6 +1423,18 @@ CSS
 SASS
   end
 
+  def test_loud_comments_with_no_space_after_starred_lines
+    assert_equal(<<CSS, render(<<SASS))
+/*bip bop
+ *beep boop
+ *bap blimp */
+CSS
+/*bip bop
+ *beep boop
+ *bap blimp
+SASS
+  end
+
   def test_comment_indentation_at_beginning_of_doc
     assert_equal <<CSS, render(<<SASS)
 /* foo

data/test/sass/scss/scss_test.rb

@@ -979,6 +979,16 @@ foo {
 SCSS
   end
 
+  def test_interpolation_with_bracket_on_next_line
+    assert_equal <<CSS, render(<<SCSS)
+a.foo b {
+  color: red; }
+CSS
+a.\#{"foo"} b
+{color: red}
+SCSS
+  end
+
   def test_extra_comma_in_mixin_arglist_error
     assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
 Invalid CSS after "@include foo(bar, ": expected mixin argument, was ")"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.25
+  version: 3.1.26
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -04:00
+date: 2010-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency