RubyGems - haml - Versions diffs - 2.0.3 → 2.0.4 - Mend

haml 2.0.3 → 2.0.4

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (30) hide show

data/README.rdoc +1 -1
data/VERSION +1 -1
data/init.rb +1 -0
data/lib/haml.rb +24 -19
data/lib/haml/buffer.rb +8 -5
data/lib/haml/engine.rb +1 -1
data/lib/haml/exec.rb +1 -5
data/lib/haml/filters.rb +3 -2
data/lib/haml/helpers.rb +53 -32
data/lib/haml/helpers/action_view_mods.rb +12 -4
data/lib/haml/html.rb +48 -9
data/lib/haml/precompiler.rb +11 -4
data/lib/sass.rb +3 -3
data/lib/sass/css.rb +1 -1
data/lib/sass/engine.rb +11 -11
data/test/benchmark.rb +14 -2
data/test/haml/engine_test.rb +48 -4
data/test/haml/helper_test.rb +2 -2
data/test/haml/html2haml_test.rb +35 -0
data/test/haml/results/partial_layout.xhtml +5 -0
data/test/haml/template_test.rb +19 -2
data/test/haml/templates/_layout_for_partial.haml +3 -0
data/test/haml/templates/eval_suppressed.haml +1 -1
data/test/haml/templates/helpers.haml +6 -6
data/test/haml/templates/partial_layout.haml +3 -0
data/test/linked_rails.rb +12 -0
data/test/sass/engine_test.rb +10 -0
data/test/sass/plugin_test.rb +0 -4
data/test/test_helper.rb +7 -12
metadata +7 -3

data/README.rdoc CHANGED

@@ -12,7 +12,7 @@ and providing elegant, easily understandable, and powerful syntax.
 == Using
 There are several ways to use Haml and Sass.
-They can be used as a plugins for Rails or Merb,
+They can be used as a plugin for Rails or Merb,
 or embedded on their own in other applications.
 The first step of all of these is to install the Haml gem:

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 2.0.3
1	+ 2.0.4

data/init.rb CHANGED

@@ -4,4 +4,5 @@ rescue LoadError
   require 'haml' # From gem
 end
+# Load Haml and Sass
 Haml.init_rails(binding)

data/lib/haml.rb CHANGED

@@ -1,5 +1,5 @@
 dir = File.dirname(__FILE__)
-$LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 # = Haml (XHTML Abstraction Markup Language)
 #
@@ -138,7 +138,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # is compiled to:
 #
-#   <head name="doc_head">
+#   <head name='doc_head'>
 #     <script src='javascripts/script_9' type='text/javascript'>
 #     </script>
 #   </head>
@@ -159,7 +159,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # This is compiled to:
 #
-#   <html lang='fr-fr' xml:lang='fr=fr' xmlns='http://www.w3.org/1999/xhtml'>
+#   <html lang='fr-fr' xml:lang='fr-fr' xmlns='http://www.w3.org/1999/xhtml'>
 #   </html>
 #
 # You can use as many such attribute methods as you want
@@ -184,6 +184,9 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 #   <sandwich bread='whole wheat' delicious='true' filling='peanut butter and jelly' />
 #
+# Note that the Haml attributes list has the same syntax as a Ruby method call.
+# This means that any attribute methods must come before the hash literal.
+#
 # ===== Boolean Attributes
 #
 # Some attributes, such as "checked" for <tt>input</tt> tags or "selected" for <tt>option</tt> tags,
@@ -200,7 +203,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 # In XHTML, the only valid value for these attributes is the name of the attribute.
 # Thus this will render in XHTML as
 #
-#   <input selected="selected">
+#   <input selected='selected'>
 #
 # To set these attributes to false, simply assign them to a Ruby false value.
 # In both XHTML and HTML
@@ -238,8 +241,8 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # is compiled to:
 #
-#   <div class="greeting_crazy_user" id="greeting_crazy_user_15">
-#     <bar class="fixnum" id="fixnum_581" />
+#   <div class='greeting_crazy_user' id='greeting_crazy_user_15'>
+#     <bar class='fixnum' id='fixnum_581' />
 #     Hello!
 #   </div>
 #
@@ -306,11 +309,11 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # is compiled to:
 #
-#   <div id="content">
-#     <div class="articles">
-#       <div class="article title">Doogie Howser Comes Out</div>
-#       <div class="article date">2006-11-05</div>
-#       <div class="article entry">
+#   <div id='content'>
+#     <div class='articles'>
+#       <div class='article title'>Doogie Howser Comes Out</div>
+#       <div class='article date'>2006-11-05</div>
+#       <div class='article entry'>
 #         Neil Patrick Harris would like to dispel any rumors that he is straight
 #       </div>
 #     </div>
@@ -474,7 +477,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # is compiled to:
 #
-#   <?xml version="1.0" encoding="utf-8" ?>
+#   <?xml version='1.0' encoding='utf-8' ?>
 #   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 #   <html>
 #     <head>
@@ -514,7 +517,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # is compiled to:
 #
-#   <?xml version="1.0" encoding="iso-8859-1" ?>
+#   <?xml version='1.0' encoding='iso-8859-1' ?>
 #
 # ==== /
 #
@@ -566,7 +569,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #     </a>
 #   <![endif]-->
 #
-# ==== \
+# ==== \
 #
 # The backslash character escapes the first character of a line,
 # allowing use of otherwise interpreted characters as plain text.
@@ -915,9 +918,9 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 #   Haml::Template.options[:format] = :html5
 #
-# ...or by setting the <tt>Merb::Config[:haml]</tt> hash in <tt>init.rb</tt> in Merb...
+# ...or by setting the <tt>Merb::Plugin.config[:haml]</tt> hash in <tt>init.rb</tt> in Merb...
 #
-#   Merb::Config[:haml][:format] = :html5
+#   Merb::Plugin.config[:haml][:format] = :html5
 #
 # ...or by passing an options hash to Haml::Engine.new.
 # Available options are:
@@ -993,7 +996,7 @@ module Haml
     if File.exists?(scope('REVISION'))
       rev = File.read(scope('REVISION')).strip
-      rev = nil if rev !~ /[a-f0-9]+/
+      rev = nil if rev !~ /^([a-f0-9]+|\(.*\))$/
     end
     if rev.nil? && File.exists?(scope('.git/HEAD'))
@@ -1005,8 +1008,10 @@ module Haml
     if rev
       @@version[:rev] = rev
-      @@version[:string] << "."
-      @@version[:string] << rev[0...7] unless rev[0] == ?(
+      unless rev[0] == ?(
+        @@version[:string] << "."
+        @@version[:string] << rev[0...7]
+      end
     end
     @@version

data/lib/haml/buffer.rb CHANGED

@@ -151,16 +151,19 @@ module Haml
       tabulation = @real_tabs
       attributes = class_id
-      attributes_hashes.each do |attributes_hash|
-        attributes_hash.keys.each { |key| attributes_hash[key.to_s] = attributes_hash.delete(key) }
-        self.class.merge_attrs(attributes, attributes_hash)
+      attributes_hashes.each do |old|
+        self.class.merge_attrs(attributes, old.inject({}) {|h, (key, val)| h[key.to_s] = val; h})
       end
       self.class.merge_attrs(attributes, parse_object_ref(obj_ref)) if obj_ref
-      if self_closing
+      if self_closing && xhtml?
         str = " />" + (nuke_outer_whitespace ? "" : "\n")
       else
-        str = ">" + (try_one_line || preserve_tag || nuke_inner_whitespace ? "" : "\n")
+        str = ">" + ((if self_closing && html?
+                        nuke_outer_whitespace
+                      else
+                        try_one_line || preserve_tag || nuke_inner_whitespace
+                      end) ? "" : "\n")
       end
       attributes = Precompiler.build_attributes(html?, @options[:attr_wrapper], attributes)

data/lib/haml/engine.rb CHANGED

@@ -92,7 +92,7 @@ module Haml
       if @options[:filters]
         warn <<END
 DEPRECATION WARNING:
-The Haml :filters option is deprecated and will be removed in version 2.1.
+The Haml :filters option is deprecated and will be removed in version 2.2.
 Filters are now automatically registered.
 END
       end

data/lib/haml/exec.rb CHANGED

@@ -24,13 +24,9 @@ module Haml
           @options
         rescue Exception => e
-          raise e if e.is_a? SystemExit
+          raise e if @options[:trace] || e.is_a?(SystemExit)
-          $stderr.print "#{e.class} on line #{get_line e}: " if @options[:trace]
           $stderr.puts e.message
-          e.backtrace[1..-1].each { |t| $stderr.puts "  #{t}" } if @options[:trace]
           exit 1
         end
         exit 0

data/lib/haml/filters.rb CHANGED

@@ -212,10 +212,10 @@ END
     module Sass
       include Base
-      lazy_require 'sass/engine'
+      lazy_require 'sass/plugin'
       def render(text)
-        ::Sass::Engine.new(text,::Sass::Plugin.engine_options).render
+        ::Sass::Engine.new(text, ::Sass::Plugin.engine_options).render
       end
     end
@@ -239,6 +239,7 @@ END
       end
     end
     RedCloth = Textile
+    Filters.defined['redcloth'] = RedCloth
     # Uses BlueCloth or RedCloth to provide only Markdown (not Textile) parsing
     module Markdown

data/lib/haml/helpers.rb CHANGED

@@ -254,11 +254,39 @@ module Haml
     # the local variable <tt>foo</tt> would be assigned to "<p>13</p>\n".
     #
     def capture_haml(*args, &block)
-      capture_haml_with_buffer(haml_buffer.buffer, *args, &block)
+      buffer = eval('_hamlout', block) rescue haml_buffer
+      with_haml_buffer(buffer) do
+        position = haml_buffer.buffer.length
+        block.call(*args)
+        captured = haml_buffer.buffer.slice!(position..-1)
+        min_tabs = nil
+        captured.each do |line|
+          tabs = line.index(/[^ ]/)
+          min_tabs ||= tabs
+          min_tabs = min_tabs > tabs ? tabs : min_tabs
+        end
+        result = captured.map do |line|
+          line[min_tabs..-1]
+        end
+        result.to_s
+      end
+    end
+    def puts(*args) # :nodoc:
+      warn <<END
+DEPRECATION WARNING:
+The Haml #puts helper is deprecated and will be removed in version 2.4.
+Use the #haml_concat helper instead.
+END
+      haml_concat *args
     end
     # Outputs text directly to the Haml buffer, with the proper tabulation
-    def puts(text = "")
+    def haml_concat(text = "")
       haml_buffer.buffer << ('  ' * haml_buffer.tabulation) << text.to_s << "\n"
       nil
     end
@@ -271,7 +299,7 @@ module Haml
     # Creates an HTML tag with the given name and optionally text and attributes.
     # Can take a block that will be executed
     # between when the opening and closing tags are output.
-    # If the block is a Haml block or outputs text using puts,
+    # If the block is a Haml block or outputs text using haml_concat,
     # the text will be properly indented.
     #
     # <tt>flags</tt> is a list of symbol flags
@@ -285,10 +313,10 @@ module Haml
     #     haml_tag :tr do
     #       haml_tag :td, {:class => 'cell'} do
     #         haml_tag :strong, "strong!"
-    #         puts "data"
+    #         haml_concat "data"
     #       end
     #       haml_tag :td do
-    #         puts "more_data"
+    #         haml_concat "more_data"
     #       end
     #     end
     #   end
@@ -319,7 +347,7 @@ module Haml
                                                       rest.shift || {})
       if text.nil? && block.nil? && (haml_buffer.options[:autoclose].include?(name) || flags.include?(:/))
-        puts "<#{name}#{attributes} />"
+        haml_concat "<#{name}#{attributes} />"
         return nil
       end
@@ -331,7 +359,7 @@ module Haml
       tag = "<#{name}#{attributes}>"
       if block.nil?
         tag << text.to_s << "</#{name}>"
-        puts tag
+        haml_concat tag
         return
       end
@@ -341,15 +369,15 @@ module Haml
       if flags.include?(:<)
         tag << capture_haml(&block).strip << "</#{name}>"
-        puts tag
+        haml_concat tag
         return
       end
-      puts tag
+      haml_concat tag
       tab_up
       block.call
       tab_down
-      puts "</#{name}>"
+      haml_concat "</#{name}>"
       nil
     end
@@ -379,6 +407,21 @@ module Haml
     private
+    # call-seq:
+    #   with_haml_buffer(buffer) {...}
+    #
+    # Runs the block with the given buffer as the currently active buffer.
+    def with_haml_buffer(buffer)
+      @haml_buffer, old_buffer = buffer, @haml_buffer
+      old_buffer.active, was_active = false, old_buffer.active? if old_buffer
+      @haml_buffer.active = true
+      yield
+    ensure
+      @haml_buffer.active = false
+      old_buffer.active = was_active if old_buffer
+      @haml_buffer = old_buffer
+    end
     # Gets a reference to the current Haml::Buffer object.
     def haml_buffer
       @haml_buffer
@@ -392,28 +435,6 @@ module Haml
       proc { |*args| proc.call(*args) }
     end
-    # Performs the function of capture_haml, assuming <tt>local_buffer</tt>
-    # is where the output of block goes.
-    def capture_haml_with_buffer(local_buffer, *args, &block)
-      position = local_buffer.length
-      block.call(*args)
-      captured = local_buffer.slice!(position..-1)
-      min_tabs = nil
-      captured.each do |line|
-        tabs = line.index(/[^ ]/)
-        min_tabs ||= tabs
-        min_tabs = min_tabs > tabs ? tabs : min_tabs
-      end
-      result = captured.map do |line|
-        line[min_tabs..-1]
-      end
-      result.to_s
-    end
     include ActionViewExtensions if self.const_defined? "ActionViewExtensions"
   end
 end

data/lib/haml/helpers/action_view_mods.rb CHANGED

@@ -2,7 +2,15 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
   module ActionView
     class Base # :nodoc:
       def render_with_haml(*args, &block)
-        return non_haml { render_without_haml(*args, &block) } if is_haml?
+        options = args.first
+        # If render :layout is used with a block,
+        # it concats rather than returning a string
+        # so we need it to keep thinking it's Haml
+        # until it hits the sub-render
+        if is_haml? && !(options.is_a?(Hash) && options[:layout] && block_given?)
+          return non_haml { render_without_haml(*args, &block) }
+        end
         render_without_haml(*args, &block)
       end
       alias_method :render_without_haml, :render
@@ -60,11 +68,11 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
           alias_method :capture_without_haml, :capture
           alias_method :capture, :capture_with_haml
-          def capture_erb_with_buffer_with_haml(*args, &block)
+          def capture_erb_with_buffer_with_haml(buffer, *args, &block)
             if is_haml?
-              capture_haml_with_buffer(*args, &block)
+              capture_haml(*args, &block)
             else
-              capture_erb_with_buffer_without_haml(*args, &block)
+              capture_erb_with_buffer_without_haml(buffer, *args, &block)
             end
           end
           alias_method :capture_erb_with_buffer_without_haml, :capture_erb_with_buffer

data/lib/haml/html.rb CHANGED

@@ -25,7 +25,7 @@ module Haml
         if @@options[:rhtml]
           match_to_html(template, /<%=(.*?)-?%>/m, 'loud')
-          match_to_html(template, /<%(.*?)-?%>/m,  'silent')
+          match_to_html(template, /<%-?(.*?)-?%>/m,  'silent')
         end
         method = @@options[:xhtml] ? Hpricot.method(:XML) : method(:Hpricot)
@@ -131,17 +131,20 @@ module Haml
       def to_haml(tabs = 0)
         output = "#{tabulate(tabs)}"
         if HTML.options[:rhtml] && name[0...5] == 'haml:'
-          return output + HTML.send("haml_tag_#{name[5..-1]}",
-                                    CGI.unescapeHTML(self.innerHTML))
+          return output + HTML.send("haml_tag_#{name[5..-1]}", CGI.unescapeHTML(self.inner_text))
         end
-        output += "%#{name}" unless name == 'div' && (attributes.include?('id') || attributes.include?('class'))
+        output += "%#{name}" unless name == 'div' && (static_id? || static_classname?)
         if attributes
-          output += "##{attributes['id']}" if attributes['id']
-          attributes['class'].split(' ').each { |c| output += ".#{c}" } if attributes['class']
-          remove_attribute('id')
-          remove_attribute('class')
+          if static_id?
+            output += "##{attributes['id']}"
+            remove_attribute('id')
+          end
+          if static_classname?
+            attributes['class'].split(' ').each { |c| output += ".#{c}" }
+            remove_attribute('class')
+          end
           output += haml_attributes if attributes.length > 0
         end
@@ -156,13 +159,49 @@ module Haml
       end
       private
+      def dynamic_attributes
+        @dynamic_attributes ||= begin
+          attributes.inject({}) do |dynamic, pair|
+            name, value = pair
+            unless value.empty?
+              full_match = nil
+              ruby_value = value.gsub(%r{<haml:loud>\s*(.+?)\s*</haml:loud>}) do
+                full_match = $`.empty? && $'.empty?
+                full_match ? $1: "\#{#{$1}}"
+              end
+              unless ruby_value == value
+                dynamic[name] = full_match ? ruby_value : %("#{ruby_value}")
+              end
+            end
+            dynamic
+          end
+        end
+      end
+      def static_attribute?(name)
+        attributes[name] and !dynamic_attribute?(name)
+      end
+      def dynamic_attribute?(name)
+        HTML.options[:rhtml] and dynamic_attributes.key?(name)
+      end
+      def static_id?
+        static_attribute? 'id'
+      end
+      def static_classname?
+        static_attribute? 'class'
+      end
       # Returns a string representation of an attributes hash
       # that's prettier than that produced by Hash#inspect
       def haml_attributes
         attrs = attributes.map do |name, value|
+          value = dynamic_attribute?(name) ? dynamic_attributes[name] : value.inspect
           name = name.index(/\W/) ? name.inspect : ":#{name}"
-          "#{name} => #{value.inspect}"
+          "#{name} => #{value}"
         end
         "{ #{attrs.join(', ')} }"
       end

data/lib/haml/precompiler.rb CHANGED

@@ -209,9 +209,11 @@ END
         push_silent(text[1..-1], true)
         newline_now
-        if (@block_opened && !mid_block_keyword?(text)) || text[1..-1].split(' ', 2)[0] == "case"
-          push_and_tabulate([:script])
-        end
+        case_stmt = text[1..-1].split(' ', 2)[0] == "case"
+        block = @block_opened && !mid_block_keyword?(text)
+        push_and_tabulate([:script]) if block || case_stmt
+        push_and_tabulate(nil)       if block && case_stmt
       when FILTER; start_filtered(text[1..-1].downcase)
       when DOCTYPE
         return render_doctype(text) if text[0...3] == '!!!'
@@ -371,6 +373,7 @@ END
       when :loud; close_loud value
       when :filtered; close_filtered value
       when :haml_comment; close_haml_comment
+      when nil; close_nil
       end
     end
@@ -420,6 +423,10 @@ END
       @template_tabs -= 1
     end
+    def close_nil
+      @template_tabs -= 1
+    end
     # Iterates through the classes and ids supplied through <tt>.</tt>
     # and <tt>#</tt> syntax, and returns a hash with them as attributes,
     # that can then be merged with another attributes hash.
@@ -544,7 +551,7 @@ END
       preserve_tag &&= !options[:ugly]
       case action
-      when '/'; self_closing = xhtml?
+      when '/'; self_closing = true
       when '~'; parse = preserve_script = true
       when '='
         parse = true

data/lib/sass.rb CHANGED

@@ -1,5 +1,5 @@
 dir = File.dirname(__FILE__)
-$LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 # = Sass (Syntactically Awesome StyleSheets)
 #
@@ -788,9 +788,9 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 #   Sass::Plugin.options[:style] = :compact
 #
-# ...or by setting the <tt>Merb::Config[:sass]</tt> hash in <tt>init.rb</tt> in Merb...
+# ...or by setting the <tt>Merb::Plugin.config[:sass]</tt> hash in <tt>init.rb</tt> in Merb...
 #
-#   Merb::Config[:sass][:style] = :compact
+#   Merb::Plugin.config[:sass][:style] = :compact
 #
 # ...or by passing an options hash to Sass::Engine.new.
 # Available options are:

data/lib/sass/css.rb CHANGED

@@ -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, nil)
+          node = Tree::RuleNode.new(rule.strip, nil)
           node.children = child.children
           node
         end

data/lib/sass/engine.rb CHANGED

@@ -278,7 +278,13 @@ END
     def parse_line(line)
       case line[0]
       when ATTRIBUTE_CHAR
-        parse_attribute(line, ATTRIBUTE)
+        if line[1] != ATTRIBUTE_CHAR
+          parse_attribute(line, ATTRIBUTE)
+        else
+          # Support CSS3-style pseudo-elements,
+          # which begin with ::
+          Tree::RuleNode.new(line, @options[:style])
+        end
       when Constant::CONSTANT_CHAR
         parse_constant(line)
       when COMMENT_CHAR
@@ -365,7 +371,7 @@ END
     end
     def parse_mixin_definition(line)
-      mixin_name = line[1..-1]
+      mixin_name = line[1..-1].strip
       @mixins[mixin_name] =  []
       index = @line
       line, tabs = @lines[index]
@@ -440,15 +446,9 @@ END
       new_filename = find_full_path("#{filename}.sass", load_paths)
-      if new_filename.nil?
-        if was_sass
-          raise Exception.new("File to import not found or unreadable: #{original_filename}.")
-        else
-          return filename + '.css'
-        end
-      else
-        new_filename
-      end
+      return new_filename if new_filename
+      return filename + '.css' unless was_sass
+      raise SyntaxError.new("File to import not found or unreadable: #{original_filename}.", @line)
     end
     def self.find_full_path(filename, load_paths)

data/test/benchmark.rb CHANGED

@@ -12,6 +12,7 @@ END
 end
 require File.dirname(__FILE__) + '/../lib/haml'
+require File.dirname(__FILE__) + '/linked_rails'
 %w[sass rubygems erb erubis markaby active_support action_controller
    action_view haml/template].each(&method(:require))
@@ -23,6 +24,17 @@ rescue LoadError
   raise "The Haml benchmarks require the benchwarmer gem, available from http://github.com/wycats/benchwarmer"
 end
+def view
+  unless ActionView::Base.instance_methods.include? 'finder'
+    return ActionView::Base.new(File.dirname(__FILE__), vars)
+  end
+  # Rails >=2.1.0
+  base = ActionView::Base.new
+  base.finder.append_view_path(File.dirname(__FILE__))
+  base
+end
 Benchmark.warmer(times) do
   columns :haml, :erb, :erubis, :mab
   titles :haml => "Haml", :erb => "ERB", :erubis => "Erubis", :mab => "Markaby"
@@ -53,7 +65,7 @@ Benchmark.warmer(times) do
   end
   report "ActionView" do
-    @base = ActionView::Base.new(File.dirname(__FILE__))
+    @base = view
     # To cache the template
     @base.render 'haml/templates/standard'
@@ -64,7 +76,7 @@ Benchmark.warmer(times) do
   end
   report "ActionView with deep partials" do
-    @base = ActionView::Base.new(File.dirname(__FILE__))
+    @base = view
     # To cache the template
     @base.render 'haml/templates/action_view'

data/test/haml/engine_test.rb CHANGED

@@ -135,6 +135,20 @@ END
     assert_equal("<img alt='' src='/foo.png' />\n", render("%img{:width => nil, :src => '/foo.png', :alt => String.new}"))
   end
+  def test_attr_hashes_not_modified
+    hash = {:color => 'red'}
+    assert_equal(<<HTML, render(<<HAML, :locals => {:hash => hash}))
+<div color='red'></div>
+<div class='special' color='red'></div>
+<div color='red'></div>
+HTML
+%div{hash}
+.special{hash}
+%div{hash}
+HAML
+    assert_equal(hash, {:color => 'red'})
+  end
   def test_end_of_file_multiline
     assert_equal("<p>0</p>\n<p>1</p>\n<p>2</p>\n", render("- for i in (0...3)\n  %p= |\n   i |"))
   end
@@ -184,6 +198,33 @@ RESULT
 SOURCE
   end
+  # Mostly a regression test
+  def test_both_case_indentation_work_with_deeply_nested_code
+    result = <<RESULT
+<h2>
+  other
+</h2>
+RESULT
+    assert_equal(result, render(<<HAML))
+- case 'other'
+- when 'test'
+  %h2
+    hi
+- when 'other'
+  %h2
+    other
+HAML
+    assert_equal(result, render(<<HAML))
+- case 'other'
+  - when 'test'
+    %h2
+      hi
+  - when 'other'
+    %h2
+      other
+HAML
+  end
   # HTML escaping tests
   def test_ampersand_equals_should_escape
@@ -287,11 +328,11 @@ SOURCE
   def test_stop_eval
     assert_equal("", render("= 'Hello'", :suppress_eval => true))
-    assert_equal("", render("- puts 'foo'", :suppress_eval => true))
+    assert_equal("", render("- haml_concat 'foo'", :suppress_eval => true))
     assert_equal("<div id='foo' yes='no' />\n", render("#foo{:yes => 'no'}/", :suppress_eval => true))
     assert_equal("<div id='foo' />\n", render("#foo{:yes => 'no', :call => a_function() }/", :suppress_eval => true))
     assert_equal("<div />\n", render("%div[1]/", :suppress_eval => true))
-    assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))
+    assert_equal("", render(":ruby\n  Kernel.puts 'hello'", :suppress_eval => true))
   end
   def test_attr_wrapper
@@ -540,8 +581,11 @@ END
     assert_equal "<div class='foo'></div>\n", render(".foo", :format => :html4)
   end
-  def test_html_ignores_explicit_self_closing_declaration
-    assert_equal "<a></a>\n", render("%a/", :format => :html4)
+  def test_html_doesnt_add_slash_to_self_closing_tags
+    assert_equal "<a>\n", render("%a/", :format => :html4)
+    assert_equal "<a foo='2'>\n", render("%a{:foo => 1 + 1}/", :format => :html4)
+    assert_equal "<meta>\n", render("%meta", :format => :html4)
+    assert_equal "<meta foo='2'>\n", render("%meta{:foo => 1 + 1}", :format => :html4)
   end
   def test_html_ignores_xml_prolog_declaration

data/test/haml/helper_test.rb CHANGED

@@ -148,7 +148,7 @@ class HelperTest < Test::Unit::TestCase
     Haml::Helpers.module_eval do
       def trc(collection, &block)
         collection.each do |record|
-          puts capture_haml(record, &block)
+          haml_concat capture_haml(record, &block)
         end
       end
     end
@@ -175,7 +175,7 @@ class HelperTest < Test::Unit::TestCase
     result = context.capture_haml do
       context.haml_tag :p, :attr => "val" do
-        context.puts "Blah"
+        context.haml_concat "Blah"
       end
     end

data/test/haml/html2haml_test.rb CHANGED

@@ -40,6 +40,41 @@ class Html2HamlTest < Test::Unit::TestCase
     assert_equal '= h @item.title', render_rhtml('<%=h @item.title %>')
     assert_equal '= h @item.title', render_rhtml('<%=h @item.title -%>')
   end
+  def test_rhtml_with_html_special_chars
+    assert_equal '= 3 < 5 ? "OK" : "Your computer is b0rken"',
+      render_rhtml(%Q{<%= 3 < 5 ? "OK" : "Your computer is b0rken" %>})
+  end
+  def test_rhtml_in_class_attribute
+    assert_equal "%div{ :class => dyna_class }\n  I have a dynamic attribute",
+      render_rhtml(%Q{<div class="<%= dyna_class %>">I have a dynamic attribute</div>})
+  end
+  def test_rhtml_in_id_attribute
+    assert_equal "%div{ :id => dyna_id }\n  I have a dynamic attribute",
+      render_rhtml(%Q{<div id="<%= dyna_id %>">I have a dynamic attribute</div>})
+  end
+  def test_rhtml_in_attribute_results_in_string_interpolation
+    assert_equal %(%div{ :id => "item_\#{i}" }\n  Ruby string interpolation FTW),
+      render_rhtml(%Q{<div id="item_<%= i %>">Ruby string interpolation FTW</div>})
+  end
+  def test_rhtml_in_attribute_with_trailing_content
+    assert_equal %(%div{ :class => "\#{12}!" }\n  Bang!),
+      render_rhtml(%Q{<div class="<%= 12 %>!">Bang!</div>})
+  end
+  def test_rhtml_in_attribute_to_multiple_interpolations
+    assert_equal %(%div{ :class => "\#{12} + \#{13}" }\n  Math is super),
+      render_rhtml(%Q{<div class="<%= 12 %> + <%= 13 %>">Math is super</div>})
+  end
+  def test_whitespace_eating_erb_tags
+    assert_equal %(- form_for),
+      render_rhtml(%Q{<%- form_for -%>})
+  end
   protected

data/test/haml/results/partial_layout.xhtml ADDED

@@ -0,0 +1,5 @@
+<h1>Partial layout used with for block:</h1>
+<div class='partial-layout'>
+  <h2>This is inside a partial layout</h2>
+  <p>Some content within a layout</p>
+</div>

data/test/haml/template_test.rb CHANGED

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/template'
+require 'sass/plugin'
 require File.dirname(__FILE__) + '/mocks/article'
 module Haml::Filters::Test
@@ -17,11 +18,17 @@ module Haml::Helpers
   end
 end
+class DummyController
+  def self.controller_path
+    ''
+  end
+end
 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
+    silent_script         tag_parsing       just_stuff  partials  partial_layout
     filters               nuke_outer_whitespace         nuke_inner_whitespace }
   def setup
@@ -35,11 +42,21 @@ class TemplateTest < Test::Unit::TestCase
       @base.finder.append_view_path(TEMPLATE_PATH)
     end
-    @base.send(:evaluate_assigns)
+    if @base.private_methods.include?('evaluate_assigns')
+      @base.send(:evaluate_assigns)
+    else
+      # Rails 2.2
+      @base.send(:_evaluate_assigns_and_ivars)
+    end
     # This is used by form_for.
     # It's usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
+    # filters template uses :sass
+    Sass::Plugin.options.update(:line_comments => true, :style => :compact)
+    @base.controller = DummyController.new
   end
   def render(text)

data/test/haml/templates/_layout_for_partial.haml ADDED

@@ -0,0 +1,3 @@
+.partial-layout
+  %h2 This is inside a partial layout
+  = yield

data/test/haml/templates/eval_suppressed.haml CHANGED

@@ -1,6 +1,6 @@
 = "not me!"
 = "nor me!"
-- puts "not even me!"
+- haml_concat "not even me!"
 %p= "NO!"
 %p~ "UH-UH!"
 %h1 Me!

data/test/haml/templates/helpers.haml CHANGED

@@ -52,18 +52,18 @@ click
 = list_of({:google => 'http://www.google.com'}) do |name, link|
   %a{ :href => link }= name
 %p
-  - puts "foo"
+  - haml_concat "foo"
   %div
-    - puts "bar"
-  - puts "boom"
+    - haml_concat "bar"
+  - haml_concat "boom"
   baz
-  - puts "boom, again"
+  - haml_concat "boom, again"
 - haml_tag :table do
   - haml_tag :tr do
     - haml_tag :td, {:class => 'cell'} do
       - haml_tag :strong, "strong!"
-      - puts "data"
+      - haml_concat "data"
     - haml_tag :td do
-      - puts "more_data"
+      - haml_concat "more_data"
 - haml_tag :hr
 - haml_tag :div, ''

data/test/haml/templates/partial_layout.haml ADDED

@@ -0,0 +1,3 @@
+%h1 Partial layout used with for block:
+- render :layout => 'layout_for_partial.haml' do
+  %p Some content within a layout

data/test/linked_rails.rb ADDED

@@ -0,0 +1,12 @@
+# allows testing with edge Rails by creating a test/rails symlink
+linked_rails = File.dirname(__FILE__) + '/rails'
+if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
+  puts "[ using linked Rails ]"
+  $:.unshift linked_rails + '/activesupport/lib'
+  $:.unshift linked_rails + '/actionpack/lib'
+else
+  require 'rubygems'
+end
+require 'action_controller'
+require 'action_view'

data/test/sass/engine_test.rb CHANGED

@@ -174,6 +174,16 @@ END
     end
   end
+  def test_pseudo_elements
+    assert_equal(<<CSS, render(<<SASS))
+::first-line {
+  size: 10em; }
+CSS
+::first-line
+  size: 10em
+SASS
+  end
   def test_directive
     assert_equal("@a b;", render("@a b"))

data/test/sass/plugin_test.rb CHANGED

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-MERB_ENV = RAILS_ENV  = 'testing'
-RAILS_ROOT = '.'
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
 require 'fileutils'

data/test/test_helper.rb CHANGED

@@ -1,18 +1,13 @@
 lib_dir = File.dirname(__FILE__) + '/../lib'
-# allows testing with edge Rails by creating a test/rails symlink
-linked_rails = File.dirname(__FILE__) + '/rails'
-if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
-  puts "[ using linked Rails ]"
-  $:.unshift linked_rails + '/activesupport/lib'
-  $:.unshift linked_rails + '/actionpack/lib'
-else
-  require 'rubygems'
-end
-require 'action_controller'
-require 'action_view'
+require File.dirname(__FILE__) + '/linked_rails'
 require 'test/unit'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
+# required because of Sass::Plugin
+unless defined? RAILS_ROOT
+  RAILS_ROOT = '.'
+  MERB_ENV = RAILS_ENV  = 'testing'
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-09-07 00:00:00 -07:00
+date: 2008-10-30 00:00:00 -07:00
 default_executable:
 dependencies: []
@@ -134,6 +134,7 @@ files:
 - test/haml/templates/_partial.haml
 - test/haml/templates/nuke_outer_whitespace.haml
 - test/haml/templates/_av_partial_2.haml
+- test/haml/templates/partial_layout.haml
 - test/haml/templates/helpful.haml
 - test/haml/templates/just_stuff.haml
 - test/haml/templates/silent_script.haml
@@ -145,6 +146,7 @@ files:
 - 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/content_for_layout.haml
@@ -168,10 +170,12 @@ files:
 - test/haml/results/original_engine.xhtml
 - test/haml/results/helpers.xhtml
 - test/haml/results/list.xhtml
+- test/haml/results/partial_layout.xhtml
 - test/haml/results/tag_parsing.xhtml
 - test/haml/markaby
 - test/haml/markaby/standard.mab
 - test/haml/engine_test.rb
+- test/linked_rails.rb
 - test/rails
 - test/benchmark.rb
 - test/test_helper.rb
@@ -211,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: haml
-rubygems_version: 1.1.1
+rubygems_version: 1.3.0
 signing_key:
 specification_version: 2
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.