haml 1.0.5 → 1.5.0

data/test/{templates → haml/templates}/helpers.haml

@@ -1,5 +1,5 @@
 = h("&&&&&&&&&&&") # This is an ActionView Helper... should load
-- foo = capture do # This ActionView Helper is designed for ERB, but should work with HAML
+- foo = capture do # This ActionView Helper is designed for ERB, but should work with haml
   %div
     %p.title Title
     %p.text
@@ -35,5 +35,14 @@ click
 %p boom
 - concat "foo\n"
 - buffer.tabulation = 0
+- def url_for(*stuff); stuff.join(' '); end
+= form_tag 'hello/world'
+- form_tag 'heeheeaform' do
+  %div= submit_tag 'save'
+- form_for :article, @article, :url => 'article_url' do |f|
+  Title:
+  = f.text_field :title
+  Body:
+  = f.text_field :body
 = list_of({:google => 'http://www.google.com'}) do |name, link|
   %a{ :href => link }= name

data/test/{templates → haml/templates}/helpful.haml

@@ -1,6 +1,9 @@
 %div[@article]
   %h1= @article.title
   %div= @article.body
+#id[@article] id
+.class[@article] class
+#id.class[@article] id class
 %div{:class => "article full"}[@article]= "boo"
 %span[@not_a_real_variable_and_will_be_nil]
   Boo

data/test/{templates → haml/templates}/just_stuff.haml

@@ -7,6 +7,10 @@
 !!! Strict foo bar
 !!! FRAMESET
 %strong{:apos => "Foo's bar!"} Boo!
+== Embedded? false!
+== Embedded? #{true}!
+- embedded = true
+== Embedded? #{embedded}!
 .render= render :inline => "%em= 'wow!'", :type => :haml
 = "stuff followed by whitespace"
   
@@ -25,6 +29,7 @@
   cool, huh?
   %strong there can even be sub-tags!
   = "Or script!"
+%p{ :class => "" } class attribute shouldn't appear!
 /[if lte IE6] conditional comment!
 /[if gte IE7]
   %p Block conditional comment
@@ -32,3 +37,5 @@
     %h1 Cool, eh?
 /[if gte IE5.2]
   Woah a period.
+= "test" |
+  "test" |

data/test/haml/templates/original_engine.haml

@@ -0,0 +1,17 @@
+!!!
+%html
+  %head
+    %title Stop. haml time
+    #content
+      %h1 This is a title!
+      %p Lorem ipsum dolor sit amet, consectetur adipisicing elit
+      %p{:class => 'foo'} Cigarettes!
+      %h2 Man alive!
+      %ul.things
+        %li Slippers
+        %li Shoes
+        %li Bathrobe
+        %li Coffee
+      %pre
+        This is some text that's in a pre block!
+        Let's see what happens when it's rendered! What about now, since we're on a new line?

data/test/{templates → haml/templates}/standard.haml

@@ -5,13 +5,15 @@
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}/
   %body
     / You're In my house now!
-    - concat "Foo"
+    - concat("foo\n")
     .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        " + |

data/test/haml/templates/whitespace_handling.haml

@@ -0,0 +1,137 @@
+#whitespace_test
+  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
+  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+  ~ render :file => "_text_area.haml", :locals => { :value => "Oneline" }
+  ~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+  #flattened~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+.hithere
+  ~ "Foo bar"
+  ~ "<pre>foo bar</pre>"
+  ~ "<pre>foo\nbar</pre>"
+  %p~ "<pre>foo\nbar</pre>"
+  %p~ "foo\nbar"
+  %pre~
+                                                     ___
+                                                  ,o88888
+                                               ,o8888888'
+                         ,:o:o:oooo.        ,8O88Pd8888"
+                     ,.::.::o:ooooOoOoO. ,oO8O8Pd888'"
+                   ,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"
+                  , ..:.::o:ooOoOOOO8OOOOo.FdO8O8"
+                 , ..:.::o:ooOoOO8O888O8O,COCOO"
+                , . ..:.::o:ooOoOOOO8OOOOCOCO"
+                 . ..:.::o:ooOoOoOO8O8OCCCC"o
+                    . ..:.::o:ooooOoCoCCC"o:o
+                    . ..:.::o:o:,cooooCo"oo:o:
+                 `   . . ..:.:cocoooo"'o:o:::'
+                 .`   . ..::ccccoc"'o:o:o:::'
+                :.:.    ,c:cccc"':.:.:.:.:.'
+              ..:.:"'`::::c:"'..:.:.:.:.:.'  http://www.chris.com/ASCII/
+            ...:.'.:.::::"'    . . . . .'
+           .. . ....:."' `   .  . . ''
+         . . . ...."'
+         .. . ."'     -hrr-
+        .
+
+
+                                                  It's a planet!
+    %strong This shouldn't be bold!
+  %strong This should!
+  %textarea
+    ~
+            ___           ___           ___           ___ 
+           /\__\         /\  \         /\__\         /\__\
+          /:/  /        /::\  \       /::|  |       /:/  /
+         /:/__/        /:/\:\  \     /:|:|  |      /:/  / 
+        /::\  \ ___   /::\~\:\  \   /:/|:|__|__   /:/  /  
+       /:/\:\  /\__\ /:/\:\ \:\__\ /:/ |::::\__\ /:/__/   
+       \/__\:\/:/  / \/__\:\/:/  / \/__/~~/:/  / \:\  \   
+            \::/  /       \::/  /        /:/  /   \:\  \  
+            /:/  /        /:/  /        /:/  /     \:\  \ 
+           /:/  /        /:/  /        /:/  /       \:\__\
+           \/__/         \/__/         \/__/         \/__/
+           
+           Many
+                         thanks
+                 to
+                                      http://www.network-science.de/ascii/
+    %strong indeed!
+.foo
+  ~ 13
+  ~ ['a', 'b', 'c'].map do |a|
+    - "<textarea>\n#{a}\n</textarea>"
+%pre
+  ~
+    foo
+  bar
+#whitespace_test
+  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
+  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Oneline" })
+  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
+  #flattened= find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
+.hithere
+  = find_and_preserve("Foo bar")
+  = find_and_preserve("<pre>foo bar</pre>")
+  = find_and_preserve("<pre>foo\nbar</pre>")
+  %p= find_and_preserve("<pre>foo\nbar</pre>")
+  %p= find_and_preserve("foo\nbar")
+  %pre
+    :preserve
+                                                       ___
+                                                    ,o88888
+                                                 ,o8888888'
+                           ,:o:o:oooo.        ,8O88Pd8888"
+                       ,.::.::o:ooooOoOoO. ,oO8O8Pd888'"
+                     ,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"
+                    , ..:.::o:ooOoOOOO8OOOOo.FdO8O8"
+                   , ..:.::o:ooOoOO8O888O8O,COCOO"
+                  , . ..:.::o:ooOoOOOO8OOOOCOCO"
+                   . ..:.::o:ooOoOoOO8O8OCCCC"o
+                      . ..:.::o:ooooOoCoCCC"o:o
+                      . ..:.::o:o:,cooooCo"oo:o:
+                   `   . . ..:.:cocoooo"'o:o:::'
+                   .`   . ..::ccccoc"'o:o:o:::'
+                  :.:.    ,c:cccc"':.:.:.:.:.'
+                ..:.:"'`::::c:"'..:.:.:.:.:.'  http://www.chris.com/ASCII/
+              ...:.'.:.::::"'    . . . . .'
+             .. . ....:."' `   .  . . ''
+           . . . ...."'
+           .. . ."'     -hrr-
+          .
+
+
+                                                    It's a planet!
+      %strong This shouldn't be bold!
+  %strong This should!
+  %textarea
+    :preserve
+            ___           ___           ___           ___ 
+           /\__\         /\  \         /\__\         /\__\
+          /:/  /        /::\  \       /::|  |       /:/  /
+         /:/__/        /:/\:\  \     /:|:|  |      /:/  / 
+        /::\  \ ___   /::\~\:\  \   /:/|:|__|__   /:/  /  
+       /:/\:\  /\__\ /:/\:\ \:\__\ /:/ |::::\__\ /:/__/   
+       \/__\:\/:/  / \/__\:\/:/  / \/__/~~/:/  / \:\  \   
+            \::/  /       \::/  /        /:/  /   \:\  \  
+            /:/  /        /:/  /        /:/  /     \:\  \ 
+           /:/  /        /:/  /        /:/  /       \:\__\
+           \/__/         \/__/         \/__/         \/__/
+           
+           Many
+                         thanks
+                 to
+                                      http://www.network-science.de/ascii/
+    %strong indeed!
+.foo
+  = find_and_preserve(13)
+%pre
+  :preserve
+           __     ______        __               ______
+    .----.|  |--.|__    |.----.|  |--..--------.|  __  |
+    |  __||     ||__    ||  __||    < |        ||  __  |
+    |____||__|__||______||____||__|__||__|__|__||______|
+%pre
+  :preserve
+    foo
+  bar

data/test/profile.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../lib/haml/template'
+require File.dirname(__FILE__) + '/../lib/haml'
+require 'haml/template'
 require 'rubygems'
 require 'active_support'
 require 'action_view'
@@ -6,13 +7,32 @@ require 'profiler'
 require 'stringio'
 
 module Haml
-  # A profiler for HAML, mostly for development use. This simply implements
-  # the Ruby profiler for profiling HAML code.
+  # Used by both Haml::Profiler and Sass::Profiler.
+  # Encapsulates profiling behavior.
+  module AbstractProfiler
+    def self.profile(times, &block)
+      # Runs the profiler, collects information
+      Profiler__::start_profile
+      times.times &block
+      Profiler__::stop_profile
+      
+      # Outputs information to a StringIO, returns result
+      io = StringIO.new
+      Profiler__::print_profile(io)
+      io.pos = 0
+      result = io.read
+      io.close
+      result
+    end
+  end
+
+  # A profiler for Haml, mostly for development use. This simply implements
+  # the Ruby profiler for profiling haml code.
   class Profiler
   
     # Creates a new profiler that looks for templates in the base
     # directory.
-    def initialize(base = File.join(File.dirname(__FILE__), 'templates'))
+    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)
@@ -21,25 +41,23 @@ module Haml
       end
     end
 
-    # Profiles HAML on the given template with the given number of runs.
+    # Profiles haml on the given template with the given number of runs.
     # The template name shouldn't have a file extension; this will
-    # automatically look for a HAML template.
+    # automatically look for a haml template.
     # 
     # Returns the results of the profiling as a string.
     def profile(runs = 100, template_name = 'standard')      
-      # Runs the profiler, collects information
-      Profiler__::start_profile
-      runs.times { @base.render template_name }
-      Profiler__::stop_profile
-      
-      # Outputs information to a StringIO, returns result
-      io = StringIO.new
-      Profiler__::print_profile(io)
-      io.pos = 0
-      result = io.read
-      io.close
-      return result
+      AbstractProfiler.profile(runs) { @base.render template_name }
     end
+  end
+end
 
+module Sass
+  class Profiler
+    def profile(runs = 100, template_name = 'complex')
+      Haml::AbstractProfiler.profile(runs) do
+        Sass::Engine.new("#{File.dirname(__FILE__)}/sass/templates/#{template_name}.sass").render
+      end
+    end
   end
 end

data/test/sass/engine_test.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/sass'
+require 'sass/engine'
+
+class SassEngineTest < Test::Unit::TestCase
+  EXCEPTION_MAP = {
+    "!a = 1 + " => 'Constant arithmetic error: "1 +"',
+    "!a = 1 + 2 +" => 'Constant arithmetic error: "1 + 2 +"',
+    "!a = \"b" => 'Unterminated string: "\\"b"',
+    "!a = #aaa - a" => 'Undefined operation: "#afafaf minus a"',
+    "!a = #aaa / a" => 'Undefined operation: "#afafaf div a"',
+    "!a = #aaa * a" => 'Undefined operation: "#afafaf times a"',
+    "!a = #aaa % a" => 'Undefined operation: "#afafaf mod a"',
+    "!a = 1 - a" => 'Undefined operation: "1 minus a"',
+    "!a = 1 * a" => 'Undefined operation: "1 times a"',
+    "!a = 1 / a" => 'Undefined operation: "1 div a"',
+    "!a = 1 % a" => 'Undefined operation: "1 mod a"',
+    ":" => 'Invalid attribute: ":"',
+    ": a" => 'Invalid attribute: ": a"',
+    ":= a" => 'Invalid attribute: ":= a"',
+    "a\n  :b" => 'Invalid attribute: ":b "',
+    "a\n  :b: c" => 'Invalid attribute: ":b: c" (This isn\'t CSS!)',
+    "a\n  :b c;" => 'Invalid attribute: ":b c;" (This isn\'t CSS!)',
+    ":a" => 'Attributes aren\'t allowed at the root of a document.',
+    "!" => 'Invalid constant: "!"',
+    "!a" => 'Invalid constant: "!a"',
+    "! a" => 'Invalid constant: "! a"',
+    "!a b" => 'Invalid constant: "!a b"',
+    "a\n\t:b c" => "Illegal Indentation: Only two space characters are allowed as tabulation.",
+    "a\n :b c" => "Illegal Indentation: Only two space characters are allowed as tabulation.",
+    "a\n    :b c" => "Illegal Indentation: Only two space characters are allowed as tabulation.",
+    "a\n  :b\n  !c = 3" => "Constants may only be declared at the root of a document.",
+    "!a = 1b + 2c" => "Incompatible units: b and c"
+  }
+  
+  def test_basic_render
+    renders_correctly "basic", { :style => :compact }
+  end
+
+  def test_alternate_styles
+    renders_correctly "expanded", { :style => :expanded }
+    renders_correctly "compact", { :style => :compact }
+    renders_correctly "nested", { :style => :nested }
+  end
+  
+  def test_exceptions
+    EXCEPTION_MAP.each do |key, value|
+      begin
+        Sass::Engine.new(key).render
+      rescue Sass::SyntaxError => err
+        assert_equal(value, err.message)
+        assert(err.sass_line, "Line: #{key}")
+        assert_match(/\(sass\):[0-9]+/, err.backtrace[0], "Line: #{key}")
+      else
+        assert(false, "Exception not raised for '#{key}'!")
+      end
+    end
+  end
+
+  def test_exception_line
+    to_render = "rule\n  :attr val\n  :broken\n"
+    begin
+      Sass::Engine.new(to_render).render
+    rescue Sass::SyntaxError => err
+      assert_equal(3, err.sass_line)
+    else
+      assert(false, "Exception not raised for '#{to_render}'!")
+    end
+  end
+  
+  private
+
+  def renders_correctly(name, options={})
+    sass_file  = load_file(name, "sass")
+    css_file   = load_file(name, "css")
+    css_result = Sass::Engine.new(sass_file, options).render
+    assert_equal css_file, css_result
+  end
+
+  def load_file(name, type = "sass")
+    @result = ''
+    File.new(File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}").each_line { |l| @result += l }
+    @result
+  end
+end

data/test/sass/plugin_test.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/sass'
+
+RAILS_ENV  = 'testing'
+
+require 'sass/plugin'
+
+class SassPluginTest < Test::Unit::TestCase
+  @@templates = %w{ complex constants }
+
+  def setup
+    Sass::Plugin.options = {
+      :template_location => File.dirname(__FILE__) + '/templates',
+      :css_location => File.dirname(__FILE__) + '/tmp',
+      :style => :compact
+    }
+    Sass::Plugin.options[:always_update] = true
+    
+    Sass::Plugin.update_stylesheets
+  end
+  
+  def teardown
+    File.delete(*Dir[tempfile_loc('*')])
+  end
+
+  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_exception_handling
+    File.delete(tempfile_loc('bork'))
+    Sass::Plugin.update_stylesheets
+    File.open(tempfile_loc('bork')) do |file|
+      assert_equal("/*\nSass::SyntaxError: Undefined constant: \"!bork\"\non line 2 of #{File.dirname(__FILE__) + '/templates/bork.sass'}\n\n1: bork\n2:   :bork= !bork", file.read.split("\n")[0...6].join("\n"))
+    end
+    File.delete(tempfile_loc('bork'))
+  end
+
+  def test_production_exception_handling
+    Sass.const_set('RAILS_ENV', 'production')
+
+    File.delete(tempfile_loc('bork'))
+    Sass::Plugin.update_stylesheets
+    assert_equal("/* Internal stylesheet error */", File.read(tempfile_loc('bork')))
+    File.delete(tempfile_loc('bork'))
+
+    Sass::Plugin.const_set('RAILS_ENV', 'testing')
+  end
+  
+  def test_controller_process
+    File.delete(tempfile_loc('basic'))
+    assert Sass::Plugin.stylesheet_needs_update?('basic')
+    
+    ActionController::Base.new.process
+    
+    assert !Sass::Plugin.stylesheet_needs_update?('basic')
+  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 tempfile_loc(name)
+    File.dirname(__FILE__) + "/tmp/#{name}.css"
+  end
+  
+  def result_loc(name)
+    File.dirname(__FILE__) + "/results/#{name}.css"
+  end
+end
+
+module Sass::Plugin
+  class << self
+    public :stylesheet_needs_update?
+  end
+end
+
+class Sass::Engine
+  alias_method :old_render, :render
+  
+  def render
+    raise "bork bork bork!" if @template[0] == "{bork now!}"
+    old_render
+  end
+end
+
+class ActionController::Base
+  def sass_old_process(*args); end
+end