haml-edge 2.3.169 → 2.3.170

data/.yardopts

@@ -2,6 +2,7 @@
 --markup          markdown
 --markup-provider maruku
 --default-return  ""
+--title           "Haml/Sass Documentation"
 --hide-void-return
 --protected
 --no-private

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.169
+2.3.170

data/Rakefile

@@ -90,7 +90,7 @@ end
 task :release_elpa do
   require 'tlsmail'
   require 'time'
-  require 'haml'
+  require scope('lib/haml')
 
   version = Haml.version[:number]
 
@@ -257,6 +257,7 @@ begin
     files = FileList.new(scope('doc-src/*')).to_a.sort_by {|s| s.size} + %w[MIT-LICENSE VERSION]
     t.options << '--files' << files.join(',')
     t.options << '--template-path' << scope('yard')
+    t.options << '--title' << ENV["YARD_TITLE"] if ENV["YARD_TITLE"]
   end
   Rake::Task['yard'].prerequisites.insert(0, 'yard:sass')
   Rake::Task['yard'].instance_variable_set('@comment', nil)
@@ -367,12 +368,12 @@ namespace :test do
   task :rails_compatibility do
     `rm -rf test/rails`
     puts "Checking out rails. Please wait."
-    system("git clone ~/code/rails test/rails") rescue nil
+    system("git clone git://github.com/rails/rails.git test/rails") rescue nil
     begin
       rails_versions.each {|version| test_rails_version version}
 
       puts "Checking out rails_xss. Please wait."
-      system("git clone ~/code/rails_xss test/plugins/rails_xss")
+      system("git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss")
       test_rails_version(rails_versions.find {|s| s =~ /^v2\.3/})
     ensure
       `rm -rf test/rails`

data/VERSION

@@ -1 +1 @@
-2.3.169
+2.3.170

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.20
+;; Version: 2.2.21
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html

data/extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.20
+;; Version: 2.2.21
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "2.2.20"))
+;; Package-Requires: ((haml-mode "2.2.21"))
 
 ;;; Commentary:
 

data/lib/haml.rb

@@ -38,3 +38,4 @@ end
 
 require 'haml/util'
 require 'haml/engine'
+require 'haml/railtie'

data/lib/haml/buffer.rb

@@ -233,10 +233,11 @@ RUBY
 
     # Merges two attribute hashes.
     # This is the same as `to.merge!(from)`,
-    # except that it merges id and class attributes.
+    # except that it merges id, class, and data attributes.
     #
     # ids are concatenated with `"_"`,
     # and classes are concatenated with `" "`.
+    # data hashes are simply merged.
     #
     # Destructively modifies both `to` and `from`.
     #
@@ -244,12 +245,14 @@ RUBY
     # @param from [{String => #to_s}] The attribute hash to merge from
     # @return [{String => String}] `to`, after being merged
     def self.merge_attrs(to, from)
+      from['id'] = Precompiler.filter_and_join(from['id'], '_') if from['id']
       if to['id'] && from['id']
         to['id'] << '_' << from.delete('id').to_s
       elsif to['id'] || from['id']
         from['id'] ||= to['id']
       end
 
+      from['class'] = Precompiler.filter_and_join(from['class'], ' ') if from['class']
       if to['class'] && from['class']
         # Make sure we don't duplicate class names
         from['class'] = (from['class'].to_s.split(' ') | to['class'].split(' ')).sort.join(' ')
@@ -257,6 +260,16 @@ RUBY
         from['class'] ||= to['class']
       end
 
+      from_data = from['data'].is_a?(Hash)
+      to_data = to['data'].is_a?(Hash)
+      if from_data && to_data
+        to['data'] = to['data'].merge(from['data'])
+      elsif to_data
+        to = Haml::Util.map_keys(to.delete('data')) {|name| "data-#{name}"}.merge(to)
+      elsif from_data
+        from = Haml::Util.map_keys(from.delete('data')) {|name| "data-#{name}"}.merge(from)
+      end
+
       to.merge!(from)
     end
 

data/lib/haml/exec.rb

@@ -232,6 +232,10 @@ END
                 'Output style. Can be nested (default), compact, compressed, or expanded.') do |name|
           @options[:for_engine][:style] = name.to_sym
         end
+        opts.on('-g', '--debug-info',
+                'Emit extra information in the generated CSS that can be used by the FireSass Firebug plugin.') do
+          @options[:for_engine][:debug_info] = true
+        end
         opts.on('-l', '--line-numbers', '--line-comments',
                 'Emit comments in the generated CSS indicating the corresponding sass line.') do
           @options[:for_engine][:line_numbers] = true

data/lib/haml/filters.rb

@@ -100,8 +100,10 @@ module Haml
           if contains_interpolation?(text)
             return if options[:suppress_eval]
 
-            push_script <<RUBY, :escape_html => false
-find_and_preserve(#{filter.inspect}.render_with_options(#{unescape_interpolation(text)}, _hamlout.options))
+            text = unescape_interpolation(text).gsub("\\n", "\n")
+            newline if text.gsub!(/\n"\Z/, "\\n\"")
+            push_script <<RUBY.strip, :escape_html => false
+find_and_preserve(#{filter.inspect}.render_with_options(#{text}, _hamlout.options))
 RUBY
             return
           end
@@ -113,6 +115,10 @@ RUBY
           else
             push_text(rendered.rstrip)
           end
+
+          (text.count("\n") - 1).times {newline}
+          resolve_newlines
+          newline
         end
       end
 

data/lib/haml/helpers.rb

@@ -234,6 +234,33 @@ MESSAGE
       haml_buffer.tabulation -= i
     end
 
+    # Sets the number of tabs the buffer automatically adds
+    # to the lines of the template,
+    # but only for the duration of the block.
+    # For example:
+    #
+    #     %h1 foo
+    #     - with_tabs(2) do
+    #       %p bar
+    #     %strong baz
+    #
+    # Produces:
+    #
+    #     <h1>foo</h1>
+    #         <p>bar</p>
+    #     <strong>baz</strong>
+    #
+    #
+    # @param i [Fixnum] The number of tabs to use
+    # @yield A block in which the indentation will be `i` spaces
+    def with_tabs(i)
+      old_tabs = haml_buffer.tabulation
+      haml_buffer.tabulation = i
+      yield
+    ensure
+      haml_buffer.tabulation = old_tabs
+    end
+
     # Surrounds a block of Haml code with strings,
     # with no whitespace in between.
     # For example:

data/lib/haml/helpers/action_view_mods.rb

@@ -131,52 +131,91 @@ module ActionView
       end
     end
 
-    module FormTagHelper
-      def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
-        if is_haml?
-          if block_given?
+    if Haml::Util.ap_geq_3?
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
+          if is_haml?
+            if block_given?
+              oldproc = proc
+              proc = haml_bind_proc do |*args|
+                concat "\n"
+                with_tabs(1) {oldproc.call(*args)}
+              end
+            end
+            res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
+            res << "\n" if block_given?
+            res
+          else
+            form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
+          end
+        end
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
+      end
+
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
+          if block_given? && is_haml?
             oldproc = proc
             proc = haml_bind_proc do |*args|
-              concat "\n"
-              tab_up
-              oldproc.call(*args)
-              tab_down
-              concat haml_indent
+              with_tabs(1) {oldproc.call(*args)}
             end
-            concat haml_indent
-          end
-          res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
-          if block_given?
-            concat "\n"
-            return Haml::Helpers::ErrorReturn.new("form_tag")
           end
+          res = form_for_without_haml(object_name, *args, &proc)
+          res << "\n" if block_given? && is_haml?
           res
-        else
-          form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
         end
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
+      end
+    else
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
+          if is_haml?
+            if block_given?
+              oldproc = proc
+              proc = haml_bind_proc do |*args|
+                concat "\n"
+                tab_up
+                oldproc.call(*args)
+                tab_down
+                concat haml_indent
+              end
+              concat haml_indent
+            end
+            res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
+            if block_given?
+              concat "\n"
+              return Haml::Helpers::ErrorReturn.new("form_tag")
+            end
+            res
+          else
+            form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
+          end
+        end
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
       end
-      alias_method :form_tag_without_haml, :form_tag
-      alias_method :form_tag, :form_tag_with_haml
-    end
 
-    module FormHelper
-      def form_for_with_haml(object_name, *args, &proc)
-        if block_given? && is_haml?
-          oldproc = proc
-          proc = haml_bind_proc do |*args|
-            tab_up
-            oldproc.call(*args)
-            tab_down
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
+          if block_given? && is_haml?
+            oldproc = proc
+            proc = haml_bind_proc do |*args|
+              tab_up
+              oldproc.call(*args)
+              tab_down
+              concat haml_indent
+            end
             concat haml_indent
           end
-          concat haml_indent
+          form_for_without_haml(object_name, *args, &proc)
+          concat "\n" if block_given? && is_haml?
+          Haml::Helpers::ErrorReturn.new("form_for") if is_haml?
         end
-        form_for_without_haml(object_name, *args, &proc)
-        concat "\n" if block_given? && is_haml?
-        Haml::Helpers::ErrorReturn.new("form_for") if is_haml?
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
       end
-      alias_method :form_for_without_haml, :form_for
-      alias_method :form_for, :form_for_with_haml
     end
   end
 end

data/lib/haml/helpers/xss_mods.rb

@@ -104,6 +104,14 @@ end
 
 module ActionView
   module Helpers
+    module CaptureHelper
+      def with_output_buffer_with_haml_xss(*args, &block)
+        Haml::Util.html_safe(with_output_buffer_without_haml_xss(*args, &block))
+      end
+      alias_method :with_output_buffer_without_haml_xss, :with_output_buffer
+      alias_method :with_output_buffer, :with_output_buffer_with_haml_xss
+    end
+
     module FormTagHelper
       def form_tag_with_haml_xss(*args, &block)
         res = form_tag_without_haml_xss(*args, &block)
@@ -114,6 +122,16 @@ module ActionView
       alias_method :form_tag, :form_tag_with_haml_xss
     end
 
+    module FormHelper
+      def form_for_with_haml_xss(*args, &block)
+        res = form_for_without_haml_xss(*args, &block)
+        return Haml::Util.html_safe(res) if res.is_a?(String)
+        return res
+      end
+      alias_method :form_for_without_haml_xss, :form_for
+      alias_method :form_for, :form_for_with_haml_xss
+    end
+
     module TextHelper
       def concat_with_haml_xss(string)
         if is_haml?

data/lib/haml/html.rb

@@ -109,7 +109,7 @@ module Haml
   #
   # Example usage:
   #
-  #     Haml::Engine.new("<a href='http://google.com'>Blat</a>").render
+  #     Haml::HTML.new("<a href='http://google.com'>Blat</a>").render
   #       #=> "%a{:href => 'http://google.com'} Blat"
   class HTML
     # @param template [String, Hpricot::Node] The HTML template to convert

data/lib/haml/precompiler.rb

@@ -189,7 +189,6 @@ END
         if flat?
           push_flat(@line)
           @line = @next_line
-          newline
           next
         end
 
@@ -245,11 +244,12 @@ END
         return start_haml_comment if text[1] == SILENT_COMMENT
 
         raise SyntaxError.new(<<END.rstrip, index) if text[1..-1].strip == "end"
-You don't need to use "- end" in Haml. Use indentation instead:
+You don't need to use "- end" in Haml. Un-indent to close a block:
 - if foo?
   %strong Foo!
 - else
   Not foo.
+%p This line is un-indented, so it isn't part of the "if" block
 END
 
         push_silent(text[1..-1], true)
@@ -541,9 +541,18 @@ END
       quote_escape = attr_wrapper == '"' ? "&quot;" : "&apos;"
       other_quote_char = attr_wrapper == '"' ? "'" : '"'
 
+      if attributes['data'].is_a?(Hash)
+        attributes = attributes.dup
+        attributes =
+          Haml::Util.map_keys(attributes.delete('data')) {|name| "data-#{name}"}.merge(attributes)
+      end
+
       result = attributes.collect do |attr, value|
         next if value.nil?
 
+        value = filter_and_join(value, ' ') if attr == :class
+        value = filter_and_join(value, '_') if attr == :id
+
         if value == true
           next " #{attr}" if is_html
           next " #{attr}=#{attr_wrapper}#{attr}#{attr_wrapper}"
@@ -567,6 +576,11 @@ END
       result.compact.sort.join
     end
 
+    def self.filter_and_join(value, separator)
+      value = [value] unless value.is_a?(Array)
+      return value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
+    end
+
     def prerender_tag(name, self_close, attributes)
       attributes_string = Precompiler.build_attributes(html?, @options[:attr_wrapper], attributes)
       "<#{name}#{attributes_string}#{self_close && xhtml? ? ' /' : ''}>"

data/lib/haml/railtie.rb

@@ -0,0 +1,14 @@
+# This file is here to integrate with Rails 3,
+# since there's no better way to do so as of 14 March 2010.
+# Yehuda promises there will be soon,
+# and once there is we should switch to that.
+
+if defined?(Rails::Railtie)
+  module Haml
+    class Railtie < Rails::Railtie
+      initializer :haml do
+        Haml.init_rails(binding)
+      end
+    end
+  end
+end

data/lib/haml/template/plugin.rb

@@ -33,6 +33,38 @@ module Haml
       end
     end
   end
+
+  # Rails 3.0 prints a deprecation warning when block helpers
+  # return strings that go unused.
+  # We want to print the same deprecation warning,
+  # so we have to compile in a method call to check for it.
+  #
+  # I don't like having this in the precompiler pipeline,
+  # and I'd like to get rid of it once Rails 3.1 is well-established.
+  if defined?(ActionView::OutputBuffer) &&
+      Haml::Util.has?(:instance_method, ActionView::OutputBuffer, :append_if_string=)
+    module Precompiler
+      def push_silent_with_haml_block_deprecation(text, can_suppress = false)
+        unless can_suppress && block_opened? && !mid_block_keyword?("- #{text}") &&
+            text =~ ActionView::Template::Handlers::Erubis::BLOCK_EXPR
+          return push_silent_without_haml_block_deprecation(text, can_suppress)
+        end
+
+        push_silent_without_haml_block_deprecation("_hamlout.append_if_string= #{text}", can_suppress)
+      end
+      alias_method :push_silent_without_haml_block_deprecation, :push_silent
+      alias_method :push_silent, :push_silent_with_haml_block_deprecation
+    end
+
+    class Buffer
+      def append_if_string=(value)
+        if value.is_a?(String) && !value.is_a?(ActionView::NonConcattingString)
+          ActiveSupport::Deprecation.warn("- style block helpers are deprecated. Please use =", caller)
+          buffer << value
+        end
+      end
+    end
+  end
 end
 
 if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler

data/lib/haml/util.rb

@@ -179,6 +179,31 @@ module Haml
       return nil
     end
 
+    # Returns whether this environment is using ActionPack
+    # version 3.0.0 or greater.
+    #
+    # @return [Boolean]
+    def ap_geq_3?
+      # The ActionPack module is always loaded automatically in Rails >= 3
+      return false unless defined?(ActionPack) && defined?(ActionPack::VERSION)
+
+      version =
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        else
+          # Rails 1.2
+          ActionPack::VERSION::Major
+        end
+
+      # 3.0.0.beta1 acts more like ActionPack 2
+      # for purposes of this method
+      # (checking whether block helpers require = or -).
+      # This extra check can be removed when beta2 is out.
+      version >= 3 &&
+        !(defined?(ActionPack::VERSION::TINY) &&
+          ActionPack::VERSION::TINY == "0.beta")
+    end
+
     # Returns an ActionView::Template* class.
     # In pre-3.0 versions of Rails, most of these classes
     # were of the form `ActionView::TemplateFoo`,
@@ -299,6 +324,14 @@ MSG
       ruby1_8? ? enum.enum_with_index : enum.each_with_index
     end
 
+    # Returns the ASCII code of the given character.
+    #
+    # @param c [String] All characters but the first are ignored.
+    # @return [Fixnum] The ASCII code of `c`.
+    def ord(c)
+      ruby1_8? ? c[0] : c.ord
+    end
+
     ## Static Method Stuff
 
     # The context in which the ERB for \{#def\_static\_method} will be run.

data/lib/sass/tree/rule_node.rb

@@ -132,23 +132,27 @@ module Sass::Tree
       to_return = ''
       old_spaces = '  ' * (tabs - 1)
       spaces = '  ' * tabs
-      if @options[:line_comments] && style != :compressed
-        to_return << "#{old_spaces}/* line #{line}"
-
-        if filename
-          relative_filename = if @options[:css_filename]
-            begin
-              Pathname.new(filename).relative_path_from(
-                Pathname.new(File.dirname(@options[:css_filename]))).to_s
-            rescue ArgumentError
-              nil
+      if style != :compressed
+        if @options[:debug_info]
+          to_return << debug_info_rule.to_s(tabs) << "\n"
+        elsif @options[:line_comments]
+          to_return << "#{old_spaces}/* line #{line}"
+
+          if filename
+            relative_filename = if @options[:css_filename]
+              begin
+                Pathname.new(filename).relative_path_from(
+                  Pathname.new(File.dirname(@options[:css_filename]))).to_s
+              rescue ArgumentError
+                nil
+              end
             end
+            relative_filename ||= filename
+            to_return << ", #{relative_filename}"
           end
-          relative_filename ||= filename
-          to_return << ", #{relative_filename}"
-        end
 
-        to_return << " */\n"
+          to_return << " */\n"
+        end
       end
 
       if style == :compact
@@ -207,6 +211,16 @@ module Sass::Tree
       super
     end
 
+    # A hash that will be associated with this rule in the CSS document
+    # if the {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option} is enabled.
+    # This data is used by e.g. [the FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988).
+    #
+    # @return [{#to_s => #to_s}]
+    def debug_info
+      {:filename => filename && ("file://" + URI.escape(File.expand_path(filename))),
+       :line => self.line}
+    end
+
     private
 
     def resolve_parent_refs(super_rules)
@@ -267,5 +281,20 @@ module Sass::Tree
 
       rules
     end
+
+    def debug_info_rule
+      node = DirectiveNode.new("@media -sass-debug-info")
+      debug_info.each do |k, v|
+        rule = RuleNode.new(nil)
+        rule.resolved_rules = [[k.to_s.gsub(/[^\w-]/, "\\\\\\0")]]
+        val = v.to_s.gsub(/[^\w-]/, "\\\\\\0").
+          gsub(/^[\d-]/) {|c| "\\%04x " % Haml::Util.ord(c)}
+        prop = PropNode.new("font-family", val, :new)
+        rule << prop
+        node << rule
+      end
+      node.options = @options.merge(:debug_info => false, :line_comments => false, :style => :compressed)
+      node
+    end
   end
 end

data/test/haml/engine_test.rb

@@ -36,7 +36,14 @@ class EngineTest < Test::Unit::TestCase
     "%p{:a => 'b',\n:c => 'd',\n:e => raise('foo')}" => ["foo", 3],
     " %p foo" => "Indenting at the beginning of the document is illegal.",
     "  %p foo" => "Indenting at the beginning of the document is illegal.",
-    "- end" => "You don't need to use \"- end\" in Haml. Use indentation instead:\n- if foo?\n  %strong Foo!\n- else\n  Not foo.",
+    "- end" => <<MESSAGE.rstrip,
+You don't need to use "- end" in Haml. Un-indent to close a block:
+- if foo?
+  %strong Foo!
+- else
+  Not foo.
+%p This line is un-indented, so it isn't part of the "if" block
+MESSAGE
     " \n\t\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
     "\n\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
     "%p\n  foo\n foo" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 3],
@@ -73,6 +80,11 @@ class EngineTest < Test::Unit::TestCase
     "!!!\n\n  bar" => ["Illegal nesting: nesting within a header command is illegal.", 3],
     "foo\n:ruby\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
     "foo\n:erb\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
+    "foo\n:plain\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
+    "foo\n:plain\n  1\n  2\n  3\n4\n- raise 'foo'" => ["foo", 7],
+    "foo\n:plain\n  1\n  2\n  3\#{''}\n- raise 'foo'" => ["foo", 6],
+    "foo\n:plain\n  1\n  2\n  3\#{''}\n4\n- raise 'foo'" => ["foo", 7],
+    "foo\n:plain\n  1\n  2\n  \#{raise 'foo'}" => ["foo", 5],
     "= raise 'foo'\nfoo\nbar\nbaz\nbang" => ["foo", 1],
   }
 
@@ -130,6 +142,29 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p class='3'>foo</p>", render("%p{:class => 1+2} foo").chomp)
   end
 
+  def test_class_attr_with_array
+    assert_equal("<p class='a b'>foo</p>\n", render("%p{:class => %w[a b]} foo")) # basic
+    assert_equal("<p class='a b css'>foo</p>\n", render("%p.css{:class => %w[a b]} foo")) # merge with css
+    assert_equal("<p class='b css'>foo</p>\n", render("%p.css{:class => %w[css b]} foo")) # merge uniquely
+    assert_equal("<p class='a b c d'>foo</p>\n", render("%p{:class => [%w[a b], %w[c d]]} foo")) # flatten
+    assert_equal("<p class='a b'>foo</p>\n", render("%p{:class => [:a, :b] } foo")) # stringify
+    assert_equal("<p class=''>foo</p>\n", render("%p{:class => [nil, false] } foo")) # strip falsey
+    assert_equal("<p class='a'>foo</p>\n", render("%p{:class => :a} foo")) # single stringify
+    assert_equal("<p>foo</p>\n", render("%p{:class => false} foo")) # single falsey
+    assert_equal("<p class='a b html'>foo</p>\n", render("%p(class='html'){:class => %w[a b]} foo")) # html attrs
+  end
+
+  def test_id_attr_with_array
+    assert_equal("<p id='a_b'>foo</p>\n", render("%p{:id => %w[a b]} foo")) # basic
+    assert_equal("<p id='css_a_b'>foo</p>\n", render("%p#css{:id => %w[a b]} foo")) # merge with css
+    assert_equal("<p id='a_b_c_d'>foo</p>\n", render("%p{:id => [%w[a b], %w[c d]]} foo")) # flatten
+    assert_equal("<p id='a_b'>foo</p>\n", render("%p{:id => [:a, :b] } foo")) # stringify
+    assert_equal("<p id=''>foo</p>\n", render("%p{:id => [nil, false] } foo")) # strip falsey
+    assert_equal("<p id='a'>foo</p>\n", render("%p{:id => :a} foo")) # single stringify
+    assert_equal("<p>foo</p>\n", render("%p{:id => false} foo")) # single falsey
+    assert_equal("<p id='html_a_b'>foo</p>\n", render("%p(id='html'){:id => %w[a b]} foo")) # html attrs
+  end
+
   def test_dynamic_attributes_with_no_content
     assert_equal(<<HTML, render(<<HAML))
 <p>
@@ -611,8 +646,9 @@ HAML
 <p>foo-end</p>
 <p>bar-end</p>
 HTML
-- "foo-end-bar-end".gsub(/\\w+-end/) do |s|
+- ("foo-end-bar-end".gsub(/\\w+-end/) do |s|
   %p= s
+- end; nil)
 HAML
   end
 
@@ -1164,6 +1200,47 @@ SASS
     assert_equal %{<!DOCTYPE html>\n}, render('!!!', :format => :html5)
   end
 
+  # HTML5 custom data attributes
+  def test_html5_data_attributes
+    assert_equal("<div data-author_id='123' data-biz='baz' data-foo='bar'></div>\n",
+      render("%div{:data => {:author_id => 123, :foo => 'bar', :biz => 'baz'}}"))
+
+    assert_equal("<div data-one_plus_one='2'></div>\n",
+      render("%div{:data => {:one_plus_one => 1+1}}"))
+
+    assert_equal("<div data-foo='Here&apos;s a \"quoteful\" string.'></div>\n",
+      render(%{%div{:data => {:foo => %{Here's a "quoteful" string.}}}})) #'
+  end
+
+  def test_html5_data_attributes_with_multiple_defs
+    # Should always use the more-explicit attribute
+    assert_equal("<div data-foo='second'></div>\n",
+      render("%div{:data => {:foo => 'first'}, 'data-foo' => 'second'}"))
+    assert_equal("<div data-foo='first'></div>\n",
+      render("%div{'data-foo' => 'first', :data => {:foo => 'second'}}"))
+  end
+
+  def test_html5_data_attributes_with_attr_method
+    Haml::Helpers.module_eval do
+      def data_hash
+        {:data => {:foo => "bar", :baz => "bang"}}
+      end
+
+      def data_val
+        {:data => "dat"}
+      end
+    end
+
+    assert_equal("<div data-baz='bang' data-brat='wurst' data-foo='blip'></div>\n",
+      render("%div{data_hash, :data => {:foo => 'blip', :brat => 'wurst'}}"))
+    assert_equal("<div data-baz='bang' data-foo='blip'></div>\n",
+      render("%div{data_hash, 'data-foo' => 'blip'}"))
+    assert_equal("<div data-baz='bang' data-foo='bar' data='dat'></div>\n",
+      render("%div{data_hash, :data => 'dat'}"))
+    assert_equal("<div data-brat='wurst' data-foo='blip' data='dat'></div>\n",
+      render("%div{data_val, :data => {:foo => 'blip', :brat => 'wurst'}}"))
+  end
+
   # New attributes
 
   def test_basic_new_attributes

data/test/haml/helper_test.rb

@@ -65,7 +65,21 @@ class HelperTest < Test::Unit::TestCase
     assert_equal("foo\n  bar\nbaz\n", render("foo\n- tab_up\nbar\n- tab_down\nbaz"))
     assert_equal("          <p>tabbed</p>\n", render("- buffer.tabulation=5\n%p tabbed"))
   end
-  
+
+  def test_with_tabs
+    assert_equal(<<HTML, render(<<HAML))
+Foo
+    Bar
+    Baz
+Baz
+HTML
+Foo
+- with_tabs 2 do
+  = "Bar\\nBaz"
+Baz
+HAML
+  end
+
   def test_helpers_dont_leak
     # Haml helpers shouldn't be accessible from ERB
     render("foo")
@@ -93,9 +107,16 @@ class HelperTest < Test::Unit::TestCase
   def test_form_tag
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
-    result = render("- form_tag 'foo' do\n  %p bar\n  %strong baz", :action_view)
-    should_be = "<form action=\"foo\" method=\"post\">\n  <p>bar</p>\n  <strong>baz</strong>\n</form>\n"
-    assert_equal(should_be, result)
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form action="foo" method="post">
+  <p>bar</p>
+  <strong>baz</strong>
+</form>
+HTML
+#{rails_block_helper_char} form_tag 'foo' do
+  %p bar
+  %strong baz
+HAML
   end
 
   def test_text_area
@@ -110,16 +131,23 @@ class HelperTest < Test::Unit::TestCase
   end
   
   def test_capture_haml
-    assert_equal("\"<p>13</p>\\n\"\n", render("- foo = capture_haml(13) do |a|\n  %p= a\n= foo.dump"))
+    assert_equal(<<HTML, render(<<HAML))
+"<p>13</p>\\n"
+HTML
+- (foo = capture_haml(13) do |a|
+  %p= a
+- end; nil)
+= foo.dump
+HAML
   end
 
   def test_content_tag_block
-    assert_equal(<<HTML.strip, render(<<HAML, :action_view))
+    assert_equal(<<HTML.strip, render(<<HAML, :action_view).strip)
 <div><p>bar</p>
 <strong>bar</strong>
 </div>
 HTML
-- content_tag :div do
+#{rails_block_helper_char} content_tag :div do
   %p bar
   %strong bar
 HAML
@@ -177,6 +205,16 @@ HAML
     assert_equal("<br class='foo' />\n", render("- haml_tag :br, :class => 'foo'"))
   end
 
+  def test_haml_tag_with_class_array
+    assert_equal("<p class='a b'>foo</p>\n", render("- haml_tag :p, 'foo', :class => %w[a b]"))
+    assert_equal("<p class='a b c d'>foo</p>\n", render("- haml_tag 'p.c.d', 'foo', :class => %w[a b]"))
+  end
+
+  def test_haml_tag_with_id_array
+    assert_equal("<p id='a_b'>foo</p>\n", render("- haml_tag :p, 'foo', :id => %w[a b]"))
+    assert_equal("<p id='c_a_b'>foo</p>\n", render("- haml_tag 'p#c', 'foo', :id => %w[a b]"))
+  end
+
   def test_haml_tag_non_autoclosed_tags_arent_closed
     assert_equal("<p></p>\n", render("- haml_tag :p"))
   end

data/test/haml/results/just_stuff.xhtml

@@ -56,7 +56,9 @@ testtest
 </br>
 <p class='article bar foo' id='article_1'>Blah</p>
 <p class='article foo' id='article_1'>Blah</p>
+<p class='article bar baz foo' id='article_1'>Blah</p>
 <p class='article quux qux' id='article_1'>Blump</p>
+<p class='article' id='foo_bar_baz_article_1'>Whee</p>
 Woah inner quotes
 <p class='dynamic_quote' dyn='3' quotes="single '"></p>
 <p class='dynamic_self_closing' dyn='3' />

data/test/haml/template_test.rb

@@ -70,8 +70,9 @@ class TemplateTest < Test::Unit::TestCase
     end
     
     if Haml::Util.has?(:private_method, base, :evaluate_assigns)
+      # Rails < 3.0
       base.send(:evaluate_assigns)
-    else
+    elsif Haml::Util.has?(:private_method, base, :_evaluate_assigns_and_ivars)
       # Rails 2.2
       base.send(:_evaluate_assigns_and_ivars)
     end
@@ -190,22 +191,24 @@ class TemplateTest < Test::Unit::TestCase
     assert_equal("2\n", render("= 1+1"))
   end
 
-  def test_form_for_error_return
-    assert_raise(Haml::Error) { render(<<HAML) }
+  unless Haml::Util.ap_geq_3?
+    def test_form_for_error_return
+      assert_raise(Haml::Error) { render(<<HAML) }
 = form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:
   = f.text_field :body
 HAML
-  end
+    end
 
-  def test_form_tag_error_return
-    assert_raise(Haml::Error) { render(<<HAML) }
+    def test_form_tag_error_return
+      assert_raise(Haml::Error) { render(<<HAML) }
 = form_tag '' do
   Title:
   Body:
 HAML
+    end
   end
 
   def test_haml_options
@@ -228,10 +231,13 @@ baz
 HTML
 %p
   foo
-  - with_output_buffer do
+  -# Parenthesis required due to Rails 3.0 deprecation of block helpers
+  -# that return strings.
+  - (with_output_buffer do
     bar
     = "foo".gsub(/./) do |s|
       - "flup"
+  - end; nil)
   baz
 HAML
   end
@@ -267,6 +273,28 @@ END
     end
   end
 
+  if defined?(ActionView::OutputBuffer) &&
+      Haml::Util.has?(:instance_method, ActionView::OutputBuffer, :append_if_string=)
+    def test_av_block_deprecation_warning
+      assert_warning(/^DEPRECATION WARNING: - style block helpers are deprecated\. Please use =\./) do
+        assert_equal <<HTML, render(<<HAML, :action_view)
+<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>
+HTML
+- form_for :article, @article, :url => '' do |f|
+  Title:
+  = f.text_field :title
+  Body:
+  = f.text_field :body
+HAML
+      end
+    end
+  end
+
   ## XSS Protection Tests
 
   # In order to enable these, either test against Rails 3.0
@@ -356,7 +384,7 @@ HAML
   <input id="article_body" name="article[body]" size="30" type="text" value="World" />
 </form>
 HTML
-- form_for :article, @article, :url => '' do |f|
+#{rails_block_helper_char} form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:

data/test/haml/templates/helpers.haml

@@ -62,6 +62,19 @@ click
         <input id="article_body" name="article[body]" size="30" type="text" value="World" />
       </form>
     </div>
+- elsif Haml::Util.ap_geq_3?
+  %p
+    = form_tag ''
+  %div
+    = 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
 - else
   %p
     = form_tag ''

data/test/haml/templates/just_stuff.haml

@@ -70,7 +70,9 @@
   Nested content
 %p.foo{:class => true ? 'bar' : 'baz'}[@article] Blah
 %p.foo{:class => false ? 'bar' : ''}[@article] Blah
+%p.foo{:class => %w[bar baz]}[@article] Blah
 %p.qux{:class => 'quux'}[@article] Blump
+%p#foo{:id => %w[bar baz]}[@article] Whee
 == #{"Woah inner quotes"}
 %p.dynamic_quote{:quotes => "single '", :dyn => 1 + 2}
 %p.dynamic_self_closing{:dyn => 1 + 2}/

data/test/haml/templates/partial_layout.haml

@@ -1,3 +1,7 @@
 %h1 Partial layout used with for block:
-- render :layout => 'layout_for_partial.haml' do
-  %p Some content within a layout
+- if Haml::Util.ap_geq_3?
+  = render :layout => 'layout_for_partial.haml' do
+    %p Some content within a layout
+- else
+  - render :layout => 'layout_for_partial.haml' do
+    %p Some content within a layout

data/test/haml/util_test.rb

@@ -86,6 +86,11 @@ class UtilTest < Test::Unit::TestCase
       enum_with_index(%w[foo bar baz]).map {|s, i| "#{s}#{i}"})
   end
 
+  def test_ord
+    assert_equal(102, ord("f"))
+    assert_equal(98, ord("bar"))
+  end
+
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))

data/test/sass/engine_test.rb

@@ -626,6 +626,81 @@ SASS
     renders_correctly "line_numbers", :line_comments => true, :load_paths => [File.dirname(__FILE__) + "/templates"]
   end
 
+  def test_debug_info
+    assert_equal(<<CSS, render(<<SASS, :debug_info => true, :style => :compact))
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_inline\\.sass}line{font-family:\\0032 }}
+foo bar { foo: bar; }
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_inline\\.sass}line{font-family:\\0035 }}
+foo baz { blip: blop; }
+
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_inline\\.sass}line{font-family:\\0039 }}
+floodle { flop: blop; }
+
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_inline\\.sass}line{font-family:\\0031 8}}
+bup { mix: on; }
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_inline\\.sass}line{font-family:\\0031 5}}
+bup mixin { moop: mup; }
+
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_inline\\.sass}line{font-family:\\0032 2}}
+bip hop, skip hop { a: b; }
+CSS
+foo
+  bar
+    foo: bar
+
+  baz
+    blip: blop
+
+
+floodle
+
+  flop: blop
+
+=mxn
+  mix: on
+  mixin
+    moop: mup
+
+bup
+  +mxn
+
+bip, skip
+  hop
+    a: b
+SASS
+  end
+
+  def test_debug_info_without_filename
+    assert_equal(<<CSS, Sass::Engine.new(<<SASS, :debug_info => true).render)
+@media -sass-debug-info{filename{font-family:}line{font-family:\\0031 }}
+foo {
+  a: b; }
+CSS
+foo
+  a: b
+SASS
+  end
+
+  def test_debug_info_with_compressed
+    assert_equal(<<CSS, render(<<SASS, :debug_info => true, :style => :compressed))
+foo{a:b}
+CSS
+foo
+  a: b
+SASS
+  end
+
+  def test_debug_info_with_line_annotations
+    assert_equal(<<CSS, render(<<SASS, :debug_info => true, :line_comments => true))
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/\\/home\\/nex3\\/code\\/haml\\/test_debug_info_with_line_annotations_inline\\.sass}line{font-family:\\0031 }}
+foo {
+  a: b; }
+CSS
+foo
+  a: b
+SASS
+  end
+
   def test_empty_first_line
     assert_equal("#a {\n  b: c; }\n", render("#a\n\n  b: c"))
   end

data/test/test_helper.rb

@@ -41,7 +41,12 @@ class Test::Unit::TestCase
   def assert_warning(message)
     the_real_stderr, $stderr = $stderr, StringIO.new
     yield
-    assert_equal message.strip, $stderr.string.strip
+
+    if message.is_a?(Regexp)
+      assert_match message, $stderr.string.strip
+    else
+      assert_equal message.strip, $stderr.string.strip
+    end
   ensure
     $stderr = the_real_stderr
   end
@@ -49,4 +54,9 @@ class Test::Unit::TestCase
   def silence_warnings(&block)
     Haml::Util.silence_warnings(&block)
   end
+
+  def rails_block_helper_char
+    return '=' if Haml::Util.ap_geq_3?
+    return '-'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.169
+  version: 2.3.170
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,13 +64,14 @@ files:
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/html.rb
 - lib/haml/precompiler.rb
+- lib/haml/util.rb
 - lib/haml/html/erb.rb
 - lib/haml/shared.rb
 - lib/haml/template.rb
 - lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
-- lib/haml/util.rb
 - lib/haml/version.rb
+- lib/haml/railtie.rb
 - lib/sass.rb
 - lib/sass/css.rb
 - lib/sass/engine.rb