haml 2.2.9 → 2.2.10

data/VERSION

@@ -1 +1 @@
-2.2.9
+2.2.10

data/lib/haml/engine.rb

@@ -175,14 +175,15 @@ module Haml
         @haml_buffer = buffer
       end
 
-      eval(precompiled, scope, @options[:filename], @options[:line])
+      str = eval(precompiled + ";" + precompiled_method_return_value,
+        scope, @options[:filename], @options[:line])
 
       # Get rid of the current buffer
       scope_object.instance_eval do
         @haml_buffer = buffer.upper
       end
 
-      buffer.buffer
+      str
     end
     alias_method :to_html, :render
 

data/lib/haml/html.rb

@@ -59,7 +59,7 @@ require 'hpricot'
 
 module Haml
   # Converts HTML documents into Haml templates.
-  # Depends on [Hpricot](http://code.whytheluckystiff.net/hpricot/) for HTML parsing.
+  # Depends on [Hpricot](http://github.com/whymirror/hpricot) for HTML parsing.
   #
   # Example usage:
   #

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
 
@@ -99,11 +99,17 @@ __in_erb_template = true
 END
       postamble = <<END.gsub("\n", ";")
 @haml_buffer = @haml_buffer.upper
-_erbout
+#{precompiled_method_return_value}
 END
       preamble + locals_code(local_names) + precompiled + postamble
     end
 
+    # Returns the string used as the return value of the precompiled method.
+    # This method exists so it can be monkeypatched to return modified values.
+    def precompiled_method_return_value
+      "_erbout"
+    end
+
     def locals_code(names)
       names = names.keys if Hash == names
 
@@ -727,6 +733,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 +758,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 +776,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/lib/haml/template.rb

@@ -11,6 +11,31 @@ module Haml
     #
     # @return [Hash<Symbol, Object>]
     attr_accessor :options
+
+    # Enables integration with the Rails 2.2.5+ XSS protection,
+    # if it's available and enabled.
+    #
+    # @return [Boolean] Whether the XSS integration was enabled.
+    def try_enabling_xss_integration
+      return false unless ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?
+
+      Haml::Template.options[:escape_html] = true
+
+      Haml::Util.module_eval {def rails_xss_safe?; true; end}
+
+      require 'haml/helpers/xss_mods'
+      Haml::Helpers.send(:include, Haml::Helpers::XssMods)
+
+      Haml::Precompiler.module_eval do
+        def precompiled_method_return_value_with_haml_xss
+          "(#{precompiled_method_return_value_without_haml_xss}).html_safe!"
+        end
+        alias_method :precompiled_method_return_value_without_haml_xss, :precompiled_method_return_value
+        alias_method :precompiled_method_return_value, :precompiled_method_return_value_with_haml_xss
+      end
+
+      true
+    end
   end
 end
 
@@ -27,19 +52,13 @@ else
   require 'haml/template/patch'
 end
 
-if ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?
-  Haml::Template.options[:escape_html] = true
-
-  module Haml::Util
-    def rails_xss_safe?
-      true
-    end
-  end
-
-  require 'haml/helpers/xss_mods'
-  module Haml::Helpers
-    include XssMods
-  end
+# Enable XSS integration. Use Rails' after_initialize method if possible
+# so that integration will be checked after the rails_xss plugin is loaded
+# (for Rails 2.3.* where it's not enabled by default).
+if defined?(Rails.configuration.after_initialize)
+  Rails.configuration.after_initialize {Haml::Template.try_enabling_xss_integration}
+else
+  Haml::Template.try_enabling_xss_integration
 end
 
 if defined?(RAILS_ROOT)

data/lib/sass/engine.rb

@@ -107,7 +107,7 @@ module Sass
     MIXIN_INCLUDE_CHAR    = ?+
 
     # The regex that matches properties of the form <tt>name: prop</tt>.
-    PROPERTY_NEW_MATCHER = /^[^\s:"]+\s*[=:](\s|$)/
+    PROPERTY_NEW_MATCHER = /^[^\s:"\[]+\s*[=:](\s|$)/
 
     # The regex that matches and extracts data from
     # properties of the form <tt>name: prop</tt>.

data/test/haml/engine_test.rb

@@ -123,6 +123,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)

data/test/haml/template_test.rb

@@ -241,6 +241,9 @@ END
 
   ## XSS Protection Tests
 
+  # In order to enable these, either test against Rails 3.0
+  # or test against Rails 2.2.5+ with the rails_xss plugin
+  # (http://github.com/NZKoz/rails_xss) in test/plugins.
   if Haml::Util.rails_xss_safe?
     def test_escape_html_option_set
       assert Haml::Template.options[:escape_html]
@@ -273,5 +276,13 @@ END
     def test_xss_protection_with_mixed_strings_in_interpolation
       assert_equal("Foo & Bar & Baz\n", render('Foo #{"&".html_safe!} Bar #{"&"} Baz', :action_view))
     end
+
+    def test_rendered_string_is_html_safe
+      assert(render("Foo").html_safe?)
+    end
+
+    def test_rendered_string_is_html_safe_with_action_view
+      assert(render("Foo", :action_view).html_safe?)
+    end
   end
 end

data/test/sass/engine_test.rb

@@ -673,6 +673,17 @@ foo {
 CSS
   end
 
+  def test_attribute_selector_with_spaces
+    assert_equal(<<CSS, render(<<SASS))
+a b[foo = bar] {
+  c: d; }
+CSS
+a
+  b[foo = bar]
+    c: d
+SASS
+  end
+
   def test_quoted_colon
     assert_equal(<<CSS, render(<<SASS))
 a b[foo="bar: baz"] {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 -07:00
+date: 2009-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,200 +43,200 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- VERSION
-- MIT-LICENSE
-- README.md
 - VERSION_NAME
-- REVISION
 - CONTRIBUTING
+- README.md
+- MIT-LICENSE
+- VERSION
+- REVISION
 files: 
 - rails/init.rb
 - lib/sass.rb
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/merb.rb
+- lib/sass/css.rb
+- lib/sass/script/node.rb
+- lib/sass/script/number.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/literal.rb
+- lib/sass/script/functions.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/color.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/variable.rb
+- lib/sass/script/string.rb
+- lib/sass/script/funcall.rb
+- lib/sass/script/unary_operation.rb
 - lib/sass/script.rb
 - lib/sass/error.rb
+- lib/sass/repl.rb
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/for_node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/if_node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/variable_node.rb
 - lib/sass/tree/debug_node.rb
-- lib/sass/tree/directive_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/rule_node.rb
 - lib/sass/tree/import_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/if_node.rb
+- lib/sass/tree/mixin_node.rb
+- lib/sass/tree/directive_node.rb
+- lib/sass/tree/rule_node.rb
+- lib/sass/tree/prop_node.rb
+- lib/sass/tree/variable_node.rb
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/merb.rb
+- lib/sass/environment.rb
 - lib/sass/files.rb
-- lib/sass/plugin.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/color.rb
-- lib/sass/script/string.rb
-- lib/sass/script/unary_operation.rb
-- lib/sass/script/number.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/functions.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/node.rb
-- lib/sass/script/literal.rb
-- lib/sass/css.rb
 - lib/sass/engine.rb
-- lib/sass/repl.rb
-- lib/sass/environment.rb
-- lib/haml/util.rb
+- lib/sass/plugin.rb
+- lib/haml/filters.rb
 - lib/haml/exec.rb
-- lib/haml/html.rb
 - lib/haml/error.rb
-- lib/haml/buffer.rb
 - lib/haml/template.rb
-- lib/haml/template/plugin.rb
+- lib/haml/shared.rb
+- lib/haml/engine.rb
+- lib/haml/version.rb
 - lib/haml/template/patch.rb
+- lib/haml/template/plugin.rb
 - lib/haml/helpers.rb
-- lib/haml/version.rb
-- lib/haml/filters.rb
-- lib/haml/engine.rb
+- lib/haml/buffer.rb
+- lib/haml/html.rb
 - lib/haml/precompiler.rb
-- lib/haml/shared.rb
-- lib/haml/helpers/action_view_extensions.rb
+- lib/haml/util.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
+- lib/haml/helpers/action_view_extensions.rb
 - lib/haml.rb
-- bin/css2sass
 - bin/sass
-- bin/haml
+- bin/css2sass
 - bin/html2haml
+- bin/haml
+- test/linked_rails.rb
+- test/benchmark.rb
 - test/sass/script_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/results/units.css
+- test/sass/results/parent_ref.css
+- test/sass/results/compressed.css
+- test/sass/results/complex.css
+- test/sass/results/compact.css
+- test/sass/results/mixins.css
+- test/sass/results/line_numbers.css
+- test/sass/results/alt.css
+- test/sass/results/subdir/subdir.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/nested.css
+- test/sass/results/import.css
+- test/sass/results/multiline.css
+- test/sass/results/script.css
+- test/sass/results/basic.css
+- test/sass/results/expanded.css
+- test/sass/more_results/more_import.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more1.css
-- test/sass/more_results/more_import.css
-- test/sass/templates/bork2.sass
+- test/sass/templates/basic.sass
+- test/sass/templates/bork.sass
 - test/sass/templates/compressed.sass
-- test/sass/templates/expanded.sass
 - test/sass/templates/import.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/basic.sass
+- test/sass/templates/script.sass
+- test/sass/templates/expanded.sass
+- test/sass/templates/nested.sass
 - test/sass/templates/_partial.sass
-- test/sass/templates/units.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
 - test/sass/templates/line_numbers.sass
-- test/sass/templates/nested.sass
 - test/sass/templates/compact.sass
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/parent_ref.sass
 - test/sass/templates/alt.sass
-- test/sass/templates/script.sass
 - test/sass/templates/importee.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/bork.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/multiline.sass
+- test/sass/templates/units.sass
 - test/sass/templates/complex.sass
-- test/sass/css2sass_test.rb
-- test/sass/plugin_test.rb
+- test/sass/templates/bork2.sass
+- test/sass/more_templates/_more_partial.sass
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
-- test/sass/more_templates/_more_partial.sass
 - test/sass/functions_test.rb
-- test/sass/results/nested.css
-- test/sass/results/units.css
-- test/sass/results/script.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/import.css
-- test/sass/results/compact.css
-- test/sass/results/expanded.css
-- test/sass/results/alt.css
-- test/sass/results/mixins.css
-- test/sass/results/complex.css
-- test/sass/results/compressed.css
-- test/sass/results/parent_ref.css
-- test/sass/results/line_numbers.css
-- test/sass/results/multiline.css
-- test/sass/results/basic.css
 - test/sass/engine_test.rb
+- test/sass/plugin_test.rb
 - test/haml/mocks/article.rb
-- test/haml/util_test.rb
-- test/haml/template_test.rb
-- test/haml/html2haml_test.rb
-- test/haml/rhtml/_av_partial_1.rhtml
+- test/haml/rhtml/_av_partial_2.rhtml
 - test/haml/rhtml/standard.rhtml
+- test/haml/rhtml/_av_partial_1.rhtml
 - test/haml/rhtml/action_view.rhtml
-- test/haml/rhtml/_av_partial_2.rhtml
-- test/haml/helper_test.rb
-- test/haml/templates/action_view_ugly.haml
-- test/haml/templates/list.haml
-- test/haml/templates/_text_area.haml
-- test/haml/templates/_partial.haml
-- test/haml/templates/nuke_outer_whitespace.haml
-- test/haml/templates/render_layout.haml
-- test/haml/templates/_av_partial_2.haml
-- test/haml/templates/partial_layout.haml
-- test/haml/templates/helpful.haml
-- test/haml/templates/_av_partial_1_ugly.haml
-- test/haml/templates/just_stuff.haml
-- test/haml/templates/standard_ugly.haml
-- test/haml/templates/silent_script.haml
-- test/haml/templates/very_basic.haml
-- test/haml/templates/nuke_inner_whitespace.haml
-- test/haml/templates/eval_suppressed.haml
-- test/haml/templates/tag_parsing.haml
-- test/haml/templates/whitespace_handling.haml
-- test/haml/templates/partials.haml
-- test/haml/templates/standard.haml
-- test/haml/templates/partialize.haml
-- test/haml/templates/_layout_for_partial.haml
-- test/haml/templates/_av_partial_1.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/_layout.erb
-- test/haml/templates/content_for_layout.haml
-- test/haml/templates/_av_partial_2_ugly.haml
-- test/haml/templates/helpers.haml
-- test/haml/templates/original_engine.haml
-- test/haml/templates/breakage.haml
-- test/haml/templates/action_view.haml
-- test/haml/spec/tests.json
-- test/haml/spec/lua_haml_spec.lua
+- test/haml/util_test.rb
 - test/haml/spec/ruby_haml_test.rb
 - test/haml/spec/README.md
+- test/haml/spec/lua_haml_spec.lua
+- test/haml/spec/tests.json
+- test/haml/html2haml_test.rb
+- test/haml/template_test.rb
+- test/haml/helper_test.rb
+- test/haml/results/tag_parsing.xhtml
 - test/haml/results/content_for_layout.xhtml
-- test/haml/results/just_stuff.xhtml
-- test/haml/results/whitespace_handling.xhtml
-- test/haml/results/nuke_outer_whitespace.xhtml
-- test/haml/results/silent_script.xhtml
-- test/haml/results/filters.xhtml
-- test/haml/results/standard.xhtml
-- test/haml/results/nuke_inner_whitespace.xhtml
-- test/haml/results/helpful.xhtml
+- test/haml/results/helpers.xhtml
+- test/haml/results/original_engine.xhtml
 - test/haml/results/very_basic.xhtml
-- test/haml/results/eval_suppressed.xhtml
+- test/haml/results/helpful.xhtml
+- test/haml/results/list.xhtml
 - test/haml/results/partials.xhtml
+- test/haml/results/eval_suppressed.xhtml
+- test/haml/results/nuke_inner_whitespace.xhtml
+- test/haml/results/whitespace_handling.xhtml
 - test/haml/results/render_layout.xhtml
-- test/haml/results/original_engine.xhtml
-- test/haml/results/helpers.xhtml
-- test/haml/results/list.xhtml
+- test/haml/results/silent_script.xhtml
+- test/haml/results/standard.xhtml
+- test/haml/results/just_stuff.xhtml
 - test/haml/results/partial_layout.xhtml
-- test/haml/results/tag_parsing.xhtml
+- test/haml/results/filters.xhtml
+- test/haml/results/nuke_outer_whitespace.xhtml
 - test/haml/markaby/standard.mab
+- test/haml/templates/tag_parsing.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/partial_layout.haml
+- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/partials.haml
+- test/haml/templates/_layout_for_partial.haml
+- test/haml/templates/original_engine.haml
+- test/haml/templates/helpers.haml
+- test/haml/templates/_layout.erb
+- test/haml/templates/action_view_ugly.haml
+- test/haml/templates/content_for_layout.haml
+- test/haml/templates/silent_script.haml
+- test/haml/templates/very_basic.haml
+- test/haml/templates/render_layout.haml
+- test/haml/templates/filters.haml
+- test/haml/templates/_av_partial_1.haml
+- test/haml/templates/standard_ugly.haml
+- test/haml/templates/_partial.haml
+- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/breakage.haml
+- test/haml/templates/list.haml
+- test/haml/templates/standard.haml
+- test/haml/templates/whitespace_handling.haml
+- test/haml/templates/eval_suppressed.haml
+- test/haml/templates/action_view.haml
+- test/haml/templates/_av_partial_2.haml
+- test/haml/templates/partialize.haml
+- test/haml/templates/just_stuff.haml
+- test/haml/templates/helpful.haml
+- test/haml/templates/_av_partial_1_ugly.haml
+- test/haml/templates/_text_area.haml
 - test/haml/engine_test.rb
-- test/linked_rails.rb
-- test/benchmark.rb
 - test/test_helper.rb
-- extra/sass-mode.el
 - extra/haml-mode.el
+- extra/sass-mode.el
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- VERSION
-- MIT-LICENSE
-- README.md
 - VERSION_NAME
-- REVISION
 - CONTRIBUTING
+- README.md
+- MIT-LICENSE
+- VERSION
+- REVISION
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
 licenses: []
@@ -268,19 +268,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 test_files: 
 - test/sass/script_test.rb
 - test/sass/css2sass_test.rb
-- test/sass/plugin_test.rb
 - test/sass/functions_test.rb
 - test/sass/engine_test.rb
+- test/sass/plugin_test.rb
 - test/haml/util_test.rb
-- test/haml/template_test.rb
+- test/haml/spec/ruby_haml_test.rb
 - test/haml/html2haml_test.rb
+- test/haml/template_test.rb
 - test/haml/helper_test.rb
-- test/haml/spec/ruby_haml_test.rb
 - test/haml/engine_test.rb