haml 2.0.0 → 2.0.1

data/lib/haml/template.rb

@@ -36,8 +36,16 @@ if defined?(RAILS_ROOT)
   # to not need updating.
   rails_init_file = File.join(RAILS_ROOT, 'vendor', 'plugins', 'haml', 'init.rb')
   haml_init_file = Haml.scope('init.rb')
-  if File.exists?(rails_init_file)
-    require 'fileutils'
-    FileUtils.cp(haml_init_file, rails_init_file) unless FileUtils.cmp(rails_init_file, haml_init_file)
+  begin
+    if File.exists?(rails_init_file)
+      require 'fileutils'
+      FileUtils.cp(haml_init_file, rails_init_file) unless FileUtils.cmp(rails_init_file, haml_init_file)
+    end
+  rescue SystemCallError
+    warn <<END
+HAML WARNING:
+#{rails_init_file} is out of date and couldn't be automatically updated.
+Please run `haml --rails #{File.expand_path(RAILS_ROOT)}' to update it.
+END
   end
 end

data/lib/haml/template/patch.rb

@@ -35,7 +35,7 @@ module ActionView
       options[:filename] = file_name || 'compiled-template'
 
       begin
-        Haml::Engine.new(template, options).def_method(CompiledTemplates, render_symbol, *locals)
+        Haml::Engine.new(template, options).def_method(CompiledTemplates, render_symbol, *locals_keys)
       rescue Exception => e
         if logger
           logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"

data/lib/sass.rb

@@ -253,6 +253,22 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #     font-size: 30em;
 #     font-weight: bold; }
 #
+# === Rule Escaping
+#
+# In case, for whatever reason, you need to write a rule
+# that begins with a Sass-meaningful character,
+# you can escape it with a backslash (<tt>\</tt>).
+# For example:
+#
+#  #main
+#    \+div
+#      clear: both
+#
+# is compiled to:
+#
+#  #main +div {
+#    clear: both; }
+#
 # == Constants
 #
 # Sass has support for setting document-wide constants.
@@ -760,9 +776,16 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # == Sass Options
 #
-# Options can be set by setting the hash <tt>Sass::Plugin.options</tt>
-# from <tt>environment.rb</tt> in Rails,
-# or by passing an options hash to Sass::Engine.
+# Options can be set by setting the <tt>Sass::Plugin.options</tt> hash
+# in <tt>environment.rb</tt> in Rails...
+#
+#   Sass::Plugin.options[:style] = :compact
+#
+# ...or by setting the <tt>Merb::Config[:sass]</tt> hash in <tt>init.rb</tt> in Merb...
+#
+#   Merb::Config[:sass][:style] = :compact
+# 
+# ...or by passing an options hash to Sass::Engine.new.
 # Available options are:
 #
 # [<tt>:style</tt>]             Sets the style of the CSS output.

data/lib/sass/constant.rb

@@ -119,17 +119,10 @@ module Sass
                 next
               end
 
-              # Is this a constant?
-              if beginning_of_token && symbol == :const
-                beginning_of_token = true
-                to_return << :const
-                next
-              end
-
               # Are we looking at an operator?
               if symbol && (symbol != :mod || str.empty?)
                 str = reset_str.call
-                beginning_of_token = true
+                beginning_of_token = symbol != :close
                 to_return << symbol
                 next
               end
@@ -148,57 +141,30 @@ module Sass
         to_return
       end
 
-      def parenthesize(value)
-        parenthesize_helper(0, value, value.length)[0]
-      end
-
-      def parenthesize_helper(i, value, value_len, return_after_expr = false)
+      def parenthesize(value, return_after_expr = false)
         to_return = []
-        beginning = i
-        token = value[i]
-
-        while i < value_len && token != :close
-          if token == :open
-            to_return.push(*value[beginning...i])
-            sub, i = parenthesize_helper(i + 1, value, value_len)
-            beginning = i
-            to_return << sub
-          elsif token == :neg
-            if value[i + 1].nil?
-              # This is never actually reached, but we'll leave it in just in case.
-              raise Sass::SyntaxError.new("Unterminated unary minus.")
-            elsif value[i + 1] == :open
-              to_return.push(*value[beginning...i])
-              sub, i = parenthesize_helper(i + 2, value, value_len)
-              beginning = i
-              to_return << [:neg, sub]
-            elsif value[i + 1].is_a?(::Symbol)
-              to_return.push(*value[beginning...i])
-              sub, i = parenthesize_helper(i + 1, value, value_len, true)
-              beginning = i
-              to_return << [:neg, sub]
-            else
-              to_return.push(*value[beginning...i])
-              to_return << [:neg, value[i + 1]]
-              beginning = i = i + 2
-            end
-            return to_return[0], i if return_after_expr
-          elsif token == :const
-            raise Sass::SyntaxError.new("Unterminated constant.") if value[i + 1].nil?
-            raise Sass::SyntaxError.new("Invalid constant.") unless value[i + 1].is_a?(::String)
-
-            to_return.push(*value[beginning...i])
-            to_return << [:const, value[i + 1]]
-            beginning = i = i + 2
-            return to_return[0], i if return_after_expr
+
+        while (token = value.shift) && token != :close
+          case token
+          when :open
+            to_return << parenthesize(value)
+          when :neg
+            # This is never actually reached, but we'll leave it in just in case.
+            raise Sass::SyntaxError.new("Unterminated unary minus.") if value.first.nil?
+            to_return << [:neg, parenthesize(value, true)]
+          when :const
+            raise Sass::SyntaxError.new("Unterminated constant.") if value.first.nil?
+            raise Sass::SyntaxError.new("Invalid constant.") unless value.first.is_a?(::String)
+
+            to_return << [:const, value.first]
+            value.shift
           else
-            i += 1
+            to_return << token
           end
 
-          token = value[i]
+          return to_return.first if return_after_expr
         end
-        to_return.push(*value[beginning...i])
-        return to_return, i + 1
+        return to_return
       end
 
       #--
@@ -207,7 +173,10 @@ module Sass
       #++
       def operationalize(value, constants)
         value = [value] unless value.is_a?(Array)
-        if value.length == 1
+        case value.length
+        when 0
+          Sass::Constant::Nil.new
+        when 1
           value = value[0]
           if value.is_a? Array
             operationalize(value, constants)
@@ -216,7 +185,7 @@ module Sass
           else
             Literal.parse(value)
           end
-        elsif value.length == 2
+        when 2
           if value[0] == :neg
             Operation.new(Sass::Constant::Number.new('0'), operationalize(value[1], constants), :minus)
           elsif value[0] == :const
@@ -224,7 +193,7 @@ module Sass
           else
             raise SyntaxError.new("Constant arithmetic error")
           end
-        elsif value.length == 3
+        when 3
           Operation.new(operationalize(value[0], constants), operationalize(value[2], constants), value[1])
         else
           if SECOND_ORDER.include?(value[1]) && FIRST_ORDER.include?(value[3])

data/lib/sass/constant/literal.rb

@@ -4,6 +4,7 @@ module Sass::Constant; class Literal; end; end; # :nodoc:
 require 'sass/constant/string'
 require 'sass/constant/number'
 require 'sass/constant/color'
+require 'sass/constant/nil'
 
 class Sass::Constant::Literal # :nodoc:
   # The regular expression matching numbers.

data/lib/sass/constant/nil.rb

@@ -0,0 +1,9 @@
+require 'sass/constant/literal'
+
+module Sass::Constant # :nodoc:
+  class Nil < Literal # :nodoc:
+    def to_s
+      ''
+    end
+  end
+end

data/lib/sass/engine.rb

@@ -134,7 +134,7 @@ module Sass
     # and computes the tabulation of the line.
     def split_lines
       @line = 0
-      old_tabs = 0
+      old_tabs = nil
       @template.each_with_index do |line, index|
         @line += 1
 
@@ -145,14 +145,16 @@ module Sass
         end
 
         if tabs # if line isn't blank
-          if tabs - old_tabs > 1
+          raise SyntaxError.new("Indenting at the beginning of the document is illegal.", @line) if old_tabs.nil? && tabs > 0
+
+          if old_tabs && tabs - old_tabs > 1
             raise SyntaxError.new("#{tabs * 2} spaces were used for indentation. Sass must be indented using two spaces.", @line)
           end
           @lines << [line.strip, tabs]
 
           old_tabs = tabs
         else
-          @lines << ['//', old_tabs]
+          @lines << ['//', old_tabs || 0]
         end
       end
 
@@ -287,7 +289,11 @@ END
       when MIXIN_DEFINITION_CHAR
         parse_mixin_definition(line)
       when MIXIN_INCLUDE_CHAR
-        parse_mixin_include(line)
+        if line[1].nil? || line[1] == ?\s
+          Tree::RuleNode.new(line, @options[:style])
+        else
+          parse_mixin_include(line)
+        end
       else
         if line =~ ATTRIBUTE_ALTERNATE_MATCHER
           parse_attribute(line, ATTRIBUTE_ALTERNATE)

data/test/haml/engine_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class EngineTest < Test::Unit::TestCase
   # A map of erroneous Sass documents to the error messages they should produce.
@@ -32,11 +32,23 @@ END
     ".= a" => "Illegal element: classes and ids must have values.",
     "%p..a" => "Illegal element: classes and ids must have values.",
     "%a/ b" => "Self-closing tags can't have content.",
+    " %p foo" => "Indenting at the beginning of the document is illegal.",
+    "  %p foo" => "Indenting at the beginning of the document is illegal.",
+    " \n\t\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
 
     # Regression tests
     "- raise 'foo'\n\n\n\nbar" => ["foo", 1],
     "= 'foo'\n-raise 'foo'" => ["foo", 2],
     "\n\n\n- raise 'foo'" => ["foo", 4],
+    "foo\n\n\n  bar" => ["Illegal nesting: nesting within plain text is illegal.", 4],
+    "%p/\n\n  bar" => ["Illegal nesting: nesting within a self-closing tag is illegal.", 3],
+    "%p foo\n\n  bar" => ["Illegal nesting: content can't be both given on the same line as %p and nested within it.", 3],
+    "/ foo\n\n  bar" => ["Illegal nesting: nesting within a tag that already has content is illegal.", 3],
+    "!!!\n\n  bar" => ["Illegal nesting: nesting within a header command is illegal.", 3],
+    "foo\n\n\n\tbar" => [<<END.strip, 4],
+A tab character was used for indentation. Haml must be indented using two spaces.
+Are you sure you have soft tabs enabled in your editor?
+END
   }
 
   User = Struct.new('User', :id)
@@ -541,6 +553,13 @@ END
                  render("%p= 's' * 75", :ugly => true))
   end
 
+  def test_auto_preserve_unless_ugly
+    assert_equal("<pre>foo&#x000A;bar</pre>\n", render('%pre="foo\nbar"'))
+    assert_equal("<pre>foo\nbar</pre>\n", render("%pre\n  foo\n  bar"))
+    assert_equal("<pre>foo\nbar</pre>\n", render('%pre="foo\nbar"', :ugly => true))
+    assert_equal("<pre>foo\nbar</pre>\n", render("%pre\n  foo\n  bar", :ugly => true))
+  end
+
   def test_xhtml_output_option
     assert_equal "<p>\n  <br />\n</p>\n", render("%p\n  %br", :format => :xhtml)
     assert_equal "<a />\n", render("%a/", :format => :xhtml)

data/test/haml/helper_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/template'
 
 class HelperTest < Test::Unit::TestCase
@@ -105,7 +105,23 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_haml_tag_non_autoclosed_tags_arent_closed
-    assert_equal("<p>\n</p>\n", render("- haml_tag :p"))
+    assert_equal("<p></p>\n", render("- haml_tag :p"))
+  end
+
+  def test_haml_tag_renders_text_on_a_single_line
+    assert_equal("<p>#{'a' * 100}</p>\n", render("- haml_tag :p, 'a' * 100"))
+  end
+
+  def test_haml_tag_raises_error_for_multiple_content
+    assert_raise(Haml::Error) { render("- haml_tag :p, 'foo' do\n  bar") }
+  end
+
+  def test_haml_tag_flags
+    assert_equal("<p />\n", render("- haml_tag :p, :/"))
+    assert_equal("<p>kumquat</p>\n", render("- haml_tag :p, :< do\n  kumquat"))
+
+    assert_raise(Haml::Error) { render("- haml_tag :p, 'foo', :/") }
+    assert_raise(Haml::Error) { render("- haml_tag :p, :/ do\n  foo") }
   end
 
   def test_is_haml

data/test/haml/html2haml_test.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/html'
 
 class Html2HamlTest < Test::Unit::TestCase

data/test/haml/results/helpers.xhtml

@@ -79,9 +79,7 @@ foo
 <table>
   <tr>
     <td class='cell'>
-      <strong>
-        strong!
-      </strong>
+      <strong>strong!</strong>
       data
     </td>
     <td>
@@ -90,5 +88,4 @@ foo
   </tr>
 </table>
 <hr />
-<div>
-</div>
+<div></div>

data/test/haml/results/just_stuff.xhtml

@@ -17,7 +17,6 @@ Embedded? one af"t"er another!
 <p>Embedded? true!</p>
 <p>Embedded? twice! true!</p>
 <p>Embedded? one af"t"er another!</p>
-<div class='render'><em>wow!</em></div>
 stuff followed by whitespace
 <strong>block with whitespace</strong>
 <p>

data/test/haml/results/nuke_inner_whitespace.xhtml

@@ -32,3 +32,9 @@
     Bar
   </div></q>
 </p>
+<p>
+  <q>foo</q>
+  <q a='2'>
+    bar
+  </q>
+</p>

data/test/haml/results/whitespace_handling.xhtml

@@ -75,7 +75,7 @@
   </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/
+  <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/
   <strong>indeed!</strong></textarea>
 </div>
 <div class='foo'>

data/test/haml/template_test.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/template'
 require File.dirname(__FILE__) + '/mocks/article'
 
-
 module Haml::Filters::Test
   include Haml::Filters::Base
 
@@ -12,14 +11,21 @@ module Haml::Filters::Test
   end
 end
 
+module Haml::Helpers
+  def test_partial(name, locals = {})
+    Haml::Engine.new(File.read(File.join(TemplateTest::TEMPLATE_PATH, "_#{name}.haml"))).render(self, locals)
+  end
+end
+
 class TemplateTest < Test::Unit::TestCase
-  @@templates = %w{       very_basic        standard    helpers
+  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
     filters               nuke_outer_whitespace         nuke_inner_whitespace }
 
   def setup
-    @base = ActionView::Base.new(File.dirname(__FILE__) + "/templates/", {'article' => Article.new, 'foo' => 'value one'})
+    @base = ActionView::Base.new(TEMPLATE_PATH, 'article' => Article.new, 'foo' => 'value one')
     @base.send(:evaluate_assigns)
 
     # This is used by form_for.
@@ -39,20 +45,16 @@ class TemplateTest < Test::Unit::TestCase
 
   def assert_renders_correctly(name, &render_method)
     render_method ||= proc { |name| @base.render(name) }
-    test = Proc.new do |rendered|
-      load_result(name).split("\n").zip(rendered.split("\n")).each_with_index do |pair, line|
-        message = "template: #{name}\nline:     #{line}"
-        assert_equal(pair.first, pair.last, message)
-      end
+
+    load_result(name).split("\n").zip(render_method[name].split("\n")).each_with_index do |pair, line|
+      message = "template: #{name}\nline:     #{line}"
+      assert_equal(pair.first, pair.last, message)
     end
-    begin
-      test.call(render_method[name])
-    rescue ActionView::TemplateError => e
-      if e.message =~ /Can't run [\w:]+ filter; required (one of|file) ((?:'\w+'(?: or )?)+)(, but none were found| not found)/
-        puts "\nCouldn't require #{$2}; skipping a test."
-      else
-        raise e
-      end
+  rescue ActionView::TemplateError => e
+    if e.message =~ /Can't run [\w:]+ filter; required (one of|file) ((?:'\w+'(?: or )?)+)(, but none were found| not found)/
+      puts "\nCouldn't require #{$2}; skipping a test."
+    else
+      raise e
     end
   end
 
@@ -60,30 +62,24 @@ class TemplateTest < Test::Unit::TestCase
     assert_equal('', render(''))
   end
 
-  def test_templates_should_render_correctly
-    @@templates.each do |template|
+  TEMPLATES.each do |template|
+    define_method "test_template_should_render_correctly [template: #{template}] " do
       assert_renders_correctly template
     end
   end
 
   def test_templates_should_render_correctly_with_render_proc
-    @@templates.each do |template|
-      assert_renders_correctly(template) do |name|
-        engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
-        engine.render_proc(@base).call
-      end
+    assert_renders_correctly("standard") do |name|
+      engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
+      engine.render_proc(@base).call
     end
   end
-
+  
   def test_templates_should_render_correctly_with_def_method
-    @@templates.each do |template|
-      assert_renders_correctly(template) do |name|
-        method = "render_haml_" + name.gsub(/[^a-zA-Z0-9]/, '_')
-
-        engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
-        engine.def_method(@base, method)
-        @base.send(method)
-      end
+    assert_renders_correctly("standard") do |name|
+      engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"))
+      engine.def_method(@base, "render_standard")
+      @base.render_standard
     end
   end
 
@@ -115,19 +111,6 @@ class TemplateTest < Test::Unit::TestCase
     assert_equal("2\n", render("= 1+1"))
   end
 
-  def test_rhtml_still_renders
-    # Make sure it renders normally
-    res = @base.render("../rhtml/standard")
-    assert !(res.nil? || res.empty?)
-
-    # Register Haml stuff in @base...
-    @base.render("standard") 
-
-    # Does it still render?
-    res = @base.render("../rhtml/standard")
-    assert !(res.nil? || res.empty?)
-  end
-
   def test_haml_options
     Haml::Template.options = { :suppress_eval => true }
     assert_equal({ :suppress_eval => true }, Haml::Template.options)