radiant 0.6.7 → 0.6.8

data/vendor/plugins/haml/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/vendor/plugins/haml/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/vendor/plugins/haml/lib/sass/css.rb

@@ -46,25 +46,40 @@ module Sass
   # It keeps the semantics and most of the efficiency of normal hashes
   # while also keeping track of the order in which elements were set.
   class OrderedHash
-    Node = Struct.new('Node', :key, :value, :next)
+    Node = Struct.new(:key, :value, :next, :prev)
     include Enumerable
 
     def initialize
       @hash = {}
     end
 
+    def initialize_copy(other)
+      @hash = other.instance_variable_get('@hash').clone
+    end
+
     def [](key)
       @hash[key] && @hash[key].value
     end
 
     def []=(key, value)
-      node = Node.new(key, value, nil)
+      node = Node.new(key, value)
+
+      if old = @hash[key]
+        if old.prev
+          old.prev.next = old.next
+        else # old is @first and @last
+          @first = @last = nil
+        end
+      end
+
       if @first.nil?
         @first = @last = node
       else
+        node.prev = @last
         @last.next = node
         @last = node
       end
+
       @hash[key] = node
       value
     end

data/vendor/plugins/haml/lib/sass/engine.rb

@@ -76,7 +76,7 @@ module Sass
         :style => :nested,
         :load_paths => ['.']
       }.merge! options
-      @template = template.split(/\n?\r|\r?\n/)
+      @template = template.split(/\r\n|\r|\n/)
       @lines = []
       @constants = {"important" => "!important"}
       @mixins = {}
@@ -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/vendor/plugins/haml/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)
@@ -52,7 +64,7 @@ END
   end
 
   def test_attributes_should_render_correctly
-    assert_equal("<div class='atlantis' style='ugly'>\n</div>", render(".atlantis{:style => 'ugly'}").chomp)
+    assert_equal("<div class='atlantis' style='ugly'></div>", render(".atlantis{:style => 'ugly'}").chomp)
   end
 
   def test_ruby_code_should_work_inside_attributes
@@ -61,7 +73,7 @@ END
   end
 
   def test_nil_should_render_empty_tag
-    assert_equal("<div class='no_attributes'>\n</div>",
+    assert_equal("<div class='no_attributes'></div>",
                  render(".no_attributes{:nil => nil}").chomp)
   end
 
@@ -128,20 +140,38 @@ END
 
     assert_equal("<textarea>#{'a' * 100}</textarea>\n",
                  render("%textarea #{'a' * 100}"))
+
+    assert_equal("<p>\n  <textarea>Foo\n  Bar\n  Baz</textarea>\n</p>\n", render(<<SOURCE))
+%p
+  %textarea
+    Foo
+    Bar
+    Baz
+SOURCE
   end
 
   def test_boolean_attributes
-    assert_equal("<p bar baz='true' foo='bar'>\n</p>\n",
+    assert_equal("<p bar baz='true' foo='bar'></p>\n",
                  render("%p{:foo => 'bar', :bar => true, :baz => 'true'}", :format => :html4))
-    assert_equal("<p bar='bar' baz='true' foo='bar'>\n</p>\n",
+    assert_equal("<p bar='bar' baz='true' foo='bar'></p>\n",
                  render("%p{:foo => 'bar', :bar => true, :baz => 'true'}", :format => :xhtml))
 
-    assert_equal("<p baz='false' foo='bar'>\n</p>\n",
+    assert_equal("<p baz='false' foo='bar'></p>\n",
                  render("%p{:foo => 'bar', :bar => false, :baz => 'false'}", :format => :html4))
-    assert_equal("<p baz='false' foo='bar'>\n</p>\n",
+    assert_equal("<p baz='false' foo='bar'></p>\n",
                  render("%p{:foo => 'bar', :bar => false, :baz => 'false'}", :format => :xhtml))
   end
 
+  def test_both_whitespace_nukes_work_together
+    assert_equal(<<RESULT, render(<<SOURCE))
+<p><q>Foo
+  Bar</q></p>
+RESULT
+%p
+  %q><= "Foo\\nBar"
+SOURCE
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape
@@ -241,29 +271,22 @@ END
     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))
-
-    begin
-      assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))
-    rescue Haml::Error => err
-      caught = true
-      assert_equal('Filter "ruby" is not defined.', err.message)
-    end
-    assert(caught, "Rendering a ruby filter without evaluating didn't throw an error!")
+    assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))
   end
 
   def test_attr_wrapper
-    assert_equal("<p strange=*attrs*>\n</p>\n", render("%p{ :strange => 'attrs'}", :attr_wrapper => '*'))
-    assert_equal("<p escaped='quo\"te'>\n</p>\n", render("%p{ :escaped => 'quo\"te'}", :attr_wrapper => '"'))
-    assert_equal("<p escaped=\"quo'te\">\n</p>\n", render("%p{ :escaped => 'quo\\'te'}", :attr_wrapper => '"'))
-    assert_equal("<p escaped=\"q'uo&quot;te\">\n</p>\n", render("%p{ :escaped => 'q\\'uo\"te'}", :attr_wrapper => '"'))
+    assert_equal("<p strange=*attrs*></p>\n", render("%p{ :strange => 'attrs'}", :attr_wrapper => '*'))
+    assert_equal("<p escaped='quo\"te'></p>\n", render("%p{ :escaped => 'quo\"te'}", :attr_wrapper => '"'))
+    assert_equal("<p escaped=\"quo'te\"></p>\n", render("%p{ :escaped => 'quo\\'te'}", :attr_wrapper => '"'))
+    assert_equal("<p escaped=\"q'uo&quot;te\"></p>\n", render("%p{ :escaped => 'q\\'uo\"te'}", :attr_wrapper => '"'))
     assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n", render("!!! XML", :attr_wrapper => '"'))
   end
 
   def test_attrs_parsed_correctly
-    assert_equal("<p boom=>biddly='bar =&gt; baz'>\n</p>\n", render("%p{'boom=>biddly' => 'bar => baz'}"))
-    assert_equal("<p foo,bar='baz, qux'>\n</p>\n", render("%p{'foo,bar' => 'baz, qux'}"))
-    assert_equal("<p escaped='quo\nte'>\n</p>\n", render("%p{ :escaped => \"quo\\nte\"}"))
-    assert_equal("<p escaped='quo4te'>\n</p>\n", render("%p{ :escaped => \"quo\#{2 + 2}te\"}"))
+    assert_equal("<p boom=>biddly='bar =&gt; baz'></p>\n", render("%p{'boom=>biddly' => 'bar => baz'}"))
+    assert_equal("<p foo,bar='baz, qux'></p>\n", render("%p{'foo,bar' => 'baz, qux'}"))
+    assert_equal("<p escaped='quo\nte'></p>\n", render("%p{ :escaped => \"quo\\nte\"}"))
+    assert_equal("<p escaped='quo4te'></p>\n", render("%p{ :escaped => \"quo\#{2 + 2}te\"}"))
   end
   
   def test_correct_parsing_with_brackets
@@ -313,21 +336,9 @@ END
     assert_equal("<p>Paragraph!</p>\n", render("%p= text", :locals => { :text => "Paragraph!" }))
   end
 
-  def test_deprecated_locals_option
-    Kernel.module_eval do
-      def warn_with_stub(msg); end
-      alias_method :warn_without_stub, :warn
-      alias_method :warn, :warn_with_stub
-    end
-
-    assert_equal("<p>Paragraph!</p>\n", Haml::Engine.new("%p= text", :locals => { :text => "Paragraph!" }).render)
-
-    Kernel.module_eval { alias_method :warn, :warn_without_stub }
-  end
-
   def test_dynamic_attrs_shouldnt_register_as_literal_values
-    assert_equal("<p a='b2c'>\n</p>\n", render('%p{:a => "b#{1 + 1}c"}'))
-    assert_equal("<p a='b2c'>\n</p>\n", render("%p{:a => 'b' + (1 + 1).to_s + 'c'}"))
+    assert_equal("<p a='b2c'></p>\n", render('%p{:a => "b#{1 + 1}c"}'))
+    assert_equal("<p a='b2c'></p>\n", render("%p{:a => 'b' + (1 + 1).to_s + 'c'}"))
   end
 
   def test_dynamic_attrs_with_self_closed_tag
@@ -542,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)
@@ -559,11 +577,11 @@ END
   end
 
   def test_html_renders_empty_node_with_closing_tag
-    assert_equal %{<div class='foo'>\n</div>\n}, render(".foo", :format => :html4)
+    assert_equal "<div class='foo'></div>\n", render(".foo", :format => :html4)
   end
 
   def test_html_ignores_explicit_self_closing_declaration
-    assert_equal "<a>\n</a>\n", render("%a/", :format => :html4)
+    assert_equal "<a></a>\n", render("%a/", :format => :html4)
   end
 
   def test_html_ignores_xml_prolog_declaration

data/vendor/plugins/haml/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
@@ -141,12 +157,12 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_find_and_preserve_with_block
-    assert_equal("<pre>&#x000A;  Foo&#x000A;  Bar&#x000A;</pre>\nFoo\nBar\n",
+    assert_equal("<pre>Foo&#x000A;Bar</pre>\nFoo\nBar\n",
                  render("= find_and_preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
   end
 
   def test_preserve_with_block
-    assert_equal("<pre>&#x000A;  Foo&#x000A;  Bar&#x000A;</pre>&#x000A;Foo&#x000A;Bar&#x000A;\n",
+    assert_equal("<pre>Foo&#x000A;Bar</pre>&#x000A;Foo&#x000A;Bar\n",
                  render("= preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
   end
 

data/vendor/plugins/haml/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/vendor/plugins/haml/test/haml/results/content_for_layout.xhtml

@@ -1,7 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-  <head>
-  </head>
+  <head></head>
   <body>
     <div id='content'>
       Lorem ipsum dolor sit amet

data/vendor/plugins/haml/test/haml/results/eval_suppressed.xhtml

@@ -1,7 +1,5 @@
-<p>
-</p>
-<p>
-</p>
+<p></p>
+<p></p>
 <h1>Me!</h1>
 <div id='foo'>
   <p id='bar'>All</p>

data/vendor/plugins/haml/test/haml/results/filters.xhtml

@@ -11,9 +11,7 @@ TESTING HAHAHAHA!
 <h1>Foo</h1>
 
 
-	<pre><code>This is preformatted!
-Look at that!
-Wowie-zowie!</code></pre>
+	<pre><code>This is preformatted!&#x000A;Look at that!&#x000A;Wowie-zowie!</code></pre>
 
 
 	<p><strong>boldilicious!</strong></p>
@@ -40,10 +38,8 @@ This
  \#{also not}
  \\
 <p>
-  <pre>
-This pre is pretty deeply&#x000A;      nested.&#x000A;   Does interpolation work?&#x000A;
-  This one is, too.&#x000A;Nested, that is.&#x000A;&#x000A;
-  </pre>
+  <pre>This pre is pretty deeply&#x000A;      nested.&#x000A;   Does interpolation work?
+    This one is, too.&#x000A;Nested, that is.&#x000A;</pre>
 </p>
 <ul>
 
@@ -71,6 +67,12 @@ This pre is pretty deeply&#x000A;      nested.&#x000A;   Does interpolation work
 
 </ul>
 <div class='res'>178</div>
+<p>
+  <p>I like preserved text:</p>
+  
+  
+  	<pre><code>Foo&#x000A;  Bar!&#x000A;Baz</code></pre>
+</p>
 <ul>
 <li>Foo</li>
 <li>Bar</li>
@@ -79,4 +81,6 @@ This pre is pretty deeply&#x000A;      nested.&#x000A;   Does interpolation work
 Text!
 Hello, World!
 How are you doing today?
-
+&lt;div class=&quot;foo&quot;&gt;
+  &lt;p&gt;I think &amp;mdash; or do I?&lt;/p&gt;
+&lt;/div&gt;

data/vendor/plugins/haml/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/vendor/plugins/haml/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>
@@ -59,6 +58,5 @@ testtest
 <p class='article foo' id='article_1'>Blah</p>
 <p class='article quux qux' id='article_1'>Blump</p>
 Woah inner quotes
-<p class='dynamic_quote' dyn='3' quotes="single '">
-</p>
+<p class='dynamic_quote' dyn='3' quotes="single '"></p>
 <p class='dynamic_self_closing' dyn='3' />