Profiling works for Sass.

git-svn-id: svn://hamptoncatlin.com/haml/trunk@281 7063305b-7217-0410-af8c-cdc13e5119b9

Rakefile

@@ -141,20 +141,23 @@ unless ARGV[0] == 'benchmark'
 
   temp_desc = <<-END
   Run a profile of haml.
+    ENGINE=str sets the engine to be profiled (Haml or Sass).
     TIMES=n sets the number of runs. Defaults to 100.
     FILE=n sets the file to profile. Defaults to 'standard'.
   END
   desc temp_desc.chomp
   task :profile do
     require 'test/profile'
+
+    engine = ENV['ENGINE'] && ENV['ENGINE'].downcase == 'sass' ? Sass : Haml
     
-    puts '-'*51, "Profiling Haml::Template", '-'*51
+    puts '-'*51, "Profiling #{engine}", '-'*51
     
     args = []
     args.push ENV['TIMES'].to_i if ENV['TIMES']
     args.push ENV['FILE'] if ENV['FILE']
     
-    profiler = Haml::Profiler.new
+    profiler = engine::Profiler.new
     res = profiler.profile(*args)
     puts res
     

TODO

@@ -1,5 +1,4 @@
 Testing:
-  Test Sass for alternate options settings
   Add Sass support for various utilities (benchmark, profile)
 
 Documentation:

test/profile.rb

@@ -7,7 +7,26 @@ require 'profiler'
 require 'stringio'
 
 module Haml
-  # A profiler for haml, mostly for development use. This simply implements
+  # 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
   
@@ -28,19 +47,17 @@ module Haml
     # 
     # Returns the results of the profiling as a string.
     def profile(runs = 100, template_name = 'standard')      
-      # Runs the profiler, collects information
+      AbstractProfiler.profile(runs) { @base.render template_name }
-      Profiler__::start_profile
+    end
-      runs.times { @base.render template_name }
+  end
-      Profiler__::stop_profile
+end
-      
+
-      # Outputs information to a StringIO, returns result
+module Sass
-      io = StringIO.new
+  class Profiler
-      Profiler__::print_profile(io)
+    def profile(runs = 100, template_name = 'complex')
-      io.pos = 0
+      Haml::AbstractProfiler.profile(runs) do
-      result = io.read
+        Sass::Engine.new("#{File.dirname(__FILE__)}/sass/templates/#{template_name}.sass").render
-      io.close
+      end
-      return result
     end
-
   end
 end