haml 4.0.0 → 4.0.1.rc.1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Haml Changelog
 
+## 4.0.1 (Unreleased)
+
+* Remove Rails 3.2.3+ textarea hack in favor of a more general solution.
+* Fix some performance regressions.
+* Fix support for Rails 4 `text_area` helper method.
+* Fix data attribute flattening with singleton objects.
+(thanks [Alisdair McDiarmid](https://github.com/alisdair))
+* Fix support for sass-rails 4.0 beta.
+(thanks [Ryunosuke SATO](https://github.com/tricknotes))
+
 ## 4.0.0
 
 * The Haml exectutable now accepts an `--autoclose` option. You can now
@@ -12,7 +22,7 @@
 * HTML5 is now the default output format rather than XHTML. This was already
   the default on Rails 3+, so many users will notice no difference.
 
-* The :sass filter now wraps its output in a script tag, as do the new :less and
+* The :sass filter now wraps its output in a style tag, as do the new :less and
   :scss filters. The :coffee filter wraps its output in a script tag.
 
 * Haml now supports only Rails 3 and above, and Ruby 1.8.7 and above. If you
@@ -57,7 +67,7 @@
   (thanks to [Péter Pál Koszta](https://github.com/koszta))
 
 * Filters that rely on third-party template engines are now implemented using
-  [Tilt](github.com/rtomayko/tilt). Several new filters have been added, namely
+  [Tilt](http://github.com/rtomayko/tilt). Several new filters have been added, namely
   SCSS (:scss), LessCSS, (:less), and Coffeescript (:coffee/:coffeescript).
 
   Though the list of "official" filters is kept intentionally small, Haml comes

data/FAQ.md

@@ -59,7 +59,8 @@ For example,
 will be compiled to
 
     <p>
-      <textarea>Foo&#x000A;Bar</textarea>
+      <textarea>
+    Foo&#x000A;Bar</textarea>
     </p>
 
 However, if a helper is generating the tag,

data/lib/haml/buffer.rb

@@ -97,8 +97,6 @@ module Haml
       # The number of tabs that Engine thinks we should have
       # @real_tabs + @tabulation is the number of tabs actually output
       @real_tabs = 0
-
-      @preserve_pattern = /<[\s]*#{@options[:preserve].join("|")}/i
     end
 
     # Appends text to the buffer, properly tabulated.
@@ -158,11 +156,9 @@ module Haml
       <% end %>
 
       <% if ugly %>
+        fix_textareas!(result, nil) if toplevel? && result.include?('<textarea')
         return result
       <% else %>
-
-        return result if self.instance_variable_get(:@preserve_pattern).match(result)
-
         <% if !(in_tag && preserve_tag && !nuke_inner_whitespace) %>
         has_newline = result.include?("\\n")
         <% end %>
@@ -188,6 +184,8 @@ module Haml
           <% if in_tag && !nuke_inner_whitespace %> result = tabs(tabulation) + result <% end %>
         end
 
+        fix_textareas!(result, tabs(tabulation)) if toplevel? && result.include?('<textarea')
+
         <% if in_tag && !nuke_inner_whitespace %>
           result = "\\n\#{result}\\n\#{tabs(tabulation-1)}"
           @real_tabs -= 1
@@ -263,6 +261,29 @@ RUBY
 
     private
 
+    # Works like #{find_and_preserve}, but allows the first newline after a
+    # preserved opening tag to remain unencoded, and then outdents the content.
+    # This change was motivated primarily by the change in Rails 3.2.3 to emit
+    # a newline after textarea helpers.
+    #
+    # @param input [String] The text to process
+    # @param tabs [String] The tabs provided by the Haml::Buffer
+    # @param options [Hash] The options hash provided by the Haml::Buffer
+    # @since Haml 4.0.1
+    # @private
+    def fix_textareas!(input, tabs)
+      pattern = /([ ]*)<(textarea)([^>]*)>(\n|&#x000A;)(.*?)(<\/\2>)/im
+      input.gsub!(pattern) do |s|
+        match = pattern.match(s)
+        content = match[5]
+        unless tabs.nil?
+          content.sub!(match[1].to_s, '')
+          content.sub!(tabs, '')
+        end
+        "#{match[1]}<#{match[2]}#{match[3]}>\n#{content}</#{match[2]}>"
+      end
+    end
+
     if RUBY_VERSION < "1.9"
       def new_encoded_string
         ""

data/lib/haml/compiler.rb

@@ -417,13 +417,13 @@ END
       join_char        = hyphenate_data_attrs ? '-' : '_'
 
       attributes.each do |key, value|
-      	if value.is_a?(Hash)
-        	data_attributes = attributes.delete(key)
-        	data_attributes = flatten_data_attributes(data_attributes, '', join_char)
-        	data_attributes = build_data_keys(data_attributes, hyphenate_data_attrs, key)
-        	attributes = data_attributes.merge(attributes)
-      	end
-			end
+        if value.is_a?(Hash)
+          data_attributes = attributes.delete(key)
+          data_attributes = flatten_data_attributes(data_attributes, '', join_char)
+          data_attributes = build_data_keys(data_attributes, hyphenate_data_attrs, key)
+          attributes = data_attributes.merge(attributes)
+        end
+      end
 
       result = attributes.collect do |attr, value|
         next if value.nil?
@@ -449,11 +449,11 @@ END
         value = Haml::Helpers.preserve(escaped)
         if escape_attrs
           # We want to decide whether or not to escape quotes
-          value = value.gsub('"', '"').gsub('"', '"')
+          value.gsub!(/"|"/, '"')
           this_attr_wrapper = attr_wrapper
           if value.include? attr_wrapper
             if value.include? other_quote_char
-              value = value.gsub(attr_wrapper, quote_escape)
+              value.gsub!(attr_wrapper, quote_escape)
             else
               this_attr_wrapper = other_quote_char
             end
@@ -486,10 +486,11 @@ END
     end
 
     def self.flatten_data_attributes(data, key, join_char, seen = [])
+      return {key => data} unless data.is_a?(Hash)
+
       return {key => nil} if seen.include? data.object_id
       seen << data.object_id
 
-      return {key => data} unless data.is_a?(Hash)
       data.sort {|x, y| x[0].to_s <=> y[0].to_s}.inject({}) do |hash, array|
         k, v = array
         joined = key == '' ? k : [key, k].join(join_char)

data/lib/haml/helpers/action_view_mods.rb

@@ -82,8 +82,7 @@ module ActionView
       alias_method :content_tag, :content_tag_with_haml
     end
 
-    class InstanceTag
-      # Already includes TagHelper
+    module HamlSupport
       include Haml::Helpers
 
       def haml_buffer
@@ -93,6 +92,18 @@ module ActionView
       def is_haml?
         @template_object.send :is_haml?
       end
+    end
+
+    if ActionPack::VERSION::MAJOR == 4
+      module Tags
+        class TextArea
+          include HamlSupport
+        end
+      end
+    end
+
+    class InstanceTag
+      include HamlSupport
 
       def content_tag(*args, &block)
         html_tag = content_tag_with_haml(*args, &block)
@@ -140,8 +151,4 @@ module ActionView
       alias_method :form_for, :form_for_with_haml
     end
   end
-end
-
-if ((ActionPack::VERSION::MAJOR == 3) && (ActionPack::VERSION::MINOR >= 2) && (ActionPack::VERSION::TINY >= 3) || (ActionPack::VERSION::MAJOR == 4))
-  require "haml/helpers/rails_323_textarea_fix"
-end
+end

data/lib/haml/options.rb

@@ -274,4 +274,4 @@ module Haml
     end
 
   end
-end
+end

data/lib/haml/railtie.rb

@@ -10,7 +10,7 @@ end
 module Haml
   class Railtie < ::Rails::Railtie
     initializer :haml do |app|
-      if defined?(::Sass::Rails) && app.config.assets.enabled
+      if defined?(::Sass::Rails::SassTemplate) && app.config.assets.enabled
         require "haml/sass_rails_filter"
       end
     end

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.0"
+  VERSION = "4.0.1.rc.1"
 end

data/test/engine_test.rb

@@ -1498,6 +1498,11 @@ HAML
       render("%div{data_val, :data => {:foo => 'blip', :brat => 'wurst'}}"))
   end
 
+  def test_html5_data_attributes_with_identical_attribute_values
+    assert_equal("<div data-x='50' data-y='50'></div>\n",
+      render("%div{:data => {:x => 50, :y => 50}}"))
+  end
+
   def test_xml_doc_using_html5_format_and_mime_type
     assert_equal(<<XML, render(<<HAML, { :format => :html5, :mime_type => 'text/xml' }))
 <?xml version='1.0' encoding='utf-8' ?>

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -1,4 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
 gem 'rails', '>= 3.0.0', '<  3.1.0'
 gemspec :path => "../.."

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -1,4 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
 gem 'rails', '>= 3.1.0', '< 3.2.0'
 gemspec :path => "../.."

data/test/gemfiles/Gemfile.rails-3.1.x.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: /Users/norman/work/haml
+  specs:
+    haml (4.0.1)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.11)
+      actionpack (= 3.1.11)
+      mail (~> 2.3.3)
+    actionpack (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+    activesupport (3.1.11)
+      multi_json (~> 1.0)
+    arel (2.2.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.2)
+    json (1.7.7)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
+    minitest (4.6.1)
+    multi_json (1.6.1)
+    nokogiri (1.5.6)
+    polyglot (0.3.3)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.11)
+      actionmailer (= 3.1.11)
+      actionpack (= 3.1.11)
+      activerecord (= 3.1.11)
+      activeresource (= 3.1.11)
+      activesupport (= 3.1.11)
+      bundler (~> 1.0)
+      railties (= 3.1.11)
+    railties (3.1.11)
+      actionpack (= 3.1.11)
+      activesupport (= 3.1.11)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (10.0.3)
+    rbench (0.2.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haml!
+  minitest
+  nokogiri
+  rails (>= 3.1.0, < 3.2.0)
+  rbench

data/test/gemfiles/Gemfile.rails-3.2.x

@@ -1,4 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
 gem 'rails', '>= 3.2.0', '< 3.3.0'
 gemspec :path => "../.."

data/test/gemfiles/Gemfile.rails-4.0.x

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'bundler', '~> 1.3.0'
+gem 'rails', '~> 4.0.0.beta.1'
+gemspec :path => '../..'

data/test/gemfiles/Gemfile.rails-4.0.x.lock

@@ -0,0 +1,98 @@
+PATH
+  remote: /Users/norman/work/haml
+  specs:
+    haml (4.0.1)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      mail (~> 2.5.3)
+    actionpack (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta1)
+      activemodel (= 4.0.0.beta1)
+      activerecord-deprecated_finders (~> 0.0.3)
+      activesupport (= 4.0.0.beta1)
+      arel (~> 4.0.0.beta1)
+    activerecord-deprecated_finders (0.0.3)
+    activesupport (4.0.0.beta1)
+      i18n (~> 0.6.2)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+    arel (4.0.0.beta1)
+    atomic (1.0.1)
+    builder (3.1.4)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.2)
+    json (1.7.7)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
+    minitest (4.6.1)
+    multi_json (1.6.1)
+    nokogiri (1.5.6)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0.beta1)
+      actionmailer (= 4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activerecord (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0.beta1)
+      sprockets-rails (~> 2.0.0.rc3)
+    railties (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.17.0, < 2.0)
+    rake (10.0.3)
+    rbench (0.2.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.9.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.rc3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.17.0)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3.0)
+  haml!
+  minitest
+  nokogiri
+  rails (~> 4.0.0.beta.1)
+  rbench

data/test/helper_test.rb

@@ -132,39 +132,27 @@ HTML
 HAML
   end
 
-  if ActionPack::VERSION::MAJOR == 4
-    def test_text_area
-      assert_equal(%(<textarea id="body" name="body">\nFoo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
-                   render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
-
-      assert_equal(%(<textarea id="post_body" name="post[body]">\nFoo bar&#x000A;baz</textarea>\n),
-                   render('= text_area :post, :body', :action_view))
-
-      assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
-                   render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
-    end
-  elsif (ActionPack::VERSION::MAJOR == 3) && (ActionPack::VERSION::MINOR >= 2) && (ActionPack::VERSION::TINY >= 3)
-    def test_text_area
-      assert_equal(%(<textarea id="body" name="body">\nFoo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
-                   render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
+  def test_pre
+    assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
+                 render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
+  end
 
-      assert_equal(%(<textarea cols="40" id="post_body" name="post[body]" rows="20">\nFoo bar&#x000A;baz</textarea>\n),
-                   render('= text_area :post, :body', :action_view))
+  def test_text_area
+    regex = /<(textarea)[^>]*>(.*?)<\/\1>/im
 
-      assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
-                   render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
+    # Rails >= 3.2.3 adds a newline after opening textarea tags.
+    major, minor, tiny = ActionPack::VERSION::MAJOR, ActionPack::VERSION::MINOR, ActionPack::VERSION::TINY
+    if major == 4 || ((major == 3) && (minor >= 2) && (tiny >= 3))
+      regex = /<(textarea)[^>]*>\n(.*?)<\/\1>/im
     end
-  else
-    def test_text_area
-      assert_equal(%(<textarea id="body" name="body">Foo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
-                   render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
 
-      assert_equal(%(<textarea cols="40" id="post_body" name="post[body]" rows="20">Foo bar&#x000A;baz</textarea>\n),
-                   render('= text_area :post, :body', :action_view))
+    output = render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view)
+    match_data = output.match(regex)
+    assert_equal "Foo&#x000A;Bar&#x000A; Baz&#x000A;   Boom", match_data[2]
 
-      assert_equal(%(<pre>Foo bar&#x000A;   baz</pre>\n),
-                   render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
-    end
+    output = render('= text_area :post, :body', :action_view)
+    match_data = output.match(regex)
+    assert_equal "Foo bar&#x000A;baz", match_data[2]
   end
 
   def test_capture_haml

data/test/results/whitespace_handling.xhtml

@@ -1,26 +1,28 @@
 <div id='whitespace_test'>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH</textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea>
-  <div id='flattened'><div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea></div>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH</textarea>
+  <div id='flattened'>
+    <div class='text_area_test_area'>
+      <textarea>Two&#x000A;lines</textarea>
+    </div>
+    <textarea>BLAH</textarea>
+  </div>
 </div>
 <div class='hithere'>
   Foo bar
@@ -28,40 +30,43 @@
   <pre>foo&#x000A;bar</pre>
   <p><pre>foo&#x000A;bar</pre></p>
   <p>
-        foo
-        bar
-      </p>
+    foo
+    bar
+  </p>
 </div>
 <div class='foo'>
   13
-        <textarea>
-      a
-      </textarea>
-<textarea>&#x000A;a</textarea>
+    <textarea>
+  a
+  </textarea>
+<textarea>
+a</textarea>
 </div>
 <div id='whitespace_test'>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH</textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea>
-  <div id='flattened'><div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea></div>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH</textarea>
+  <div id='flattened'>
+    <div class='text_area_test_area'>
+      <textarea>Two&#x000A;lines</textarea>
+    </div>
+    <textarea>BLAH</textarea>
+  </div>
 </div>
 <div class='hithere'>
   Foo bar
@@ -69,9 +74,9 @@
   <pre>foo&#x000A;bar</pre>
   <p><pre>foo&#x000A;bar</pre></p>
   <p>
-            foo
-            bar
-          </p>
+    foo
+    bar
+  </p>
   <pre>                                                 ___&#x000A;                                              ,o88888&#x000A;                                           ,o8888888'&#x000A;                     ,:o:o:oooo.        ,8O88Pd8888"&#x000A;                 ,.::.::o:ooooOoOoO. ,oO8O8Pd888'"&#x000A;               ,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"&#x000A;              , ..:.::o:ooOoOOOO8OOOOo.FdO8O8"&#x000A;             , ..:.::o:ooOoOO8O888O8O,COCOO"&#x000A;            , . ..:.::o:ooOoOOOO8OOOOCOCO"&#x000A;             . ..:.::o:ooOoOoOO8O8OCCCC"o&#x000A;                . ..:.::o:ooooOoCoCCC"o:o&#x000A;                . ..:.::o:o:,cooooCo"oo:o:&#x000A;             `   . . ..:.:cocoooo"'o:o:::'&#x000A;             .`   . ..::ccccoc"'o:o:o:::'&#x000A;            :.:.    ,c:cccc"':.:.:.:.:.'&#x000A;          ..:.:"'`::::c:"'..:.:.:.:.:.'  http://www.chris.com/ASCII/&#x000A;        ...:.'.:.::::"'    . . . . .'&#x000A;       .. . ....:."' `   .  . . ''&#x000A;     . . . ...."'&#x000A;     .. . ."'     -hrr-&#x000A;    .&#x000A;&#x000A;&#x000A;                                              It's a planet!&#x000A;%strong This shouldn't be bold!</pre>
   <strong>This should!</strong>
   <textarea>      ___           ___           ___           ___ &#x000A;     /\__\         /\  \         /\__\         /\__\&#x000A;    /:/  /        /::\  \       /::|  |       /:/  /&#x000A;   /:/__/        /:/\:\  \     /:|:|  |      /:/  / &#x000A;  /::\  \ ___   /::\~\:\  \   /:/|:|__|__   /:/  /  &#x000A; /:/\:\  /\__\ /:/\:\ \:\__\ /:/ |::::\__\ /:/__/   &#x000A; \/__\:\/:/  / \/__\:\/:/  / \/__/~~/:/  / \:\  \   &#x000A;      \::/  /       \::/  /        /:/  /   \:\  \  &#x000A;      /:/  /        /:/  /        /:/  /     \:\  \ &#x000A;     /:/  /        /:/  /        /:/  /       \:\__\&#x000A;     \/__/         \/__/         \/__/         \/__/&#x000A;     &#x000A;     Many&#x000A;                   thanks&#x000A;           to&#x000A;                                http://www.network-science.de/ascii/

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 4.0.0
+  prerelease: 6
+  version: 4.0.1.rc.1
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,88 +11,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+  name: tilt
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
+    none: false
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    none: false
+  type: :development
   name: rails
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  prerelease: false
+        version: '0'
+    none: false
   type: :development
-- !ruby/object:Gem::Dependency
   name: rbench
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+    none: false
   type: :development
-- !ruby/object:Gem::Dependency
   name: minitest
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+    none: false
   type: :development
-- !ruby/object:Gem::Dependency
   name: nokogiri
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
 description: ! 'Haml (HTML Abstraction Markup Language) is a layer on top of HTML
   or XML that''s
 
@@ -122,7 +122,6 @@ files:
 - 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/rails_323_textarea_fix.rb
 - lib/haml/helpers/safe_erubis_template.rb
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/helpers.rb
@@ -145,8 +144,10 @@ files:
 - test/filters_test.rb
 - test/gemfiles/Gemfile.rails-3.0.x
 - test/gemfiles/Gemfile.rails-3.1.x
+- test/gemfiles/Gemfile.rails-3.1.x.lock
 - test/gemfiles/Gemfile.rails-3.2.x
-- test/gemfiles/Gemfile.rails-master
+- 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
@@ -244,26 +245,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 3355577792412640496
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 3355577792412640496
-      version: '0'
+      version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An elegant, structured (X)HTML/XML templating engine.

data/lib/haml/helpers/rails_323_textarea_fix.rb

@@ -1,24 +0,0 @@
-# As of 3.2.3, Rails's form helpers add a newline after opening textareas,
-# which can cause problems with newlines being considered content rather than
-# markup. Here we decode the first newline back into a real newline to make the
-# textarea work as expected. Note that in order for this to work, the compiler
-# code was also change to avoid indenting code with textareas, even when Haml
-# is running in indented mode.
-module ActionView
-  module Helpers
-
-    module FormTagHelper
-      def text_area_tag_with_haml(*args)
-        text_area_tag_without_haml(*args).sub('>
', ">\n").html_safe
-      end
-      alias_method_chain :text_area_tag, :haml
-    end
-
-    module FormHelper
-      def text_area_with_haml(*args)
-        text_area_without_haml(*args).sub('>
', ">\n").html_safe
-      end
-      alias_method_chain :text_area, :haml
-    end
-  end
-end

data/test/gemfiles/Gemfile.rails-master

@@ -1,4 +0,0 @@
-source :rubygems
-
-gem 'rails', git: 'git://github.com/rails/rails.git'
-gemspec :path => '../..'