haml-edge 2.3.59 → 2.3.60

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.59
+2.3.60

data/VERSION

@@ -1 +1 @@
-2.3.59
+2.3.60

data/lib/haml/precompiler.rb

@@ -85,7 +85,7 @@ module Haml
     DOCTYPE_REGEX = /(\d\.\d)?[\s]*([a-z]*)/i
 
     # The Regex that matches a literal string or symbol value
-    LITERAL_VALUE_REGEX = /:(\w*)|(["'])([^\\#'"]|\\.)*\2/
+    LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?![\\#]|\2).|\\.)*\2/
 
     private
 
@@ -727,6 +727,7 @@ END
       raise SyntaxError.new("Self-closing tags can't have content.", last_line - 1) if self_closing && !value.empty?
 
       self_closing ||= !!( !block_opened? && value.empty? && @options[:autoclose].include?(tag_name) )
+      value = nil if value.empty? && (block_opened? || self_closing)
 
       dont_indent_next_line =
         (nuke_outer_whitespace && !block_opened?) ||
@@ -751,7 +752,7 @@ END
         return if tag_closed
       else
         flush_merged_text
-        content = value.empty? || parse ? 'nil' : value.dump
+        content = parse ? 'nil' : value.inspect
         if attributes_hashes.empty?
           attributes_hashes = ''
         elsif attributes_hashes.size == 1
@@ -769,7 +770,7 @@ END
 
       return if self_closing
 
-      if value.empty?
+      if value.nil?
         push_and_tabulate([:element, [tag_name, nuke_outer_whitespace, nuke_inner_whitespace]])
         @output_tabs += 1 unless nuke_inner_whitespace
         return

data/test/haml/engine_test.rb

@@ -128,6 +128,17 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p class='3'>foo</p>", render("%p{:class => 1+2} foo").chomp)
   end
 
+  def test_dynamic_attributes_with_no_content
+    assert_equal(<<HTML, render(<<HAML))
+<p>
+  <a href='http://haml-lang.com'></a>
+</p>
+HTML
+%p
+  %a{:href => "http://" + "haml-lang.com"}
+HAML
+  end
+
   def test_nil_should_render_empty_tag
     assert_equal("<div class='no_attributes'></div>",
                  render(".no_attributes{:nil => nil}").chomp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.59
+  version: 2.3.60
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -65,9 +65,9 @@ files:
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/html.rb
+- lib/haml/precompiler.rb
 - lib/haml/html
 - lib/haml/html/erb.rb
-- lib/haml/precompiler.rb
 - lib/haml/shared.rb
 - lib/haml/template.rb
 - lib/haml/template
@@ -124,13 +124,13 @@ files:
 - test/benchmark.rb
 - test/haml
 - test/haml/engine_test.rb
+- test/haml/helper_test.rb
+- test/haml/html2haml_test.rb
 - test/haml/erb
 - test/haml/erb/_av_partial_1.erb
 - test/haml/erb/_av_partial_2.erb
 - test/haml/erb/action_view.erb
 - test/haml/erb/standard.rhtml
-- test/haml/helper_test.rb
-- test/haml/html2haml_test.rb
 - test/haml/markaby
 - test/haml/markaby/standard.mab
 - test/haml/mocks
@@ -155,7 +155,7 @@ files:
 - test/haml/results/very_basic.xhtml
 - test/haml/results/whitespace_handling.xhtml
 - test/haml/spec
-- test/haml/spec_test.rb
+- test/haml/util_test.rb
 - test/haml/template_test.rb
 - test/haml/templates
 - test/haml/templates/_av_partial_1.haml
@@ -189,7 +189,7 @@ files:
 - test/haml/templates/tag_parsing.haml
 - test/haml/templates/very_basic.haml
 - test/haml/templates/whitespace_handling.haml
-- test/haml/util_test.rb
+- test/haml/spec_test.rb
 - test/linked_rails.rb
 - test/sass
 - test/sass/css2sass_test.rb
@@ -303,9 +303,9 @@ test_files:
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
 - test/haml/html2haml_test.rb
-- test/haml/spec_test.rb
-- test/haml/template_test.rb
 - test/haml/util_test.rb
+- test/haml/template_test.rb
+- test/haml/spec_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/engine_test.rb
 - test/sass/functions_test.rb