haml 2.0.4 → 2.0.5

data/README.rdoc

@@ -31,12 +31,12 @@ to corresponding CSS files in public/stylesheets when needed
 see the Sass module docs for details).
 
 For Merb, <tt>.html.haml</tt> views will work without any further modification.
-To enable Sass, you also need to add it add a dependency.
+To enable Sass, you also need to add a dependency.
 To do so, just add
 
-  dependency "haml"
+  dependency "merb-haml"
 
-to config/dependencies.rb.
+to config/dependencies.rb (or config/init.rb in a flat/very flat Merb application).
 Then it'll work just like it does in Rails.
 
 To use Haml and Sass programatically,

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/haml.rb

@@ -39,7 +39,7 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 # Once it's installed, all view files with the ".html.haml" extension
 # will be compiled using Haml.
 #
-# To run Haml from the commandline, just use
+# To run Haml from the command line, just use
 #
 #   haml input.haml output.html
 #

data/lib/haml/helpers.rb

@@ -54,9 +54,9 @@ module Haml
     def non_haml
       was_active = @haml_buffer.active?
       @haml_buffer.active = false
-      res = yield
+      yield
+    ensure
       @haml_buffer.active = was_active
-      res
     end
 
     # call-seq:
@@ -405,6 +405,14 @@ END
       !@haml_buffer.nil? && @haml_buffer.active?
     end
 
+    # Returns whether or not +block+ is defined directly in a Haml template.
+    def block_is_haml?(block)
+      eval('_hamlout', block)
+      true
+    rescue
+      false
+    end
+
     private
 
     # call-seq:

data/lib/haml/helpers/action_view_mods.rb

@@ -51,15 +51,8 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
             # if it's not actually in the template context,
             # as detected by the existance of an _erbout variable.
             # We've got to do the same thing for compatibility.
-            block_is_haml =
-              begin
-                eval('_hamlout', block)
-                true
-              rescue
-                false
-              end
 
-            if block_is_haml && is_haml?
+            if is_haml? && block_is_haml?(block)
               capture_haml(*args, &block)
             else
               capture_without_haml(*args, &block)
@@ -106,14 +99,19 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
 
       module TagHelper
         def content_tag_with_haml(name, *args, &block)
-          content = content_tag_without_haml(name, *args, &block)
+          return content_tag_without_haml(name, *args, &block) unless is_haml?
+
+          preserve = haml_buffer.options[:preserve].include?(name.to_s)
 
-          if is_haml? && haml_buffer.options[:preserve].include?(name.to_s)
-            content = Haml::Helpers.preserve content
+          if block_given? && block_is_haml?(block) && preserve
+            return content_tag_without_haml(name, *args) {preserve(&block)}
           end
 
-          content
+          returning content_tag_without_haml(name, *args, &block) do |content|
+            return Haml::Helpers.preserve(content) if preserve && content
+          end
         end
+
         alias_method :content_tag_without_haml, :content_tag
         alias_method :content_tag, :content_tag_with_haml
       end

data/lib/haml/html.rb

@@ -148,7 +148,6 @@ module Haml
           output += haml_attributes if attributes.length > 0
         end
 
-        output += "/" if children.length == 0
         output += "\n"
 
         self.children.each do |child|

data/lib/haml/precompiler.rb

@@ -93,6 +93,7 @@ module Haml
 extend Haml::Helpers
 _hamlout = @haml_buffer = Haml::Buffer.new(@haml_buffer, #{options_for_buffer.inspect})
 _erbout = _hamlout.buffer
+__in_erb_template = true
 END
       postamble = <<END.gsub("\n", ";")
 @haml_buffer = @haml_buffer.upper
@@ -105,7 +106,10 @@ END
       names = names.keys if Hash == names
 
       names.map do |name|
-        "#{name} = _haml_locals[#{name.to_sym.inspect}] || _haml_locals[#{name.to_s.inspect}]"
+        # Can't use || because someone might explicitly pass in false with a symbol
+        sym_local = "_haml_locals[#{name.to_sym.inspect}]" 
+        str_local = "_haml_locals[#{name.to_s.inspect}]" 
+        "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local}"
       end.join(';') + ';'
     end
 

data/lib/sass.rb

@@ -51,7 +51,7 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 # Then, whenever necessary, they're compiled into corresponding CSS files in public/stylesheets.
 # For instance, public/stylesheets/sass/main.sass would be compiled to public/stylesheets/main.css.
 #
-# To run Sass from the commandline, just use
+# To run Sass from the command line, just use
 #
 #   sass input.sass output.css
 #

data/lib/sass/css.rb

@@ -237,7 +237,7 @@ module Sass
       root.children.map! do |child|
         next child unless Tree::RuleNode === child && child.rule.include?(',')
         child.rule.split(',').map do |rule|
-          node = Tree::RuleNode.new(rule.strip, nil)
+          node = Tree::RuleNode.new(rule.strip, {})
           node.children = child.children
           node
         end

data/test/haml/engine_test.rb

@@ -275,23 +275,23 @@ HAML
   end
 
   def test_escaped_inline_string_interpolation
-    assert_equal("<p>4&amp;3</p>\n", render("%p&== #{2+2}&#{2+1}", :escape_html => true))
-    assert_equal("<p>4&amp;3</p>\n", render("%p&== #{2+2}&#{2+1}", :escape_html => false))
+    assert_equal("<p>4&amp;3</p>\n", render("%p&== \#{2+2}&\#{2+1}", :escape_html => true))
+    assert_equal("<p>4&amp;3</p>\n", render("%p&== \#{2+2}&\#{2+1}", :escape_html => false))
   end
 
   def test_unescaped_inline_string_interpolation
-    assert_equal("<p>4&3</p>\n", render("%p!== #{2+2}&#{2+1}", :escape_html => true))
-    assert_equal("<p>4&3</p>\n", render("%p!== #{2+2}&#{2+1}", :escape_html => false))
+    assert_equal("<p>4&3</p>\n", render("%p!== \#{2+2}&\#{2+1}", :escape_html => true))
+    assert_equal("<p>4&3</p>\n", render("%p!== \#{2+2}&\#{2+1}", :escape_html => false))
   end
 
   def test_escaped_string_interpolation
-    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  &== #{2+2}&#{2+1}", :escape_html => true))
-    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  &== #{2+2}&#{2+1}", :escape_html => false))
+    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  &== \#{2+2}&\#{2+1}", :escape_html => true))
+    assert_equal("<p>\n  4&amp;3\n</p>\n", render("%p\n  &== \#{2+2}&\#{2+1}", :escape_html => false))
   end
 
   def test_unescaped_string_interpolation
-    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  !== #{2+2}&#{2+1}", :escape_html => true))
-    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  !== #{2+2}&#{2+1}", :escape_html => false))
+    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  !== \#{2+2}&\#{2+1}", :escape_html => true))
+    assert_equal("<p>\n  4&3\n</p>\n", render("%p\n  !== \#{2+2}&\#{2+1}", :escape_html => false))
   end
 
   def test_scripts_should_respect_escape_html_option

data/test/haml/helper_test.rb

@@ -95,7 +95,19 @@ class HelperTest < Test::Unit::TestCase
   def test_capture_haml
     assert_equal("\"<p>13</p>\\n\"\n", render("- foo = capture_haml(13) do |a|\n  %p= a\n= foo.dump"))
   end
-  
+
+  def test_content_tag_block
+    assert_equal(<<HTML.strip, render(<<HAML, :action_view))
+<div><p>bar</p>
+<strong>bar</strong>
+</div>
+HTML
+- content_tag :div do
+  %p bar
+  %strong bar
+HAML
+  end
+
   def test_haml_tag_attribute_html_escaping
     assert_equal("<p id='foo&amp;bar'>baz</p>\n", render("%p{:id => 'foo&bar'} baz", :escape_html => true))
   end

data/test/haml/template_test.rb

@@ -4,6 +4,8 @@ require 'haml/template'
 require 'sass/plugin'
 require File.dirname(__FILE__) + '/mocks/article'
 
+require 'action_pack/version'
+
 module Haml::Filters::Test
   include Haml::Filters::Base
 
@@ -28,8 +30,10 @@ class TemplateTest < Test::Unit::TestCase
   TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
   TEMPLATES = %w{         very_basic        standard    helpers
     whitespace_handling   original_engine   list        helpful
-    silent_script         tag_parsing       just_stuff  partials  partial_layout
+    silent_script         tag_parsing       just_stuff  partials
     filters               nuke_outer_whitespace         nuke_inner_whitespace }
+  # partial layouts were introduced in 2.0.0
+  TEMPLATES << 'partial_layout' unless ActionPack::VERSION::MAJOR < 2
 
   def setup
     vars = { 'article' => Article.new, 'foo' => 'value one' }
@@ -70,7 +74,7 @@ class TemplateTest < Test::Unit::TestCase
   end
 
   def assert_renders_correctly(name, &render_method)
-    render_method ||= proc { |name| @base.render(name) }
+    render_method ||= proc { |name| @base.render(:file => name) }
 
     load_result(name).split("\n").zip(render_method[name].split("\n")).each_with_index do |pair, line|
       message = "template: #{name}\nline:     #{line}"

data/test/haml/templates/helpers.haml

@@ -35,20 +35,43 @@ click
 %p boom
 - concat "foo\n"
 - haml_buffer.tabulation = 0
-- def url_for(*stuff); stuff.join(' '); end
--# The form URLs must be empty
--# because of a weird bug that causes url_for to misbehave.
-%p
-  = form_tag ''
-- form_tag '' do
-  %div= submit_tag 'save'
-  - @foo = 'value one'
-  = test_partial 'partial'
-- form_for :article, @article, :url => '' do |f|
-  Title:
-  = f.text_field :title
-  Body:
-  = f.text_field :body
+-#
+-# ActionPack pre-2.0 has weird url_for issues here.
+- if ActionPack::VERSION::MAJOR < 2
+  :plain
+    <p>
+      <form action="" method="post">
+    </p>
+    <form action="" method="post">
+      <div><input name="commit" type="submit" value="save" /></div>
+      <p>
+        @foo =
+        value one
+      </p>
+      Toplevel? false
+      <p>
+        @foo =
+        value three
+      </p>
+    </form>
+    <form action="" method="post">
+      Title:
+      <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
+      Body:
+      <input id="article_body" name="article[body]" size="30" type="text" value="World" />
+    </form>
+- else
+  %p
+    = form_tag ''
+  - form_tag '' do
+    %div= submit_tag 'save'
+    - @foo = 'value one'
+    = test_partial 'partial'
+  - form_for :article, @article, :url => '' do |f|
+    Title:
+    = f.text_field :title
+    Body:
+    = f.text_field :body
 = list_of({:google => 'http://www.google.com'}) do |name, link|
   %a{ :href => link }= name
 %p

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-30 00:00:00 -07:00
+date: 2008-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: []