haml 1.7.2 → 1.8.0

data/test/haml/templates/_av_partial_1.haml

@@ -0,0 +1,9 @@
+%h2 This is a pretty complicated partial
+.partial
+  %p It has several nested partials,
+  %ul
+    - 5.times do
+      %li
+        %strong Partial:
+        - @nesting = 5
+        = render :partial => 'haml/templates/av_partial_2'

data/test/haml/templates/_av_partial_2.haml

@@ -0,0 +1,5 @@
+- @nesting -= 1
+.partial{:level => @nesting}
+  %h3 This is a crazy deep-nested partial.
+  %p== Nesting level #{@nesting}
+  = render :partial => 'haml/templates/av_partial_2' if @nesting > 0

data/test/haml/templates/action_view.haml

@@ -0,0 +1,47 @@
+!!!
+%html{html_attrs}
+  %head
+    %title Hampton Catlin Is Totally Awesome
+    %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
+  %body
+    %h1
+      This is very much like the standard template,
+      except that it has some ActionView-specific stuff.
+      It's only used for benchmarking.
+    .crazy_partials= render :partial => 'haml/templates/av_partial_1'
+    / You're In my house now!
+    .header
+      Yes, ladies and gentileman. He is just that egotistical.
+      Fantastic! This should be multi-line output
+      The question is if this would translate! Ahah!
+      = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
+    #body= " Quotes should be loved! Just like people!"
+    - 120.times do |number|
+      - number
+    Wow.|
+    %p
+      = "Holy cow        " + |
+        "multiline       " + |      
+        "tags!           " + |
+        "A pipe (|) even!"   |
+      = [1, 2, 3].collect { |n| "PipesIgnored|" }
+      = [1, 2, 3].collect { |n|     |
+          n.to_s                    |
+        }.join("|")                 |
+    %div.silent
+      - foo = String.new
+      - foo << "this"
+      - foo << " shouldn't"
+      - foo << " evaluate"
+      = foo + " but now it should!"
+      -# Woah crap a comment!
+
+    -# That was a line that shouldn't close everything.
+    %ul.really.cool
+      - ('a'..'f').each do |a|
+        %li= a
+    #combo.of_divs_with_underscore= @should_eval = "with this text"
+    = [ 104, 101, 108, 108, 111 ].map do |byte|
+      - byte.chr
+    .footer
+      %strong.shout= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid. \nSo, I'm just making it *really* long. God, I hope this works"

data/test/haml/templates/eval_suppressed.haml

@@ -2,6 +2,7 @@
 = "nor me!"
 - puts "not even me!"
 %p= "NO!"
+%p~ "UH-UH!"
 %h1 Me!
 #foo
   %p#bar All

data/test/haml/templates/helpers.haml

@@ -36,11 +36,15 @@ click
 - concat "foo\n"
 - buffer.tabulation = 0
 - def url_for(*stuff); stuff.join(' '); end
+-# The form URLs must be empty
+-# because of a weird bug that causes url_for to misbehave.
 %p
-  = form_tag 'hello/world'
-- form_tag 'heeheeaform' do
+  = form_tag ''
+- form_tag '' do
   %div= submit_tag 'save'
-- form_for :article, @article, :url => 'article_url' do |f|
+  - @foo = 'value one'
+  = render :partial => './partial'
+- form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:
@@ -61,3 +65,5 @@ click
       - puts "data"
     - open :td do
       - puts "more_data"
+- open :hr
+- open :div, ''

data/test/haml/templates/just_stuff.haml

@@ -11,6 +11,14 @@
 == Embedded? #{true}!
 - embedded = true
 == Embedded? #{embedded}!
+== Embedded? #{"twice! #{true}"}!
+== Embedded? #{"one"} af"t"er #{"another"}!
+%p== Embedded? false!
+%p== Embedded? #{true}!
+- embedded = true
+%p== Embedded? #{embedded}!
+%p== Embedded? #{"twice! #{true}"}!
+%p== Embedded? #{"one"} af"t"er #{"another"}!
 .render= render :inline => "%em= 'wow!'", :type => :haml
 = "stuff followed by whitespace"
   
@@ -33,7 +41,8 @@
 -#
   Nested Haml comment
   - raise 'dead'
-%p{ :class => "" } class attribute shouldn't appear!
+%p{ :class => "" } class attribute should appear!
+%p{ :gorbachev => nil } this attribute shouldn't appear
 /[if lte IE6] conditional comment!
 /[if gte IE7]
   %p Block conditional comment

data/test/haml/templates/partials.haml

@@ -1,3 +1,4 @@
+- @foo = 'value one'
 %p
   @foo = 
   = @foo
@@ -9,4 +10,3 @@
 %p
   @foo = 
   = @foo
-- @foo = 'value one'

data/test/haml/templates/standard.haml

@@ -5,7 +5,6 @@
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
   %body
     / You're In my house now!
-    - concat("foo\n")
     .header
       Yes, ladies and gentileman. He is just that egotistical.
       Fantastic! This should be multi-line output

data/test/profile.rb

@@ -5,6 +5,7 @@ require 'action_view'
 
 require File.dirname(__FILE__) + '/../lib/haml'
 require 'haml/template'
+
 require 'profiler'
 require 'stringio'
 
@@ -35,7 +36,6 @@ module Haml
     # Creates a new profiler that looks for templates in the base
     # directory.
     def initialize(base = File.join(File.dirname(__FILE__), 'haml', 'templates'))
-      ActionView::Base.register_template_handler("haml", Haml::Template)
       unless base.class == ActionView::Base
         @base = ActionView::Base.new(base)
       else
@@ -48,7 +48,7 @@ module Haml
     # automatically look for a haml template.
     # 
     # Returns the results of the profiling as a string.
-    def profile(runs = 100, template_name = 'standard')
+    def profile(runs = 100, template_name = 'standard')      
       AbstractProfiler.profile(runs) { @base.render template_name }
     end
   end

data/test/sass/engine_test.rb

@@ -39,11 +39,13 @@ class SassEngineTest < Test::Unit::TestCase
     "!a = 1b + 2c" => "Incompatible units: b and c",
     "& a\n  :b c" => "Base-level rules cannot contain the parent-selector-referencing character '&'",
     "a\n  :b\n    c" => "Illegal nesting: Only attributes may be nested beneath attributes.",
+    "a,\n  :b c" => "Rules can\'t end in commas.",
     "!a = b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath constants.",
     "@import foo.sass" => "File to import not found or unreadable: foo.sass",
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
-    "@foo    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
+    "!foo = bar baz !" => "Unterminated constant.",
+    "!foo = !(foo)" => "Invalid constant.",
   }
   
   def test_basic_render
@@ -54,6 +56,7 @@ class SassEngineTest < Test::Unit::TestCase
     renders_correctly "expanded", { :style => :expanded }
     renders_correctly "compact", { :style => :compact }
     renders_correctly "nested", { :style => :nested }
+    renders_correctly "compressed", { :style => :compressed }
   end
   
   def test_exceptions
@@ -95,12 +98,119 @@ class SassEngineTest < Test::Unit::TestCase
     end
   end
 
-  def test_empty_first_line
-    assert_equal("#a {\n  b: c; }\n", Sass::Engine.new("#a\n\n  b: c").render)
+  def test_default_function
+    assert_equal("foo {\n  bar: url(foo.png); }\n",
+                 render("foo\n  bar = url(foo.png)\n"));
+  end
+
+  def test_multiline_selector
+    assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
+                 render("#foo #bar,\n#baz #boom\n  :foo bar"))
+    assert_equal("#foo #bar,\n#foo #baz {\n  foo: bar; }\n",
+                 render("#foo\n  #bar,\n  #baz\n    :foo bar"))
+    assert_equal("#foo #bar, #baz #boom { foo: bar; }\n",
+                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compact))
+                 
+    assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
+                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
+  end
+
+  def test_colon_only
+    begin
+      render("a\n  b: c", :attribute_syntax => :normal)
+    rescue Sass::SyntaxError => e
+      assert_equal("Illegal attribute syntax: can't use alternate syntax when :attribute_syntax => :normal is set.",
+                   e.message)
+    else
+      assert(false, "SyntaxError not raised for :attribute_syntax => :normal")
+    end
+
+    begin
+      render("a\n  :b c", :attribute_syntax => :alternate)
+    rescue Sass::SyntaxError => e
+      assert_equal("Illegal attribute syntax: can't use normal syntax when :attribute_syntax => :alternate is set.",
+                   e.message)
+    else
+      assert(false, "SyntaxError not raised for :attribute_syntax => :alternate")
+    end
   end
+
+  def test_directive
+    assert_equal("@a b;", render("@a b"))
+
+    assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
+    assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
+    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  :b c", :style => :expanded))
+    assert_equal("@a{b:c}\n", render("@a\n  :b c", :style => :compressed))
+
+    assert_equal("@a {\n  b: c;\n  d: e; }\n",
+                 render("@a\n  :b c\n  :d e"))
+    assert_equal("@a { b: c; d: e; }\n",
+                 render("@a\n  :b c\n  :d e", :style => :compact))
+    assert_equal("@a {\n  b: c;\n  d: e;\n}\n",
+                 render("@a\n  :b c\n  :d e", :style => :expanded))
+    assert_equal("@a{b:c;d:e}\n",
+                 render("@a\n  :b c\n  :d e", :style => :compressed))
+
+    assert_equal("@a {\n  #b {\n    c: d; } }\n",
+                 render("@a\n  #b\n    :c d"))
+    assert_equal("@a { #b { c: d; } }\n",
+                 render("@a\n  #b\n    :c d", :style => :compact))
+    assert_equal("@a {\n  #b {\n    c: d;\n  }\n}\n",
+                 render("@a\n  #b\n    :c d", :style => :expanded))
+    assert_equal("@a{#b{c:d}}\n",
+                 render("@a\n  #b\n    :c d", :style => :compressed))
+
+    assert_equal("@a {\n  #b {\n    a: b; }\n    #b #c {\n      d: e; } }\n",
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e"))
+    assert_equal("@a { #b { a: b; }\n  #b #c { d: e; } }\n",
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compact))
+    assert_equal("@a {\n  #b {\n    a: b;\n  }\n  #b #c {\n    d: e;\n  }\n}\n",
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :expanded))
+    assert_equal("@a{#b{a:b}#b #c{d:e}}\n",
+                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compressed))
+                 
+    assert_equal("@a {\n  #foo,\n  #bar {\n    b: c; } }\n",
+                 render("@a\n  #foo, \n  #bar\n    :b c"))
+    assert_equal("@a { #foo, #bar { b: c; } }\n",
+                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compact))
+    assert_equal("@a {\n  #foo,\n  #bar {\n    b: c;\n  }\n}\n",
+                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :expanded))
+    assert_equal("@a{#foo,#bar{b:c}}\n",
+                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compressed))
+
+    to_render = <<END
+@a
+  :b c
+  #d
+    :e f
+  :g h
+END
+    rendered = <<END
+@a { b: c;
+  #d { e: f; }
+  g: h; }
+END
+    assert_equal(rendered, render(to_render, :style => :compact))
     
+    assert_equal("@a{b:c;#d{e:f}g:h}\n", render(to_render, :style => :compressed))
+  end
+
+  def test_empty_first_line
+    assert_equal("#a {\n  b: c; }\n", render("#a\n\n  b: c"))
+  end
+
+  def test_escaped_rule
+    assert_equal(":focus {\n  a: b; }\n", render("\\:focus\n  a: b"))
+    assert_equal("a {\n  b: c; }\n  a :focus {\n    d: e; }\n", render("\\a\n  b: c\n  \\:focus\n    d: e"))
+  end
+  
   private
 
+  def render(sass, options = {})
+    Sass::Engine.new(sass, options).render
+  end
+
   def renders_correctly(name, options={})
     sass_file  = load_file(name, "sass")
     css_file   = load_file(name, "css")

data/test/sass/engine_test.rb.rej

@@ -0,0 +1,18 @@
+***************
+*** 44,49 ****
+      "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
+      "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
+      "@foo    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
+    }
+    
+    def test_basic_render
+--- 44,52 ----
+      "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
+      "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
+      "@foo    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
++     "!foo = bar baz -" => "Unterminated unary minus.",
++     "!foo = bar baz !" => "Unterminated constant.",
++     "!foo = !(foo)" => "Invalid constant.",
+    }
+    
+    def test_basic_render

data/test/sass/plugin_test.rb

@@ -22,7 +22,7 @@ class SassPluginTest < Test::Unit::TestCase
     set_plugin_opts
     Sass::Plugin.update_stylesheets
   end
-  
+
   def teardown
     FileUtils.rm_r File.dirname(__FILE__) + '/tmp'
   end
@@ -30,14 +30,30 @@ class SassPluginTest < Test::Unit::TestCase
   def test_templates_should_render_correctly
     @@templates.each { |name| assert_renders_correctly(name) }
   end
-  
+
   def test_no_update
     File.delete(tempfile_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('basic')
     Sass::Plugin.update_stylesheets
     assert !Sass::Plugin.stylesheet_needs_update?('basic')
   end
-  
+
+  def test_update_needed_when_modified
+    sleep(1)
+    FileUtils.touch(template_loc('basic'))
+    assert Sass::Plugin.stylesheet_needs_update?('basic')
+    Sass::Plugin.update_stylesheets
+    assert !Sass::Plugin.stylesheet_needs_update?('basic')
+  end
+
+  def test_update_needed_when_dependency_modified
+    sleep(1)
+    FileUtils.touch(template_loc('basic'))
+    assert Sass::Plugin.stylesheet_needs_update?('import')
+    Sass::Plugin.update_stylesheets
+    assert !Sass::Plugin.stylesheet_needs_update?('import')
+  end
+
   def test_full_exception_handling
     File.delete(tempfile_loc('bork'))
     Sass::Plugin.update_stylesheets
@@ -57,13 +73,13 @@ class SassPluginTest < Test::Unit::TestCase
 
     Sass::Plugin.options[:full_exception] = true
   end
-  
-  def test_rails_update
+
+  def test_rails_update    
     File.delete(tempfile_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('basic')
-    
+
     ActionController::Base.new.process
-    
+
     assert !Sass::Plugin.stylesheet_needs_update?('basic')
   end
 
@@ -87,20 +103,27 @@ class SassPluginTest < Test::Unit::TestCase
     assert !Sass::Plugin.stylesheet_needs_update?('basic')
   end
 
+  def test_doesnt_render_partials
+    assert !File.exists?(tempfile_loc('_partial'))
+  end
 
  private
- 
+
   def assert_renders_correctly(name)
     File.read(result_loc(name)).split("\n").zip(File.read(tempfile_loc(name)).split("\n")).each_with_index do |pair, line|
       message = "template: #{name}\nline:     #{line + 1}"
       assert_equal(pair.first, pair.last, message)
     end
   end
-  
+
+  def template_loc(name)
+    File.dirname(__FILE__) + "/templates/#{name}.sass"
+  end
+
   def tempfile_loc(name)
     File.dirname(__FILE__) + "/tmp/#{name}.css"
   end
-  
+
   def result_loc(name)
     File.dirname(__FILE__) + "/results/#{name}.css"
   end
@@ -124,7 +147,7 @@ end
 
 class Sass::Engine
   alias_method :old_render, :render
-  
+
   def render
     raise "bork bork bork!" if @template[0] == "{bork now!}"
     old_render

data/test/sass/results/compact.css

@@ -1,5 +1,5 @@
 #main { width: 15em; color: #0000ff; }
-#main p { border-style: dotted; border-width: 2px; }
+#main p { border-style: dotted; /* Nested comment More nested stuff */ border-width: 2px; }
 #main .cool { width: 100px; }
 
 #left { font-size: 2em; font-weight: bold; float: left; }

data/test/sass/results/complex.css

@@ -3,7 +3,7 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 #page { width: 900px; margin: 0 auto; background: #440008; border-top-width: 5px; border-top-style: solid; border-top-color: #ff8500; }
 
 #header { height: 75px; padding: 0; }
-#header h1 { float: left; width: 274px; height: 75px; margin: 0; background-image: url(/images/global_logo.gif); background-repeat: no-repeat; text-indent: -9999px; }
+#header h1 { float: left; width: 274px; height: 75px; margin: 0; background-image: url(/images/global_logo.gif); /* Crazy nested comment */ background-repeat: no-repeat; text-indent: -9999px; }
 #header .status { float: right; padding-top: .5em; padding-left: .5em; padding-right: .5em; padding-bottom: 0; }
 #header .status p { float: left; margin-top: 0; margin-right: 0.5em; margin-bottom: 0; margin-left: 0; }
 #header .status ul { float: left; margin: 0; padding: 0; }