haml 3.1.0.alpha.12 → 3.1.0.alpha.14

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.12
+3.1.0.alpha.14

data/Rakefile

@@ -129,7 +129,7 @@ end
 task :submodules do
   if File.exist?(File.dirname(__FILE__) + "/.git")
     sh %{git submodule sync}
-    sh %{git submodule update --init}
+    sh %{git submodule update --init --recursive}
   end
 end
 

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.12
+3.1.0.alpha.14

data/lib/haml/filters.rb

@@ -200,8 +200,14 @@ module Haml
 
       # @see Base#render_with_options
       def render_with_options(text, options)
+        if options[:format] == :html5
+          type = ''
+        else
+          type = " type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}"
+        end
+
         <<END
-<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>
+<script#{type}>
   //<![CDATA[
     #{text.rstrip.gsub("\n", "\n    ")}
   //]]>
@@ -217,8 +223,14 @@ END
 
       # @see Base#render_with_options
       def render_with_options(text, options)
+        if options[:format] == :html5
+          type = ''
+        else
+          type = " type=#{options[:attr_wrapper]}text/css#{options[:attr_wrapper]}"
+        end
+
         <<END
-<style type=#{options[:attr_wrapper]}text/css#{options[:attr_wrapper]}>
+<style#{type}>
   /*<![CDATA[*/
     #{text.rstrip.gsub("\n", "\n    ")}
   /*]]>*/

data/lib/haml/precompiler.rb

@@ -336,12 +336,14 @@ END
         end
       end
 
-      @precompiled <<
-        if @options[:ugly]
-          "_hamlout.buffer << \"#{str}\";"
-        else
-          "_hamlout.push_text(\"#{str}\", #{mtabs}, #{@dont_tab_up_next_text.inspect});"
-        end
+      unless str.empty?
+        @precompiled <<
+          if @options[:ugly]
+            "_hamlout.buffer << \"#{str}\";"
+          else
+            "_hamlout.push_text(\"#{str}\", #{mtabs}, #{@dont_tab_up_next_text.inspect});"
+          end
+      end
       @precompiled << "\n" * newlines
       @to_merge = []
       @dont_tab_up_next_text = false

data/lib/haml/util.rb

@@ -120,10 +120,12 @@ module Haml
     # @example
     #   merge_adjacent_strings([1, "foo", "bar", 2, "baz"])
     #     #=> [1, "foobar", 2, "baz"]
-    # @param enum [Enumerable]
+    # @param arr [Array]
     # @return [Array] The enumerable with strings merged
-    def merge_adjacent_strings(enum)
-      enum.inject([]) do |a, e|
+    def merge_adjacent_strings(arr)
+      # Optimize for the common case of one element
+      return arr if arr.size < 2
+      arr.inject([]) do |a, e|
         if e.is_a?(String)
           if a.last.is_a?(String)
             a.last << e

data/test/haml/engine_test.rb

@@ -86,6 +86,7 @@ MESSAGE
     "foo\n:plain\n  1\n  2\n  3\#{''}\n4\n- raise 'foo'" => ["foo", 7],
     "foo\n:plain\n  1\n  2\n  \#{raise 'foo'}" => ["foo", 5],
     "= raise 'foo'\nfoo\nbar\nbaz\nbang" => ["foo", 1],
+    "- case 1\n\n- when 1\n  - raise 'foo'" => ["foo", 4],
   }
 
   User = Struct.new('User', :id)
@@ -641,6 +642,32 @@ HTML
 HAML
   end
 
+  def test_html5_javascript_filter
+    assert_equal(<<HTML, render(<<HAML, :format => :html5))
+<script>
+  //<![CDATA[
+    foo bar
+  //]]>
+</script>
+HTML
+:javascript
+  foo bar
+HAML
+  end
+
+  def test_html5_css_filter
+    assert_equal(<<HTML, render(<<HAML, :format => :html5))
+<style>
+  /*<![CDATA[*/
+    foo bar
+  /*]]>*/
+</style>
+HTML
+:css
+  foo bar
+HAML
+  end
+
   def test_erb_filter_with_multiline_expr
     assert_equal(<<HTML, render(<<HAML))
 foobarbaz
@@ -774,6 +801,30 @@ HTML
 HAML
   end
 
+  def test_case_with_newline_after_case
+    assert_equal(<<HTML, render(<<HAML))
+foo
+HTML
+- case 1
+
+  - when 1
+    foo
+  - when 2
+    bar
+HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+bar
+HTML
+- case 2
+
+- when 1
+  foo
+- when 2
+  bar
+HAML
+  end
+
   def test_escape_html_with_interpolated_if_statement
     assert_equal(<<HTML, render(<<HAML, :escape_html => true))
 foo,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.12
+  version: 3.1.0.alpha.14
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -04:00
+date: 2010-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency