haml 3.1.5 → 3.1.6.rc.1

data/REVISION

@@ -1 +1 @@
-9a5743d5002ab63dc5e22f52a0b07ff0a0493d20
+f211a9b4cf24d39942caa8e5e10c72f30276d5a7

data/VERSION

@@ -1 +1 @@
-3.1.5
+3.1.6.rc.1

data/lib/haml/buffer.rb

@@ -97,6 +97,8 @@ 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.
@@ -157,7 +159,9 @@ module Haml
         return result
       <% else %>
 
-        has_newline = result.include?("\\n") 
+        return result if self.instance_variable_get(:@preserve_pattern).match(result)
+
+        has_newline = result.include?("\\n")
         <% if in_tag && !nuke_inner_whitespace %>
           <% unless preserve_tag %> if !has_newline <% end %>
           @real_tabs -= 1

data/lib/haml/helpers/rails_323_textarea_fix.rb

@@ -1,3 +1,5 @@
+require "abstract_controller/rendering"
+
 # Rails 3.2.3's form helpers add a newline after opening textareas, which can
 # cause problems with newlines being considered content rather than markup.
 # These changes fix the issue by making the helpers emit "<haml:newline/>"
@@ -8,42 +10,32 @@
 # compatibility with the latest version of Rails, made at a moment when the Haml
 # project is transitioning to a new maintainer.
 
-module AbstractController
-  module Rendering
-    def render_to_body_with_haml(options = {})
-      if rendered = render_to_body_without_haml(options)
-        rendered.gsub('<haml:newline/>', "\n").html_safe
-      end
-    end
-    alias_method_chain :render_to_body, :haml
-  end
-end
+# module AbstractController
+#   module Rendering
+#     def render_to_body_with_haml(options = {})
+#       if rendered = render_to_body_without_haml(options)
+#         rendered.gsub('<haml:newline/>', "\n").html_safe
+#       end
+#     end
+#     alias_method_chain :render_to_body, :haml
+#   end
+# end
 
 module ActionView
+  module Helpers
 
-  class Renderer
-    def render_template_with_haml(context, options)
-      if rendered = render_template_without_haml(context, options)
-        rendered.gsub('<haml:newline/>', "\n").html_safe
+    module FormTagHelper
+      def text_area_tag_with_haml(*args)
+        text_area_tag_without_haml(*args).sub('>&#x000A;', ">\n").html_safe
       end
+      alias_method_chain :text_area_tag, :haml
     end
-    alias_method_chain :render_template, :haml
-  end
-
-  module Helpers
-    module TagHelper
-      private
 
-      def content_tag_string_with_haml(name, content, options, escape = true)
-        if name.to_sym == :textarea
-          tag_options = tag_options(options, escape) if options
-          content = ERB::Util.h(content) if escape
-          "<#{name}#{tag_options}><haml:newline/>#{content}</#{name}>".html_safe
-        else
-          content_tag_string_without_haml(name, content, options, escape)
-        end
+    module FormHelper
+      def text_area_with_haml(*args)
+        text_area_without_haml(*args).sub('>&#x000A;', ">\n").html_safe
       end
-      alias_method_chain :content_tag_string, :haml
+      alias_method_chain :text_area, :haml
     end
   end
 end

data/test/haml/results/whitespace_handling.xhtml

@@ -1,28 +1,26 @@
 <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
@@ -30,42 +28,40 @@
   <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>
+      a
+      </textarea>
 <textarea>&#x000A;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
@@ -73,9 +69,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/
@@ -86,4 +82,4 @@
 </div>
 <pre>       __     ______        __               ______&#x000A;.----.|  |--.|__    |.----.|  |--..--------.|  __  |&#x000A;|  __||     ||__    ||  __||    < |        ||  __  |&#x000A;|____||__|__||______||____||__|__||__|__|__||______|</pre>
 <pre>foo
-bar</pre>
+bar</pre>

metadata

@@ -1,68 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haml
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 5
-  version: 3.1.5
+version: !ruby/object:Gem::Version
+  version: 3.1.6.rc.1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Nathan Weizenbaum
 - Hampton Catlin
 - Norman Clarke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 5
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.9
   type: :development
-  version_requirements: *id002
-description: "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML\n      that's designed to express the structure of XHTML or XML documents\n      in a non-repetitive, elegant, easy way,\n      using indentation rather than closing tags\n      and allowing Ruby to be embedded with ease.\n      It was originally envisioned as a plugin for Ruby on Rails,\n      but it can function as a stand-alone templating engine.\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.9
+description: ! "      Haml (HTML Abstraction Markup Language) is a layer on top of
+  XHTML or XML\n      that's designed to express the structure of XHTML or XML documents\n
+  \     in a non-repetitive, elegant, easy way,\n      using indentation rather than
+  closing tags\n      and allowing Ruby to be embedded with ease.\n      It was originally
+  envisioned as a plugin for Ruby on Rails,\n      but it can function as a stand-alone
+  templating engine.\n"
+email:
 - haml@googlegroups.com
 - norman@njclarke.com
-executables: 
+executables:
 - haml
 - html2haml
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - rails/init.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
@@ -455,38 +452,29 @@ files:
 - VERSION_NAME
 homepage: http://haml.info/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: haml
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine.
-test_files: 
+test_files:
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
 - test/haml/html2haml_test.rb