haml 1.5.2 → 1.7.0

data/lib/sass/error.rb

@@ -23,9 +23,9 @@ module Sass
     # +filename+ should be the file in which the error occurred,
     # if applicable (defaults to "(sass)").
     def add_backtrace_entry(filename) # :nodoc:
-      @sass_filename = filename
+      @sass_filename ||= filename
       self.backtrace ||= []
-      self.backtrace.unshift "#{filename || '(sass)'}:#{@sass_line}"
+      self.backtrace.unshift "#{@sass_filename || '(sass)'}:#{@sass_line}"
     end
 
     def to_s # :nodoc:

data/lib/sass/plugin.rb

@@ -37,9 +37,11 @@ module Sass
       # from <tt>options[:templates]</tt>
       # if it does.
       def update_stylesheets
-        Dir[options[:template_location] + '/*.sass'].each do |file|
-          name = File.basename(file)[0...-5]
+        Dir.glob(File.join(options[:template_location], "**", "*.sass")).entries.each do |file|
           
+          # Get the relative path to the file with no extension
+          name = file.sub(options[:template_location] + "/", "")[0...-5]
+                    
           if options[:always_update] || stylesheet_needs_update?(name)
             css = css_filename(name)
             File.delete(css) if File.exists?(css)
@@ -47,6 +49,7 @@ module Sass
             filename = template_filename(name)
             l_options = @@options.dup
             l_options[:filename] = filename
+            l_options[:load_paths] = (l_options[:load_paths] || []) + [l_options[:template_location]]
             engine = Engine.new(File.read(filename), l_options)
             begin
               result = engine.render
@@ -78,7 +81,12 @@ module Sass
               end
             end
             
-            Dir.mkdir(l_options[:css_location]) unless File.exist?(l_options[:css_location])
+            # Create any directories that might be necessary
+            dirs = [l_options[:css_location]]
+            name.split("/")[0...-1].each { |dir| dirs << "#{dirs[-1]}/#{dir}" }
+            dirs.each { |dir| Dir.mkdir(dir) unless File.exist?(dir) }
+            
+            # Finally, write the file
             File.open(css, 'w') do |file|
               file.print(result)
             end

data/lib/sass/tree/attr_node.rb

@@ -10,29 +10,31 @@ module Sass::Tree
     end
     
     def to_s(parent_name = nil)
-      if name[-1] == ?: || value[-1] == ?;
+      if value[-1] == ?;
         raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (This isn't CSS!)", @line)
       end
       real_name = name
       real_name = "#{parent_name}-#{real_name}" if parent_name
-      if children.size > 0
-        to_return = String.new
-        children.each do |kid|
-          if @style == :compact
-            to_return << "#{kid.to_s(real_name)} "
-          else
-            to_return << "#{kid.to_s(real_name)}\n"
-          end
-        end
-        to_return << "\n" unless @style == :compact
-        to_return[0...-1]
-      else
-        if value.length < 1
-          raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump}", @line)
-        end
 
-        "#{real_name}: #{value};"
+      if value.empty? && children.empty?
+        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump}", @line)
+      end
+
+      join_string = @style == :compact ? ' ' : "\n"
+      to_return = ''
+      if !value.empty?
+        to_return << "#{real_name}: #{value};#{join_string}"
+      end
+
+      children.each do |kid|
+        if @style == :compact
+          to_return << "#{kid.to_s(real_name)} "
+        else
+          to_return << "#{kid.to_s(real_name)}\n"
+        end
       end
+      to_return << "\n" unless children.empty? || @style == :compact
+      to_return[0...-1]
     end
 
     private
@@ -40,5 +42,11 @@ module Sass::Tree
     def declaration
       ":#{name} #{value}"
     end
+
+    def invalid_child?(child)
+      if !child.is_a?(AttrNode)
+        "Illegal nesting: Only attributes may be nested beneath attributes."
+      end
+    end
   end
 end

data/lib/sass/tree/comment_node.rb

@@ -0,0 +1,14 @@
+require 'sass/tree/node'
+
+module Sass::Tree
+  class CommentNode < ValueNode
+    def initialize(value, style)
+      super(value[2..-1].strip, style)
+    end
+
+    def to_s(parent_name = nil)
+      join_string = @style == :compact ? ' ' : "\n * "
+      "/* #{value}#{join_string unless children.empty?}#{children.join join_string} */"
+    end
+  end
+end

data/lib/sass/tree/node.rb

@@ -3,6 +3,7 @@ module Sass
     class Node
       attr_accessor :children
       attr_accessor :line
+      attr_accessor :filename
 
       def initialize(style)
         @style = style
@@ -10,6 +11,9 @@ module Sass
       end
 
       def <<(child)
+        if msg = invalid_child?(child)
+          raise Sass::SyntaxError.new(msg, child.line)
+        end
         @children << child
       end
       
@@ -20,10 +24,23 @@ module Sass
             raise SyntaxError.new('Attributes aren\'t allowed at the root of a document.', child.line)
           end
 
-          result += "#{child.to_s(1)}\n"
+          begin
+            result += "#{child.to_s(1)}\n"
+          rescue SyntaxError => e
+            raise e
+          end
         end
         result[0...-1]
       end
+
+      private
+
+      # This method should be overridden by subclasses to return an error message
+      # if the given child node is invalid,
+      # and false or nil otherwise.
+      def invalid_child?(child)
+        false
+      end
     end
   end
 end

data/lib/sass/tree/rule_node.rb

@@ -3,6 +3,9 @@ require 'sass/tree/attr_node'
 
 module Sass::Tree
   class RuleNode < ValueNode
+    # The character used to include the parent selector
+    PARENT = '&'
+
     alias_method :rule, :value
     alias_method :rule=, :value=
     
@@ -11,17 +14,25 @@ module Sass::Tree
       sub_rules = []
       total_rule = if super_rules
         super_rules.split(/,\s*/).collect! do |s|
-          self.rule.split(/,\s*/).collect! {|r| "#{s} #{r}"}.join(", ")
+          self.rule.split(/,\s*/).collect do |r|
+            if r.include?(PARENT)
+              r.gsub(PARENT, s)
+            else
+              "#{s} #{r}"
+            end
+          end.join(", ")
         end.join(", ")
+      elsif self.rule.include?(PARENT)
+        raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '#{PARENT}'", line)
       else
         self.rule
       end
       
       children.each do |child|
-        if child.is_a? AttrNode
-          attributes << child
-        else
+        if child.is_a? RuleNode
           sub_rules << child
+        else
+          attributes << child
         end
       end
       
@@ -40,7 +51,8 @@ module Sass::Tree
         end
       end
       
-      sub_rules.each { |sub| to_return << sub.to_s(tabs + 1, total_rule) }
+      tabs += 1 unless attributes.empty?
+      sub_rules.each { |sub| to_return << sub.to_s(tabs, total_rule) }
       to_return
     end
   end

data/lib/sass/tree/value_node.rb

@@ -8,5 +8,9 @@ module Sass::Tree
       @value = value
       super(style)
     end
+
+    def to_s(tabs = 0)
+      value
+    end
   end
 end

data/test/haml/engine_test.rb

@@ -53,12 +53,18 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<strong>Hi there!</strong>\n", engine.to_html)
   end
 
+  def test_double_equals
+    assert_equal("<p>Hello World</p>\n", render('%p== Hello #{who}', :locals => {:who => 'World'}))
+    assert_equal("<p>\n  Hello World\n</p>\n", render("%p\n  == Hello \#{who}", :locals => {:who => 'World'}))
+  end
+
   # Options tests
 
   def test_stop_eval
     assert_equal("", render("= 'Hello'", :suppress_eval => true))
-    assert_equal("", render("- _hamlout << 'foo'", :suppress_eval => true))
-    assert_equal("<div id='foo' />\n", render("#foo{:yes => 'no'}/", :suppress_eval => true))
+    assert_equal("", render("- puts '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))
 
     begin
@@ -77,27 +83,30 @@ class EngineTest < Test::Unit::TestCase
     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 => 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\"}"))
+  end
+
   def test_locals
     assert_equal("<p>Paragraph!</p>\n", render("%p= text", :locals => { :text => "Paragraph!" }))
   end
+  
+  def test_recompile_with_new_locals
+    template = "%p= (text == 'first time') ? text : new_text"
+    assert_equal("<p>first time</p>\n", render(template, :locals => { :text => "first time" }))
+    assert_equal("<p>second time</p>\n", render(template, :locals => { :text => "recompile", :new_text => "second time" }))
 
-  def test_precompiled
-    precompiled = <<-END
-      def _haml_render
-        _hamlout = @haml_stack[-1]
-        _erbout = _hamlout.buffer
-
-        _hamlout.open_tag("p", 0, nil, true, "", nil, nil, false)
-        @haml_lineno = 1
-        haml_temp =  "Haml Rocks Socks"
-        haml_temp = _hamlout.push_script(haml_temp, 1, false)
-        _hamlout.close_tag("p", 0)
-      end
-    END
+    # Make sure the method called will return junk unless recompiled
+    method_name = Haml::Engine.send(:class_variable_get, '@@method_names')[template]
+    Haml::Engine::CompiledTemplates.module_eval "def #{method_name}(stuff); @haml_stack[-1].push_text 'NOT RECOMPILED', 0; end"
 
-    assert_equal("<p>Haml Rocks Socks</p>\n", render("%h1 I shall not be rendered", :precompiled => precompiled))
+    assert_equal("NOT RECOMPILED\n", render(template, :locals => { :text => "first time" }))
+    assert_equal("<p>first time</p>\n", render(template, :locals => { :text => "first time", :foo => 'bar' }))
   end
-  
+    
   def test_comps
     assert_equal(-1, "foo" <=> nil)
     assert_equal(1, nil <=> "foo")
@@ -105,12 +114,9 @@ class EngineTest < Test::Unit::TestCase
 
   def test_rec_merge
     hash1 = {1=>2, 3=>{5=>7, 8=>9}}
-    hash1_2 = hash1.clone
     hash2 = {4=>5, 3=>{5=>2, 16=>12}}
     hash3 = {1=>2, 4=>5, 3=>{5=>2, 8=>9, 16=>12}}
 
-    assert_equal(hash3, hash1.rec_merge(hash2))
-    assert_equal(hash1_2, hash1)
     hash1.rec_merge!(hash2)
     assert_equal(hash3, hash1)
   end
@@ -131,11 +137,11 @@ class EngineTest < Test::Unit::TestCase
 
   def test_syntax_errors
     errs = [ "!!!\n  a", "a\n  b", "a\n:foo\nb", "/ a\n  b",
-      "% a", "%p a\n  b", "a\n%p=\nb", "%p=\n  a",
-      "a\n%p~\nb", "a\n~\nb", "%p/\n  a", "%p\n \t%a b",
-      "%a\n b\nc", "%a\n    b\nc",
-      ":notafilter\n  This isn't\n  a filter!",
-    ]
+             "% a", "%p a\n  b", "a\n%p=\nb", "%p=\n  a",
+             "a\n%p~\nb", "a\n~\nb", "a\n~\n  b", "%p~\n  b", "%p/\n  a",
+             "%p\n \t%a b", "%a\n b\nc", "%a\n    b\nc",
+             ":notafilter\n  This isn't\n  a filter!",
+             ".{} a", "\#{} a", ".= 'foo'", "%a/ b" ]
     errs.each do |err|
       begin
         render(err)
@@ -228,4 +234,15 @@ class EngineTest < Test::Unit::TestCase
 
     NOT_LOADED.delete 'redcloth'
   end
+
+  def test_local_assigns_dont_modify_class
+    assert_equal("bar\n", render("= foo", :locals => {:foo => 'bar'}))
+    assert_equal(nil, defined?(foo))
+  end
+
+  def test_object_ref_with_nil_id
+    user = Struct.new('User', :id).new
+    assert_equal("<p class='struct_user' id='struct_user_new'>New User</p>\n",
+                 render("%p[user] New User", :locals => {:user => user}))
+  end
 end

data/test/haml/helper_test.rb

@@ -17,7 +17,8 @@ class HelperTest < Test::Unit::TestCase
     if options == :action_view
       @base.render :inline => text, :type => :haml
     else
-      Haml::Engine.new(text, options).to_html
+      scope = options.delete :scope_object
+      Haml::Engine.new(text, options).to_html(scope ? scope : Object.new)
     end
   end
 
@@ -34,7 +35,7 @@ class HelperTest < Test::Unit::TestCase
 
   def test_list_of_should_render_correctly
     assert_equal("<li>1</li>\n<li>2</li>\n", render("= list_of([1, 2]) do |i|\n  = i"))
-    assert_equal("<li>1</li>\n", render("= list_of([[1]]) do |i|\n  = i.first"))
+    assert_equal("<li>[1]</li>\n", render("= list_of([[1]]) do |i|\n  = i.inspect"))
     assert_equal("<li>\n  <h1>Fee</h1>\n  <p>A word!</p>\n</li>\n<li>\n  <h1>Fi</h1>\n  <p>A word!</p>\n</li>\n<li>\n  <h1>Fo</h1>\n  <p>A word!</p>\n</li>\n<li>\n  <h1>Fum</h1>\n  <p>A word!</p>\n</li>\n",
       render("= list_of(['Fee', 'Fi', 'Fo', 'Fum']) do |title|\n  %h1= title\n  %p A word!"))
   end
@@ -64,7 +65,7 @@ class HelperTest < Test::Unit::TestCase
       ActionView::Base.new.render(:inline => "<%= concat('foo') %>")
     rescue ArgumentError, NameError
       proper_behavior = true
-    end
+    end    
     assert(proper_behavior)
   end
   
@@ -106,5 +107,29 @@ class HelperTest < Test::Unit::TestCase
     assert_equal("false", @base.render(:inline => '<%= is_haml? %>'))
     assert_equal("false\n", render("= render :inline => '<%= is_haml? %>'", :action_view))
   end
+
+  def test_page_class
+    controller = Struct.new(:controller_name, :action_name).new('troller', 'tion')
+    scope = Struct.new(:controller).new(controller)
+    result = render("%div{:class => page_class} MyDiv", :scope_object => scope)
+    expected = "<div class='troller tion'>MyDiv</div>\n"
+    assert_equal expected, result
+  end
+
+  def test_indented_capture
+    assert_equal("  \n  Foo\n  ", @base.render(:inline => "  <% res = capture do %>\n  Foo\n  <% end %><%= res %>"))
+  end
+
+  def test_capture_deals_properly_with_collections
+    Haml::Helpers.module_eval do 
+      def trc(collection, &block)
+        collection.each do |record|
+          puts capture_haml(record, &block)
+        end
+      end
+    end
+
+    assert_equal("1\n\n2\n\n3\n\n", render("- trc([1, 2, 3]) do |i|\n  = i.inspect"))
+  end
 end
 

data/test/haml/results/eval_suppressed.xhtml

@@ -1,2 +1,8 @@
 <p></p>
 <h1>Me!</h1>
+<div id='foo'>
+  <p id='bar'>All</p>
+  <br />
+  <p class='baz'>This</p>
+  Should render
+</div>

data/test/haml/results/helpers.xhtml

@@ -45,9 +45,11 @@
 click
 <a href='thing'>here</a>.
 <p>baz</p>
-                    <p>boom</p>
+                  <p>boom</p>
 foo
-<form action="hello/world" method="post">
+<p>
+  <form action="hello/world" method="post">
+</p>
 <form action="heeheeaform" method="post">
   <div><input name="commit" type="submit" value="save" /></div>
 </form>
@@ -58,3 +60,25 @@ foo
   <input id="article_body" name="article[body]" size="30" type="text" value="World" />
 </form>
 <li><a href='http://www.google.com'>google</a></li>
+<p>
+  foo
+  <div>
+    bar
+  </div>
+  boom
+  baz
+  boom, again
+</p>
+<table>
+  <tr>
+    <td class='cell'>
+      <strong>
+        strong!
+      </strong>
+      data
+    </td>
+    <td>
+      more_data
+    </td>
+  </tr>
+</table>

data/test/haml/results/helpful.xhtml

@@ -6,3 +6,5 @@
 <div class='article class' id='article_1'>class</div>
 <div class='article class' id='id_article_1'>id class</div>
 <div class='article full' id='article_1'>boo</div>
+<div class='article full' id='article_1'>moo</div>
+<div class='article articleFull' id='article_1'>foo</div>