Merge branch 'stable'

doc-src/HAML_CHANGELOG.md

@@ -153,6 +153,9 @@ that surrounds the filtered text with `<style>` and CDATA tags.
 
 * Fix compilation of HTML5 doctypes when using `html2haml`.
 
+* `nil` values for Sass options are now ignored,
+  rather than raising errors.
+
 ## [2.2.16](http://github.com/nex3/haml/commit/2.2.16)
 
 * Abstract out references to `ActionView::TemplateError`,

doc-src/SASS_CHANGELOG.md

@@ -116,6 +116,9 @@ Several bug fixes and minor improvements have been made, including:
 
 * Report the filename in warnings about selectors without properties.
 
+* `nil` values for Sass options are now ignored,
+  rather than raising errors.
+
 ### Must Read!
 
 * When `@import` is given a filename without an extension,

lib/haml/engine.rb

@@ -88,7 +88,7 @@ def initialize(template, options = {})
       unless ruby1_8?
         @options[:encoding] = Encoding.default_internal || "utf-8"
       end
-      @options.merge! options
+      @options.merge! options.reject {|k, v| v.nil?}
       @index = 0
 
       unless [:xhtml, :html4, :html5].include?(@options[:format])

lib/sass/engine.rb

@@ -130,7 +130,7 @@ def comment?
     # @param options [{Symbol => Object}] An options hash;
     #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
     def initialize(template, options={})
-      @options = DEFAULT_OPTIONS.merge(options)
+      @options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
       @template = template
 
       # Backwards compatibility

test/haml/engine_test.rb

@@ -283,6 +283,10 @@ def test_both_whitespace_nukes_work_together
 SOURCE
   end
 
+  def test_nil_option
+    assert_equal("<p foo='bar'></p>\n", render('%p{:foo => "bar"}', :attr_wrapper => nil))
+  end
+
   # Regression tests
 
   def test_whitespace_nuke_with_both_newlines

test/sass/engine_test.rb

@@ -1019,6 +1019,16 @@ def test_pseudo_class_with_new_properties
 SASS
   end
 
+  def test_nil_option
+    assert_equal(<<CSS, render(<<SASS, :format => nil))
+foo {
+  a: b; }
+CSS
+foo
+  a: b
+SASS
+  end
+
   # Regression tests
 
   def test_parens_in_mixins