haml 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f98f3effc98f443e754cd0baeafe8e9ce7d7aee
-  data.tar.gz: 1e56de3d8a174339197799814a2a4d9bcdd968b5
+  metadata.gz: 169c5e7e9f3fc9b45bf286035641b324218cd9e8
+  data.tar.gz: 7042e872b1f8d5dd9c02a14ddfb1c74b12f350ca
 SHA512:
-  metadata.gz: 1795165acc4cd57c84e7c06184158f09b78a51c6e32c870366c90ab351e43d66f624b7928dd33238e17dcdfa8936bf14cdea0ff8a2e4462c5e4316111a052a92
-  data.tar.gz: 05f439cebe3f90c3f35aa418dd2064fea98884842ae6049761c54da10ce20da250768a300f8b0e3c29d91df84e349c1f1fac11dbebb2b0c86090146cda155956
+  metadata.gz: c8f15703b302c90f429d23f1c1441c47fa81a68887fcaa3a6e01de719253aa3f8380eb21cac73731de49ef54d2a1e1d5bf9308436a96af4548aec7241ceb986e
+  data.tar.gz: fe401f4715c695be27a04ee9d12acf6a776dafc89e8a7bad4e09916805cab2a03186ab6b509a6215a9d5a943f60607710a5f3c9529f54885cd7b43b55f6fc254

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Haml Changelog
 
 =======
+## 4.0.5
+
+Released on Jan 7, 2014 ([diff](https://github.com/haml/haml/compare/4.0.4...4.0.5)).
+
+* Fix haml_concat appending unescaped HTML after a call to haml_tag.
+* Fix for bug whereby when HAML :ugly option is "true",
+  ActionView::Helpers::CaptureHelper::capture returns the whole view buffer
+  when passed a block that returns nothing (thanks [Mircea
+  Moise](https://github.com/mmircea16)).
 
 ## 4.0.4
 

data/lib/haml/helpers.rb

@@ -365,24 +365,17 @@ MESSAGE
         position = haml_buffer.buffer.length
 
         haml_buffer.capture_position = position
-        block.call(*args)
+        value = block.call(*args)
 
         captured = haml_buffer.buffer.slice!(position..-1)
-        return captured if haml_buffer.options[:ugly]
-        # Note that the "reject" is needed for rbx 1.2.4, which includes empty
-        # strings in the returned array when splitting by /^/.
-        captured = captured.split(/^/).reject {|x| x == ""}
-
-        min_tabs = nil
-        captured.each do |line|
-          tabs = line.index(/[^ ]/) || line.length
-          min_tabs ||= tabs
-          min_tabs = min_tabs > tabs ? tabs : min_tabs
+
+        if captured == '' and value != haml_buffer.buffer
+             captured = (value.is_a?(String) ? value : nil)
         end
 
-        captured.map do |line|
-          line.slice(min_tabs, line.length)
-        end.join
+        return nil if captured.nil?
+        return (haml_buffer.options[:ugly] ? captured : prettify(captured))
+
       end
     ensure
       haml_buffer.capture_position = nil
@@ -637,6 +630,22 @@ MESSAGE
       _erbout = _erbout = _hamlout.buffer
       proc { |*args| proc.call(*args) }
     end
+
+    def prettify(text)
+      text = text.split(/^/)
+      text.delete('')
+
+      min_tabs = nil
+      text.each do |line|
+        tabs = line.index(/[^ ]/) || line.length
+        min_tabs ||= tabs
+        min_tabs = min_tabs > tabs ? tabs : min_tabs
+      end
+
+      text.map do |line|
+        line.slice(min_tabs, line.length)
+      end.join
+    end
   end
 end
 

data/lib/haml/helpers/action_view_extensions.rb

@@ -45,8 +45,8 @@ module Haml
       # @yield A block in which all input to `#haml_concat` is treated as raw.
       # @see Haml::Util#rails_xss_safe?
       def with_raw_haml_concat
+        old = instance_variable_defined?('@_haml_concat_raw') ? @_haml_concat_raw : false
         @_haml_concat_raw = true
-        old = @_haml_concat_raw
         yield
       ensure
         @_haml_concat_raw = old

data/lib/haml/helpers/action_view_mods.rb

@@ -41,16 +41,9 @@ module ActionView
         if Haml::Helpers.block_is_haml?(block)
           #double assignment is to avoid warnings
           _hamlout = _hamlout = eval('_hamlout', block.binding) # Necessary since capture_haml checks _hamlout
-          value = nil
-          buffer = capture_haml(*args) { value = yield(*args) }
-          str =
-            if !buffer.empty?
-              buffer
-            elsif value.is_a?(String)
-              value
-            else
-              nil
-            end
+
+          str = capture_haml(*args, &block)
+
           # NonCattingString is present in Rails less than 3.1.0. When support
           # for 3.0 is dropped, this can be removed.
           return ActionView::NonConcattingString.new(str) if str && defined?(ActionView::NonConcattingString)

data/lib/haml/options.rb

@@ -6,7 +6,9 @@ module Haml
 
     @defaults = {
       :attr_wrapper         => "'",
-      :autoclose            => %w(meta img link br hr input area param col base),
+      :autoclose            => %w(area base basefont br col command embed frame
+                                  hr img input isindex keygen link menuitem meta
+                                  param source track wbr),
       :encoding             => "UTF-8",
       :escape_attrs         => true,
       :escape_html          => false,

data/lib/haml/temple.rb

@@ -0,0 +1,85 @@
+require 'haml'
+require 'temple'
+
+module Haml
+
+  module Temple
+
+    module Expressions
+      def on_plain
+        [:static, "\n" + value[:text]]
+      end
+
+      def on_root
+        [:multi]
+      end
+
+      def on_doctype
+        [:html, :doctype, value[:version] || 5]
+      end
+
+      def on_tag
+        exp = [:html, :tag, value[:name], [:html, :attrs]]
+        if value[:value] && value[:value] != ""
+          if value[:parse]
+            exp.push << [:dynamic, value[:value]]
+          else
+            exp.push << [:static, value[:value]]
+          end
+        end
+
+        if attribs = value[:attributes]
+          attribs.each do |key, value|
+            exp.last << [:html, :attr, key, [:static, value]]
+          end
+        end
+
+        exp
+      end
+    end
+
+    class Parser
+      def initialize(*args)
+        @options = Options.new
+      end
+
+      def call(haml)
+        parser = ::Haml::Parser.new(haml, @options)
+        tree = parser.parse.tap {|x| p x; puts '-' * 10}
+        compile(tree).tap {|x| p x; puts '-' * 10}
+      end
+
+      private
+
+      def compile(node)
+        exp = node.to_temple
+        return exp if node.children.empty?
+        if node.children.length == 1
+          exp.push compile(node.children[0])
+        else
+          exp.push [:multi, *node.children.map {|c| compile(c)}]
+        end
+        exp
+      end
+    end
+
+    class Engine < ::Temple::Engine
+      use ::Haml::Temple::Parser
+      html :Pretty
+      filter :ControlFlow
+      generator :ArrayBuffer
+    end
+  end
+
+  class Parser::ParseNode
+    include ::Haml::Temple::Expressions
+
+    def to_temple
+      begin
+        send "on_#{type}"
+      end
+    end
+  end
+end
+
+Haml::Temple::Template = Temple::Templates::Tilt(Haml::Temple::Engine, :register_as => :haml)

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

data/test/helper_test.rb

@@ -14,6 +14,16 @@ module Haml::Helpers
   def something_that_uses_haml_concat
     haml_concat('foo').to_s
   end
+
+  def render_something_with_haml_concat
+    haml_concat "<p>"
+  end
+
+  def render_something_with_haml_tag_and_concat
+    haml_tag 'p' do
+      haml_concat '<foo>'
+    end
+  end
 end
 
 class HelperTest < MiniTest::Unit::TestCase
@@ -48,6 +58,15 @@ class HelperTest < MiniTest::Unit::TestCase
     super
   end
 
+  def test_rendering_with_escapes
+    output = render(<<-HAML, :action_view)
+- render_something_with_haml_concat
+- render_something_with_haml_tag_and_concat
+- render_something_with_haml_concat
+HAML
+    assert_equal("&lt;p&gt;\n<p>\n  <foo>\n</p>\n&lt;p&gt;\n", output)
+  end
+
   def test_flatten
     assert_equal("FooBar", Haml::Helpers.flatten("FooBar"))
 

data/test/template_test.rb

@@ -116,6 +116,29 @@ class TemplateTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_render_method_returning_null_with_ugly
+    @base.instance_eval do
+      def empty
+        nil
+      end
+      def render_something(&block)
+        capture(self, &block)
+      end
+    end
+
+    content_to_render = "%h1 This is part of the broken view.\n= render_something do |thing|\n  = thing.empty do\n    = 'test'"
+    result = render(content_to_render, :ugly => true)
+    expected_result = "<h1>This is part of the broken view.</h1>\n"
+    assert_equal(expected_result, result)
+  end
+
+  def test_simple_rendering_with_ugly
+    content_to_render = "%p test\n= capture { 'foo' }"
+    result = render(content_to_render, :ugly => true)
+    expected_result = "<p>test</p>\nfoo\n"
+    assert_equal(expected_result, result)
+  end
+
   def test_templates_should_render_correctly_with_render_proc
     assert_renders_correctly("standard") do |name|
       engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :format => :xhtml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,73 +10,73 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: tilt
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rails
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rbench
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: minitest
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: nokogiri
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.10
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -96,6 +96,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- CHANGELOG.md
+- FAQ.md
+- MIT-LICENSE
+- README.md
+- REFERENCE.md
+- Rakefile
+- bin/haml
 - lib/haml.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
@@ -104,39 +112,36 @@ files:
 - lib/haml/exec.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
-- lib/haml/options.rb
-- lib/haml/parser.rb
-- lib/haml/railtie.rb
-- lib/haml/sass_rails_filter.rb
-- lib/haml/template.rb
-- lib/haml/util.rb
-- lib/haml/version.rb
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/action_view_xss_mods.rb
 - lib/haml/helpers/safe_erubis_template.rb
 - lib/haml/helpers/xss_mods.rb
+- lib/haml/options.rb
+- lib/haml/parser.rb
+- lib/haml/railtie.rb
+- lib/haml/sass_rails_filter.rb
+- lib/haml/template.rb
 - lib/haml/template/options.rb
 - lib/haml/template/plugin.rb
-- bin/haml
+- lib/haml/temple.rb
+- lib/haml/util.rb
+- lib/haml/version.rb
 - test/engine_test.rb
-- test/filters_test.rb
-- test/helper_test.rb
-- test/parser_test.rb
-- test/template_test.rb
-- test/test_helper.rb
-- test/util_test.rb
 - test/erb/_av_partial_1.erb
 - test/erb/_av_partial_2.erb
 - test/erb/action_view.erb
 - test/erb/standard.erb
+- test/filters_test.rb
 - test/gemfiles/Gemfile.rails-3.0.x
 - test/gemfiles/Gemfile.rails-3.1.x
 - test/gemfiles/Gemfile.rails-3.2.x
 - test/gemfiles/Gemfile.rails-4.0.x
 - test/gemfiles/Gemfile.rails-4.0.x.lock
+- test/helper_test.rb
 - test/markaby/standard.mab
 - test/mocks/article.rb
+- test/parser_test.rb
 - test/results/content_for_layout.xhtml
 - test/results/eval_suppressed.xhtml
 - test/results/helpers.xhtml
@@ -155,6 +160,7 @@ files:
 - test/results/tag_parsing.xhtml
 - test/results/very_basic.xhtml
 - test/results/whitespace_handling.xhtml
+- test/template_test.rb
 - test/templates/_av_partial_1.haml
 - test/templates/_av_partial_1_ugly.haml
 - test/templates/_av_partial_2.haml
@@ -187,13 +193,8 @@ files:
 - test/templates/tag_parsing.haml
 - test/templates/very_basic.haml
 - test/templates/whitespace_handling.haml
-- Rakefile
-- ".yardopts"
-- CHANGELOG.md
-- FAQ.md
-- MIT-LICENSE
-- README.md
-- REFERENCE.md
+- test/test_helper.rb
+- test/util_test.rb
 homepage: http://haml.info/
 licenses:
 - MIT
@@ -229,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.