haml 3.1.0.alpha.27 → 3.1.0.alpha.28

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.27
+3.1.0.alpha.28

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.27
+3.1.0.alpha.28

data/lib/haml/buffer.rb

@@ -187,38 +187,14 @@ module Haml
       <% end %>
 RUBY
 
-    # Takes the various information about the opening tag for an element,
-    # formats it, and appends it to the buffer.
-    def open_tag(name, self_closing, try_one_line, preserve_tag, escape_html, class_id,
-                 nuke_outer_whitespace, nuke_inner_whitespace, obj_ref, content, *attributes_hashes)
-      tabulation = @real_tabs
-
+    def attributes(class_id, obj_ref, *attributes_hashes)
       attributes = class_id
       attributes_hashes.each do |old|
         self.class.merge_attrs(attributes, to_hash(old.map {|k, v| [k.to_s, v]}))
       end
       self.class.merge_attrs(attributes, parse_object_ref(obj_ref)) if obj_ref
-
-      if self_closing && xhtml?
-        str = " />" + (nuke_outer_whitespace ? "" : "\n")
-      else
-        str = ">" + ((if self_closing && html?
-                        nuke_outer_whitespace
-                      else
-                        try_one_line || preserve_tag || nuke_inner_whitespace
-                      end) ? "" : "\n")
-      end
-
-      attributes = Compiler.build_attributes(
+      Compiler.build_attributes(
         html?, @options[:attr_wrapper], @options[:escape_attrs], attributes)
-      @buffer << "#{nuke_outer_whitespace || @options[:ugly] ? '' : tabs(tabulation)}<#{name}#{attributes}#{str}"
-
-      if content
-        @buffer << "#{content}</#{name}>" << (nuke_outer_whitespace ? "" : "\n")
-        return
-      end
-
-      @real_tabs += 1 unless self_closing || nuke_inner_whitespace
     end
 
     # Remove the whitespace from the right side of the buffer string.

data/lib/haml/compiler.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Haml
   module Compiler
     include Haml::Util
@@ -130,7 +132,6 @@ END
         @dont_indent_next_line = dont_indent_next_line
         return if tag_closed
       else
-        content = parse ? 'nil' : inspect_obj(value)
         if attributes_hashes.empty?
           attributes_hashes = ''
         elsif attributes_hashes.size == 1
@@ -139,11 +140,27 @@ END
           attributes_hashes = ", (#{attributes_hashes.join(").merge(")})"
         end
 
-        args = [t[:name], t[:self_closing], !block_given?, t[:preserve_tag],
-          t[:escape_html], t[:attributes], t[:nuke_outer_whitespace],
-          t[:nuke_inner_whitespace]].map {|v| inspect_obj(v)}.join(', ')
-        push_silent "_hamlout.open_tag(#{args}, #{object_ref}, #{content}#{attributes_hashes})"
-        @dont_tab_up_next_text = @dont_indent_next_line = dont_indent_next_line
+        push_merged_text "<#{t[:name]}", 0, !t[:nuke_outer_whitespace]
+        push_generated_script(
+          "_hamlout.attributes(#{inspect_obj(t[:attributes])}, #{object_ref}#{attributes_hashes})")
+        concat_merged_text(
+          if t[:self_closing] && xhtml?
+            " />" + (t[:nuke_outer_whitespace] ? "" : "\n")
+          else
+            ">" + ((if t[:self_closing] && html?
+                      t[:nuke_outer_whitespace]
+                    else
+                      !block_given? || t[:preserve_tag] || t[:nuke_inner_whitespace]
+                    end) ? "" : "\n")
+          end)
+
+        if value && !parse
+          concat_merged_text("#{value}</#{t[:name]}>#{t[:nuke_outer_whitespace] ? "" : "\n"}")
+        else
+          @to_merge << [:text, '', 1] unless t[:nuke_inner_whitespace]
+        end
+
+        @dont_indent_next_line = dont_indent_next_line
       end
 
       return if t[:self_closing]
@@ -309,9 +326,7 @@ END
       push_merged_text '' unless opts[:in_tag]
 
       unless block_given?
-        script = no_format ? "#{text}\n" : "#{static_method}(#{output_expr});"
-        @to_merge << [:script, resolve_newlines + script]
-        @output_line += script.count("\n")
+        push_generated_script(no_format ? "#{text}\n" : "#{static_method}(#{output_expr});")
         concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
         return
       end
@@ -324,6 +339,11 @@ END
       concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace] || @options[:ugly]
     end
 
+    def push_generated_script(text)
+      @to_merge << [:script, resolve_newlines + text]
+      @output_line += text.count("\n")
+    end
+
     # This is a class method so it can be accessed from Buffer.
     def self.build_attributes(is_html, attr_wrapper, escape_attrs, attributes = {})
       quote_escape = attr_wrapper == '"' ? "&quot;" : "&apos;"

data/lib/haml/parser.rb

@@ -317,16 +317,21 @@ END
       end
 
       attributes = Parser.parse_class_and_id(attributes)
-      attributes_hashes.map! do |syntax, attributes_hash|
-        if syntax == :old
-          static_attributes = parse_static_hash(attributes_hash)
-          attributes_hash = nil if static_attributes
-        else
-          static_attributes, attributes_hash = attributes_hash
-        end
+      attributes_list = []
+
+      if attributes_hashes[:new]
+        static_attributes, attributes_hash = attributes_hashes[:new]
+        Buffer.merge_attrs(attributes, static_attributes) if static_attributes
+        attributes_list << attributes_hash
+      end
+
+      if attributes_hashes[:old]
+        static_attributes = parse_static_hash(attributes_hashes[:old])
         Buffer.merge_attrs(attributes, static_attributes) if static_attributes
-        attributes_hash
-      end.compact!
+        attributes_list << attributes_hashes[:old] unless static_attributes || @options[:suppress_eval]
+      end
+
+      attributes_list.compact!
 
       raise SyntaxError.new("Illegal nesting: nesting within a self-closing tag is illegal.", @next_line.index) if block_opened? && self_closing
       raise SyntaxError.new("There's no Ruby code for #{action} to evaluate.", last_line - 1) if parse && value.empty?
@@ -341,7 +346,7 @@ END
       value = handle_ruby_multiline(value) if parse
 
       ParseNode.new(:tag, @index, :name => tag_name, :attributes => attributes,
-        :attributes_hashes => attributes_hashes, :self_closing => self_closing,
+        :attributes_hashes => attributes_list, :self_closing => self_closing,
         :nuke_inner_whitespace => nuke_inner_whitespace,
         :nuke_outer_whitespace => nuke_outer_whitespace, :object_ref => object_ref,
         :escape_html => escape_html, :preserve_tag => preserve_tag,
@@ -462,17 +467,17 @@ END
 
       new_attributes_hash = old_attributes_hash = last_line = nil
       object_ref = "nil"
-      attributes_hashes = []
+      attributes_hashes = {}
       while rest
         case rest[0]
         when ?{
           break if old_attributes_hash
           old_attributes_hash, rest, last_line = parse_old_attributes(rest)
-          attributes_hashes << [:old, old_attributes_hash]
+          attributes_hashes[:old] = old_attributes_hash
         when ?(
           break if new_attributes_hash
           new_attributes_hash, rest, last_line = parse_new_attributes(rest)
-          attributes_hashes << [:new, new_attributes_hash]
+          attributes_hashes[:new] = new_attributes_hash
         when ?[
           break unless object_ref == "nil"
           object_ref, rest = balance(rest, ?[, ?])

data/test/benchmark.rb

@@ -12,7 +12,7 @@ end
 
 require File.dirname(__FILE__) + '/../lib/haml'
 require File.dirname(__FILE__) + '/linked_rails'
-%w[rubygems erb erubis markaby active_support action_controller
+%w[rubygems erb erubis active_support action_controller
    action_view action_pack haml/template rbench].each {|dep| require(dep)}
 
 def view
@@ -40,7 +40,6 @@ RBench.run(times) do
   directory = File.dirname(__FILE__) + '/haml'
   haml_template    = File.read("#{directory}/templates/#{template_name}.haml")
   erb_template     = File.read("#{directory}/erb/#{template_name}.erb")
-  markaby_template = File.read("#{directory}/markaby/#{template_name}.mab")
 
   report "Cached" do
     obj = Object.new

data/test/haml/engine_test.rb

@@ -291,6 +291,31 @@ HAML
     assert_equal(hash, {:color => 'red'})
   end
 
+  def test_ugly_semi_prerendered_tags
+    assert_equal(<<HTML, render(<<HAML, :ugly => true))
+<p a='2'></p>
+<p a='2'>foo</p>
+<p a='2' />
+<p a='2'>foo</p>
+<p a='2'>foo
+bar</p>
+<p a='2'>foo
+bar</p>
+<p a='2'>
+foo
+</p>
+HTML
+%p{:a => 1 + 1}
+%p{:a => 1 + 1} foo
+%p{:a => 1 + 1}/
+%p{:a => 1 + 1}= "foo"
+%p{:a => 1 + 1}= "foo\\nbar"
+%p{:a => 1 + 1}~ "foo\\nbar"
+%p{:a => 1 + 1}
+  foo
+HAML
+  end
+
   def test_end_of_file_multiline
     assert_equal("<p>0</p>\n<p>1</p>\n<p>2</p>\n", render("- for i in (0...3)\n  %p= |\n   i |"))
   end
@@ -1470,7 +1495,7 @@ HAML
 
   def test_new_attribute_ids
     assert_equal("<div id='foo_bar'></div>\n", render("#foo(id='bar')"))
-    assert_equal("<div id='foo_bar_baz'></div>\n", render("#foo{:id => 'bar'}(id='baz')"))
+    assert_equal("<div id='foo_baz_bar'></div>\n", render("#foo{:id => 'bar'}(id='baz')"))
     assert_equal("<div id='foo_baz_bar'></div>\n", render("#foo(id='baz'){:id => 'bar'}"))
     foo = User.new(42)
     assert_equal("<div class='struct_user' id='foo_baz_bar_struct_user_42'></div>\n",
@@ -1479,7 +1504,7 @@ HAML
       render("#foo(id='baz')[foo]{:id => 'bar'}", :locals => {:foo => foo}))
     assert_equal("<div class='struct_user' id='foo_baz_bar_struct_user_42'></div>\n",
       render("#foo[foo](id='baz'){:id => 'bar'}", :locals => {:foo => foo}))
-    assert_equal("<div class='struct_user' id='foo_bar_baz_struct_user_42'></div>\n",
+    assert_equal("<div class='struct_user' id='foo_baz_bar_struct_user_42'></div>\n",
       render("#foo[foo]{:id => 'bar'}(id='baz')", :locals => {:foo => foo}))
   end
 
@@ -1551,11 +1576,17 @@ HAML
     assert_equal("<a a='b' c='d'>bar</a>\n", render("%a(c='d'){:a => 'b'} bar"))
     assert_equal("<a a='b' c='d'>bar</a>\n", render("%a{:a => 'b'}(c='d') bar"))
 
-    assert_equal("<a a='d'>bar</a>\n", render("%a{:a => 'b'}(a='d') bar"))
+    # Old-style always takes precedence over new-style,
+    # because theoretically old-style could have arbitrary end-of-method-call syntax.
+    assert_equal("<a a='b'>bar</a>\n", render("%a{:a => 'b'}(a='d') bar"))
     assert_equal("<a a='b'>bar</a>\n", render("%a(a='d'){:a => 'b'} bar"))
 
     assert_equal("<a a='b' b='c' c='d' d='e'>bar</a>\n",
       render("%a{:a => 'b',\n:b => 'c'}(c='d'\nd='e') bar"))
+
+    locals = {:b => 'b', :d => 'd'}
+    assert_equal("<p a='b' c='d'></p>\n", render("%p{:a => b}(c=d)", :locals => locals))
+    assert_equal("<p a='b' c='d'></p>\n", render("%p(a=b){:c => d}", :locals => locals))
   end
 
   # Ruby Multiline

data/test/haml/erb/standard.erb

@@ -18,7 +18,7 @@
     <% end -%>
     <div id='body'><%= " Quotes should be loved! Just like people!" %></div>
     Wow.
-    <p>
+    <p code="<%= 1 + 2 %>">
       <%= "Holy cow        " +
           "multiline       " +
           "tags!           " +
@@ -28,7 +28,8 @@
           n.to_s
         }.join("|") %>
     </p>
-    <div class='silent'>
+    <% bar = 17 %>
+    <div class='silent' foo="<%= bar %>">
       <% foo = String.new
          foo << "this"
          foo << " shouldn't"

data/test/haml/results/standard.xhtml

@@ -134,12 +134,12 @@
     118
     119
     Wow.|
-    <p>
+    <p code='3'>
       Holy cow        multiline       tags!           A pipe (|) even!
       PipesIgnored|PipesIgnored|PipesIgnored|
       1|2|3
     </p>
-    <div class='silent'>
+    <div class='silent' foo='17'>
       this shouldn't evaluate but now it should!
     </div>
     <ul class='really cool'>

data/test/haml/templates/standard.haml

@@ -14,7 +14,7 @@
     - 120.times do |number|
       = number
     Wow.|
-    %p
+    %p{:code => 1 + 2}
       = "Holy cow        " + |
         "multiline       " + |      
         "tags!           " + |
@@ -23,7 +23,8 @@
       = [1, 2, 3].collect { |n|     |
           n.to_s                    |
         }.join("|")                 |
-    %div.silent
+    - bar = 17
+    %div.silent{:foo => bar}
       - foo = String.new
       - foo << "this"
       - foo << " shouldn't"

data/test/haml/templates/standard_ugly.haml

@@ -14,7 +14,7 @@
     - 120.times do |number|
       = number
     Wow.|
-    %p
+    %p{:code => 1 + 2}
       = "Holy cow        " + |
         "multiline       " + |      
         "tags!           " + |
@@ -23,7 +23,8 @@
       = [1, 2, 3].collect { |n|     |
           n.to_s                    |
         }.join("|")                 |
-    %div.silent
+    - bar = 17
+    %div.silent{:foo => bar}
       - foo = String.new
       - foo << "this"
       - foo << " shouldn't"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.27
+  version: 3.1.0.alpha.28
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -57,13 +57,13 @@ files:
 - lib/haml/html.rb
 - lib/haml/html/erb.rb
 - lib/haml/railtie.rb
+- lib/haml/template.rb
 - lib/haml/root.rb
 - lib/haml/shared.rb
-- lib/haml/template.rb
+- lib/haml/util.rb
 - lib/haml/template/options.rb
 - lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
-- lib/haml/util.rb
 - lib/haml/version.rb
 - lib/haml/compiler.rb
 - lib/haml/parser.rb