radiant 0.9.1 → 1.0.0.rc1

data/vendor/plugins/haml/Rakefile

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'rake'
-
 # ----- Utility Functions -----
 
 def scope(path)
@@ -42,14 +39,28 @@ END
 
 # ----- Packaging -----
 
-require 'rake/gempackagetask'
-load scope('haml.gemspec')
+# Don't use Rake::GemPackageTast because we want prerequisites to run
+# before we load the gemspec.
+desc "Build all the packages."
+task :package => [:revision_file, :submodules, :permissions] do
+  load scope('haml.gemspec')
+  Gem::Builder.new(HAML_GEMSPEC).build
+  pkg = "#{HAML_GEMSPEC.name}-#{HAML_GEMSPEC.version}"
+  mkdir_p "pkg"
+  verbose(true) {mv "#{pkg}.gem", "pkg/#{pkg}.gem"}
+
+  sh %{rm -f pkg/#{pkg}.tar.gz}
+  verbose(false) {HAML_GEMSPEC.files.each {|f| sh %{tar rf pkg/#{pkg}.tar #{f}}}}
+  sh %{gzip pkg/#{pkg}.tar}
+end
 
-Rake::GemPackageTask.new(HAML_GEMSPEC) do |pkg|
-  if Rake.application.top_level_tasks.include?('release')
-    pkg.need_tar_gz  = true
-    pkg.need_tar_bz2 = true
-    pkg.need_zip     = true
+task :permissions do
+  sh %{chmod -R a+rx bin}
+  sh %{chmod -R a+r .}
+  require 'shellwords'
+  Dir.glob('test/**/*_test.rb') do |file|
+    next if file =~ %r{^test/haml/spec/}
+    sh %{chmod a+rx #{file}}
   end
 end
 
@@ -65,68 +76,25 @@ task :revision_file do
     File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
   end
 end
-Rake::Task[:package].prerequisites.insert(0, :revision_file)
 
 # We also need to get rid of this file after packaging.
 at_exit { File.delete(scope('REVISION')) rescue nil }
 
-desc "Install Haml as a gem."
+desc "Install Haml as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do
-  sudo = RUBY_PLATFORM =~ /win32|mingw/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
-  sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
+  sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end
 
 desc "Release a new Haml package to Rubyforge."
-task :release => [:check_release, :release_elpa, :package] do
+task :release => [:check_release, :package] do
   name = File.read(scope("VERSION_NAME")).strip
   version = File.read(scope("VERSION")).strip
   sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
   sh %{gem push pkg/haml-#{version}.gem}
 end
 
-# Releases haml-mode.el and sass-mode.el to ELPA.
-task :release_elpa do
-  require 'tlsmail'
-  require 'time'
-  require scope('lib/haml')
-
-  version = Haml.version[:number]
-
-  haml_unchanged = mode_unchanged?(:haml, version)
-  sass_unchanged = mode_unchanged?(:sass, version)
-  next if haml_unchanged && sass_unchanged
-  raise "haml-mode.el and sass-mode.el are out of sync." if haml_unchanged ^ sass_unchanged
-
-  if sass_unchanged && File.read(scope("extra/sass-mode.el")).
-      include?(";; Package-Requires: ((haml-mode #{sass_unchanged.inspect}))")
-    raise "sass-mode.el doesn't require the same version of haml-mode."
-  end
-
-  from = `git config user.email`.strip
-  raise "Don't know how to send emails except via Gmail" unless from =~ /@gmail.com$/
-
-  to = "elpa@tromey.com"
-  Net::SMTP.enable_tls(OpenSSL::SSL::VERIFY_NONE)
-  Net::SMTP.start('smtp.gmail.com', 587, 'gmail.com', from, read_password("GMail Password"), :login) do |smtp|
-    smtp.send_message(<<CONTENT, from, to)
-From: Nathan Weizenbaum <#{from}>
-To: #{to}
-Subject: Submitting haml-mode and sass-mode #{version}
-Date: #{Time.now.rfc2822}
-
-haml-mode and sass-mode #{version} are packaged and ready to be included in ELPA.
-They can be downloaded from:
-
-  http://github.com/nex3/haml/raw/#{Haml.version[:rev]}/extra/haml-mode.el
-  http://github.com/nex3/haml/raw/#{Haml.version[:rev]}/extra/sass-mode.el
-CONTENT
-  end
-end
-
 # Ensures that the version have been updated for a new release.
 task :check_release do
   version = File.read(scope("VERSION")).strip
@@ -171,6 +139,18 @@ def mode_unchanged?(mode, version)
   return false
 end
 
+task :submodules do
+  if File.exist?(File.dirname(__FILE__) + "/.git")
+    sh %{git submodule sync}
+    sh %{git submodule update --init}
+  elsif !File.exist?(File.dirname(__FILE__) + "/vendor/fssm/lib")
+    warn <<WARN
+WARNING: vendor/fssm doesn't exist, and this isn't a git repository so
+I can't get it automatically!
+WARN
+  end
+end
+
 task :release_edge do
   ensure_git_cleanup do
     puts "#{'=' * 50} Running rake release_edge"
@@ -180,14 +160,16 @@ task :release_edge do
     sh %{git merge origin/master}
 
     # Get the current master branch version
-    version = File.read(scope('VERSION')).strip.split('.').map {|n| n.to_i}
-    unless version[1] % 2 == 1 && version[2] == 0
+    version = File.read(scope('VERSION')).strip.split('.')
+    pr = version[3]
+    version = version.map {|n| n.to_i}
+    unless pr || (version[1] % 2 == 1 && version[2] == 0)
       raise "#{version.join('.')} is not a development version" 
     end
 
     # Bump the edge gem version
     edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.').map {|n| n.to_i}
-    if edge_version[0..1] != version[0..1]
+    if !pr && (edge_version[0..1] != version[0..1])
       # A new master branch version was released, reset the edge gem version
       edge_version[0..1] = version[0..1]
       edge_version[2] = 0
@@ -205,8 +187,8 @@ task :release_edge do
     sh %{rake package}
     sh %{git checkout VERSION}
 
-    sh %{rubyforge login}
     sh %{rubyforge add_release haml haml-edge "Bleeding Edge (v#{edge_version})" pkg/haml-edge-#{edge_version}.gem}
+    sh %{gem push pkg/haml-edge-#{edge_version}.gem}
   end
 end
 
@@ -250,12 +232,14 @@ OPTS
 
   YARD::Rake::YardocTask.new do |t|
     t.files = FileList.new(scope('lib/**/*.rb')) do |list|
-      list.exclude('lib/haml/template/*.rb')
+      list.exclude('lib/haml/template/patch.rb')
+      list.exclude('lib/haml/template/plugin.rb')
       list.exclude('lib/haml/railtie.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
       list.exclude('lib/haml/helpers/xss_mods.rb')
       list.exclude('lib/sass/plugin/merb.rb')
       list.exclude('lib/sass/plugin/rails.rb')
+      list.exclude('lib/sass/less.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten
@@ -290,8 +274,18 @@ task :pages do
     sh %{git checkout #{proj}-pages}
     sh %{git reset --hard origin/#{proj}-pages}
 
-    sh %{rake build --trace}
-    sh %{rsync -av --delete site/ /var/www/#{proj}-pages}
+    Dir.chdir("/var/www/#{proj}-pages") do
+      sh %{git fetch origin}
+
+      sh %{git checkout stable}
+      sh %{git reset --hard origin/stable}
+
+      sh %{git checkout #{proj}-pages}
+      sh %{git reset --hard origin/#{proj}-pages}
+      sh %{rake build --trace}
+      sh %{mkdir -p tmp}
+      sh %{touch tmp/restart.txt}
+    end
   end
 end
 
@@ -358,7 +352,7 @@ rails_versions << "v2.0.5" if RUBY_VERSION =~ /^1\.8/
 
 def test_rails_version(version)
   Dir.chdir "test/rails" do
-    `git checkout #{version}`
+    sh %{git checkout #{version}}
   end
   puts "Testing Rails #{version}"
   Rake::Task['test'].reenable
@@ -368,14 +362,14 @@ end
 namespace :test do
   desc "Test all supported versions of rails. This takes a while."
   task :rails_compatibility do
-    `rm -rf test/rails`
+    sh %{rm -rf test/rails}
     puts "Checking out rails. Please wait."
-    system("git clone git://github.com/rails/rails.git test/rails") rescue nil
+    sh %{git clone git://github.com/rails/rails.git test/rails}
     begin
       rails_versions.each {|version| test_rails_version version}
 
       puts "Checking out rails_xss. Please wait."
-      system("git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss")
+      sh %{git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss}
       test_rails_version(rails_versions.find {|s| s =~ /^v2\.3/})
     ensure
       `rm -rf test/rails`
@@ -386,8 +380,22 @@ end
 
 # ----- Handling Updates -----
 
-def ensure_git_cleanup
+def email_on_error
   yield
+rescue Exception => e
+  IO.popen("sendmail nex342@gmail.com", "w") do |sm|
+    sm << "From: nex3@nex-3.com\n" <<
+      "To: nex342@gmail.com\n" <<
+      "Subject: Exception when running rake #{Rake.application.top_level_tasks.join(', ')}\n" <<
+      e.message << "\n\n" <<
+      e.backtrace.join("\n")
+  end
+ensure
+  raise e if e
+end
+
+def ensure_git_cleanup
+  email_on_error {yield}
 ensure
   sh %{git reset --hard HEAD}
   sh %{git clean -xdf}
@@ -395,29 +403,34 @@ ensure
 end
 
 task :handle_update do
-  unless ENV["REF"] =~ %r{^refs/heads/(master|(?:haml|sass)-pages)$}
-    puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
-    next
-  end
-  branch = $1
-
-  puts
-  puts
-  puts '=' * 150
-  puts "Running rake handle_update REF=#{ENV["REF"].inspect}"
+  email_on_error do
+    unless ENV["REF"] =~ %r{^refs/heads/(master|stable|(?:haml|sass)-pages)$}
+      puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
+      next
+    end
+    branch = $1
+
+    puts
+    puts
+    puts '=' * 150
+    puts "Running rake handle_update REF=#{ENV["REF"].inspect}"
+
+    sh %{git fetch origin}
+    sh %{git checkout stable}
+    sh %{git reset --hard origin/stable}
+    sh %{git checkout master}
+    sh %{git reset --hard origin/master}
+
+    if branch == "master"
+      sh %{rake release_edge --trace}
+    elsif branch == "stable"
+      sh %{rake pages --trace PROJ=haml}
+      sh %{rake pages --trace PROJ=sass}
+    elsif branch =~ /^(haml|sass)-pages$/
+      sh %{rake pages --trace PROJ=#{$1}}
+    end
 
-  sh %{git checkout master}
-  sh %{git fetch origin}
-  sh %{git reset --hard origin/master}
-
-  if branch == "master"
-    sh %{rake release_edge --trace}
-    sh %{rake pages --trace PROJ=haml}
-    sh %{rake pages --trace PROJ=sass}
-  elsif branch =~ /^(haml|sass)-pages$/
-    sh %{rake pages --trace PROJ=#{$1}}
+    puts 'Done running handle_update'
+    puts '=' * 150
   end
-
-  puts 'Done running handle_update'
-  puts '=' * 150
 end

data/vendor/plugins/haml/TODO

@@ -1,25 +1,24 @@
-# -*- mode: org -*-
+y# -*- mode: org -*-
 #+STARTUP: nofold
 
 * Documentation
   Redo tutorial?
-  Contribution information
-    Will be code reviewed
-    [Haml]/[Sass], punctuation
-    Don't forget docs
   Using helpers
     haml_concat and haml_tag in particular
-  [2.4] Syntax highlighting?
+  Syntax highlighting?
 
 * Code
+  Keep track of error offsets everywhere
+    Use this to show error location in messages
+    Just clean up SassScript syntax errors in general
+    Lexer errors in particular are icky
+    See in particular error changes made in c07b5c8
 ** Haml
-   Interpolation shouldn't make non-interpolated strings escaped under :escape_html
-     I think we can just wrap interpolated code with (),
-     since it's already interpolated.
-   Can also use () to wrap contents of _haml_temp so that commas throw errors when not in :ugly
-   [2.4] Allow "!!! HTML5" to set :format => :html5 ?
-     How do we deal with partials?
-   [2.4] :ugly + :html improvements
+   Support finer-grained HTML-escaping in filters
+   Speed
+     Make tags with dynamic attributes pre-render as much as possible
+     Including the attribute name where doable
+   :ugly + :html improvements
      Ignore closing tags where we can
        http://code.google.com/speed/articles/optimizing-html.html
        Requires Haml parsing refactor
@@ -27,16 +26,19 @@
        http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.2
        http://www.w3.org/TR/html5/syntax.html#attributes
 ** Sass
-   [2.4] CSS superset
-   [2.4] Classes are mixins
+   Benchmark the effects of storing the raw template in sassc
+     If it's expensive, overload RootNode dumping/loading to dup and set @template to nil
+     Then fall back on reading from actual file
+   Make Rack middleware the default for Rails and Merb versions that support it
+   CSS superset
+   Classes are mixins
      Can refer to specific property values? Syntax?
-   [2.4] Pre-parse everything possible: never call Node#interpolate
-   [2.4] Do all parsing in to_tree
-   [2.4] Pull in Compass watcher stuff
-   [2.4] Internationalization
+   Pull in Compass watcher stuff
+   Internationalization
      Particularly word constituents in Regexps
-   [2.4] Optimization
+   Optimization
      http://csstidy.sourceforge.net/
+     http://developer.yahoo.com/yui/compressor/
      Also comma-folding identical rules where possible
      Multiple levels
        0: No optimization
@@ -45,3 +47,7 @@
        2: Anything that keeps functionality identical to O2 (default)
        3: Assume order of rules doesn't matter
        Comma-fold even if there are intervening rules that might interfere
+   CSS3
+     Add (optional) support for http://www.w3.org/TR/css3-values/#calc
+       Cross-unit arithmetic should compile into this
+       Should we use "mod" in Sass for consistency?

data/vendor/plugins/haml/VERSION

@@ -1 +1 @@
-2.2.24
+3.0.23

data/vendor/plugins/haml/VERSION_NAME

@@ -1 +1 @@
-Powerful Penny
+Classy Cassidy

data/vendor/plugins/haml/bin/css2sass

@@ -3,5 +3,11 @@
 require File.dirname(__FILE__) + '/../lib/haml'
 require 'haml/exec'
 
-opts = Haml::Exec::CSS2Sass.new(ARGV)
+warn <<END
+DEPRECATION WARNING:
+The css2sass tool is deprecated and will be removed in Sass 3.2.
+Use the sass-convert tool instead.
+END
+
+opts = Haml::Exec::SassConvert.new(%w[--from css --to sass] + ARGV)
 opts.parse!

data/vendor/plugins/haml/bin/sass-convert

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/haml'
+require 'haml/exec'
+
+opts = Haml::Exec::SassConvert.new(ARGV)
+opts.parse!

data/vendor/plugins/haml/doc-src/FAQ.md

@@ -103,6 +103,17 @@ For example:
         really_move.it.into(    |
           :a => @helper)        |
 
+Note that sometimes it is valid to include lots of Ruby in a template
+when that Ruby is a helper call that passes in a lot of template information.
+Thus when a function has lots of arguments,
+it's possible to wrap it across multiple lines
+as long as each line ends in a comma.
+For example:
+
+    = link_to_remote "Add to cart",
+        :url => { :action => "add", :id => product.id },
+        :update => { :success => "cart", :failure => "error" }
+
 ### `form_for` is printing the form tag twice!
 
 Make sure you're calling it with `-`, not `=`.
@@ -121,8 +132,9 @@ in Haml, you have to do
 {#q-blank-page}
 
 There are several reasons these things might be happening.
-First of all, make sure `vendor/plugins/haml` really exists
-and has an `init.rb` file in there.
+First of all, make sure that Haml really is installed;
+either you've loaded the gem (via `config.gem` in Rails 2.3 or in the Gemfile in Rails 3),
+or `vendor/plugins/haml` exists and contains files.
 Then try restarting Mongrel or WEBrick or whatever you might be using.
 
 Finally, if none of these work,
@@ -168,8 +180,8 @@ from your Sass functions.
 
 ## You still haven't answered my question!
 
-Sorry! Try looking at the Haml or Sass references,
-in the doucmentation for the haml and Sass modules, respectively.
+Sorry! Try looking at the [Haml](http://haml-lang.com/docs/yardoc/HAML_REFERENCE.md.html)
+or [Sass](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html) references,
 If you can't find an answer there,
 feel free to ask in `#haml` on irc.freenode.net
 or send an email to the [mailing list](http://groups.google.com/group/haml?hl=en).

data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md

@@ -3,6 +3,541 @@
 * Table of contents
 {:toc}
 
+## 3.0.23
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.23).
+
+* Fix the error message for unloadable modules when running the executables under Ruby 1.9.2.
+
+* Fix an error when combining old-style and new-style attributes.
+
+## 3.0.22
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.22).
+
+* Allow an empty line after `case` but before `when`.
+
+* Remove `vendor/sass`, which snuck into the gem by mistake
+  and was causing trouble for Heroku users (thanks to [Jacques Crocker](http://railsjedi.com/)).
+
+* Support the Rails 3.1 template handler API.
+
+## 3.0.21
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.21).
+
+* Fix the permissions errors for good.
+
+## 3.0.20
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.20).
+
+* Fix some permissions errors.
+
+## 3.0.19
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.19).
+
+* Fix the `:encoding` option under Ruby 1.9.2.
+
+* Fix interpolated if statement when HTML escaping is enabled.
+
+* Allow the `--unix-newlines` flag to work on Unix, where it's a no-op.
+
+## 3.0.18
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.18).
+
+* Don't require `rake` in the gemspec, for bundler compatibility under
+  JRuby. Thanks to [Gordon McCreight](http://www.gmccreight.com/blog).
+
+* Get rid of the annoying RDoc errors on install.
+
+* Disambiguate references to the `Rails` module when `haml-rails` is installed.
+
+* Fix a bug in `haml_tag` that would allow duplicate attributes to be added
+  and make `data-` attributes not work.
+
+* Compatibility with Rails 3 final.
+
+## 3.0.17
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.17).
+
+* Understand that mingw counts as Windows.
+
+## 3.0.16
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.16).
+
+* Fix an html2haml ERB-parsing bug where ERB blocks were occasionally
+  left without indentation in Haml.
+
+* Fix parsing of `if` and `case` statements whose values were assigned to variables.
+  This is still bad style, though.
+
+* Fix `form_for` and `form_tag` when they're passed a block that
+  returns a string in a helper.
+
+## 3.0.15
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.15).
+
+There were no changes made to Haml between versions 3.0.14 and 3.0.15.
+
+## 3.0.14
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.14).
+
+* Allow CSS-style classes and ids to contain colons.
+
+* Fix an obscure bug with if statements.
+
+### Rails 3 Support
+
+* Don't use the `#returning` method, which Rails 3 no longer provides.
+
+## 3.0.13
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.13).
+
+## Rails 3 Support
+
+Support for Rails 3 versions prior to beta 4 has been removed.
+Upgrade to Rails 3.0.0.beta4 if you haven't already.
+
+### Minor Improvements
+
+* Properly process frozen strings with encoding declarations.
+
+## 3.0.12
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.12).
+
+## Rails 3 Support
+
+Apparently the last version broke in new and exciting ways under Rails 3,
+due to the inconsistent load order caused by certain combinations of gems.
+3.0.12 hacks around that inconsistency, and *should* be fully Rails 3-compatible.
+
+### Deprecated: Rails 3 Beta 3
+
+Haml's support for Rails 3.0.0.beta.3 has been deprecated.
+Haml 3.0.13 will only support 3.0.0.beta.4.
+
+## 3.0.11
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.11).
+
+## 3.0.10
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.10).
+
+### Appengine-JRuby Support
+
+The way we determine the location of the Haml installation
+no longer breaks the version of JRuby
+used by [`appengine-jruby`](http://code.google.com/p/appengine-jruby/).
+
+### Bug Fixes
+
+* Single-line comments are now handled properly by `html2haml`.
+
+## 3.0.9
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.9).
+
+There were no changes made to Haml between versions 3.0.8 and 3.0.9.
+A bug in Gemcutter caused the gem to be uploaded improperly.
+
+## 3.0.8
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.8).
+
+* Fix a bug with Rails versions prior to Rails 3.
+
+## 3.0.7
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.7).
+
+### Encoding Support
+
+Haml 3.0.7 adds support for Ruby-style `-# coding:` comments
+for declaring the encoding of a template.
+For details see {file:HAML_REFERENCE.md#encodings the reference}.
+
+This also slightly changes the behavior of Haml when the
+{file:HAML_REFERENCE.md#encoding-option `:encoding` option} is not set.
+Rather than defaulting to `"utf-8"`,
+it defaults to the encoding of the source document,
+and only falls back to `"utf-8"` if this encoding is `"us-ascii"`.
+
+The `haml` executable also now takes an `-E` option for specifying encoding,
+which works the same way as Ruby's `-E` option.
+
+### Other Changes
+
+* Default to the {file:HAML_REFERENCE.md#format-option `:html5` format}
+  when running under Rails 3,
+  since it defaults to HTML5 as well.
+
+### Bug Fixes
+
+* When generating Haml for something like `<span>foo</span>,`,
+  use `= succeed` rather than `- succeed` (which doesn't work).
+
+## 3.0.6
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.6).
+
+### Rails 2.3.7 Support
+
+This release fully supports Rails 2.3.7.
+
+### Rails 2.3.6 Support Removed
+
+Rails 2.3.6 was released with various bugs related to XSS-protection
+and interfacing with Haml.
+Rails 2.3.7 was released shortly after with fixes for these bugs.
+Thus, Haml no longer supports Rails 2.3.6,
+and anyone using it should upgrade to 2.3.7.
+
+Attempting to use Haml with Rails 2.3.6 will cause an error.
+
+## 3.0.5
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.5).
+
+### Rails 2.3.6 Support
+
+This release hacks around various bugs in Rails 2.3.6,
+bringing Haml up to full compatibility.
+
+### Rails 3 Support
+
+Make sure the `#capture` helper in Rails 3
+doesn't print its value directly to the template.
+
+## 3.0.4
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.4).
+
+There were no changes made to Haml between versions 3.0.3 and 3.0.4.
+
+## 3.0.3
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.3).
+
+### Rails 3 Support
+
+In order to make some Rails loading errors easier to debug,
+Sass will now raise an error if `Rails.root` is `nil` when Sass is loading.
+Previously, this would just cause the paths to be mis-set.
+
+## 3.0.2
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.2).
+
+There were no changes made to Haml between versions 3.0.1 and 3.0.2.
+
+## 3.0.1
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.1).
+
+### Installation in Rails
+
+`haml --rails` is no longer necessary for installing Haml in Rails.
+Now all you need to do is add `gem "haml"` to the Gemfile for Rails 3,
+or add `config.gem "haml"` to `config/environment.rb` for previous versions.
+
+`haml --rails` will still work,
+but it has been deprecated and will print an error message.
+It will not work in the next version of Haml.
+
+### Rails Test Speed
+
+The {file:HAML_REFERENCE.md#ugly-option `:ugly` option} is now on by default
+in the testing environment in Rails to help tests run faster.
+
+## 3.0.0
+{#3-0-0}
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0).
+
+### Backwards Incompatibilities: Must Read!
+
+* The `puts` helper has been removed.
+  Use {Haml::Helpers#haml\_concat} instead.
+
+### More Useful Multiline
+
+Ruby code can now be wrapped across multiple lines
+as long as each line but the last ends in a comma.
+For example:
+
+    = link_to_remote "Add to cart",
+        :url => { :action => "add", :id => product.id },
+        :update => { :success => "cart", :failure => "error" }
+
+### `haml_tag` and `haml_concat` Improvements
+
+#### `haml_tag` with CSS Selectors
+
+The {Haml::Helpers#haml_tag haml\_tag} helper can now take a string
+using the same class/id shorthand as in standard Haml code.
+Manually-specified class and id attributes are merged,
+again as in standard Haml code.
+For example:
+
+    haml_tag('#foo') #=> <div id='foo' />
+    haml_tag('.bar') #=> <div class='bar' />
+    haml_tag('span#foo.bar') #=> <span class='bar' id='foo' />
+    haml_tag('span#foo.bar', :class => 'abc') #=> <span class='abc bar' id='foo' />
+    haml_tag('span#foo.bar', :id => 'abc') #=> <span class='bar' id='abc_foo' />
+
+Cheers, [S. Burkhard](http://github.com/hasclass/).
+
+#### `haml_tag` with Multiple Lines of Content
+
+The {Haml::Helpers#haml_tag haml\_tag} helper also does a better job
+of formatting tags with multiple lines of content.
+If a tag has multiple levels of content,
+that content is indented beneath the tag.
+For example:
+
+    haml_tag(:p, "foo\nbar") #=>
+      # <p>
+      #   foo
+      #   bar
+      # </p>
+
+#### `haml_tag` with Multiple Lines of Content
+
+Similarly, the {Haml::Helpers#haml_concat haml\_concat} helper
+will properly indent multiple lines of content.
+For example:
+
+    haml_tag(:p) {haml_concat "foo\nbar"} #=>
+      # <p>
+      #   foo
+      #   bar
+      # </p>
+
+#### `haml_tag` and `haml_concat` with `:ugly`
+
+When the {file:HAML_REFERENCE.md#ugly-option `:ugly` option} is enabled,
+{Haml::Helpers#haml_tag haml\_tag} and {Haml::Helpers#haml_concat haml\_concat}
+won't do any indentation of their arguments.
+
+### Basic Tag Improvements
+
+* It's now possible to customize the name used for {file:HAML_REFERENCE.md#object_reference_ object reference}
+  for a given object by implementing the `haml_object_ref` method on that object.
+  This method should return a string that will be used in place of the class name of the object
+  in the generated class and id.
+  Thanks to [Tim Carey-Smith](http://twitter.com/halorgium).
+
+* All attribute values may be non-String types.
+  Their `#to_s` method will be called to convert them to strings.
+  Previously, this only worked for attributes other than `class`.
+  
+### `:class` and `:id` Attributes Accept Ruby Arrays
+
+In an attribute hash, the `:class` attribute now accepts an Array
+whose elements will be converted to strings and joined with <nobr>`" "`</nobr>.
+Likewise, the `:id` attribute now accepts an Array
+whose elements will be converted to strings and joined with `"_"`.
+The array will first be flattened and any elements that do not test as true
+will be stripped out. For example:
+
+    .column{:class => [@item.type, @item == @sortcol && [:sort, @sortdir]] }
+
+could render as any of:
+
+    class="column numeric sort ascending"
+    class="column numeric"
+    class="column sort descending"
+    class="column"
+
+depending on whether `@item.type` is `"numeric"` or `nil`,
+whether `@item == @sortcol`,
+and whether `@sortdir` is `"ascending"` or `"descending"`.
+
+A single value can still be specified.
+If that value evaluates to false it is ignored;
+otherwise it gets converted to a string.
+For example:
+
+    .item{:class => @item.is_empty? && "empty"}
+
+could render as either of:
+
+    class="item"
+    class="item empty"
+
+Thanks to [Ronen Barzel](http://www.ronenbarzel.org/).
+
+### HTML5 Custom Data Attributes
+
+Creating an attribute named `:data` with a Hash value
+will generate [HTML5 custom data attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data).
+For example:
+
+    %div{:data => {:author_id => 123, :post_id => 234}}
+
+Will compile to:
+
+    <div data-author_id='123' data-post_id='234'></div>
+
+Thanks to [John Reilly](http://twitter.com/johnreilly).
+
+### More Powerful `:autoclose` Option
+
+The {file:HAML_REFERENCE.md#attributes_option `:attributes`} option
+can now take regular expressions that specify which tags to make self-closing.
+
+### `--double-quote-attributes` Option
+
+The Haml executable now has a `--double-quote-attributes` option (short form: `-q`)
+that causes attributes to use a double-quote mark rather than single-quote.
+Thanks to [Charles Roper](http://charlesroper.com/).
+
+### `:css` Filter
+
+Haml now supports a {file:HAML_REFERENCE.md#css-filter `:css` filter}
+that surrounds the filtered text with `<style>` and CDATA tags.
+
+### `haml-spec` Integration
+
+We've added the cross-implementation tests from the [haml-spec](http://github.com/norman/haml-spec) project
+to the standard Haml test suite, to be sure we remain compatible with the base functionality
+of the many and varied [Haml implementations](http://en.wikipedia.org/wiki/Haml#Implementations).
+
+### Ruby 1.9 Support
+
+* Haml and `html2haml` now produce more descriptive errors
+  when given a template with invalid byte sequences for that template's encoding,
+  including the line number and the offending character.
+
+* Haml and `html2haml` now accept Unicode documents with a
+  [byte-order-mark](http://en.wikipedia.org/wiki/Byte_order_mark).
+
+### Rails Support
+
+* When `form_for` is used with `=`, or `form_tag` is used with `=` and a block,
+  they will now raise errors explaining that they should be used with `-`.
+  This is similar to how {Haml::Helpers#haml\_concat} behaves,
+  and will hopefully clear up some difficult bugs for some users.
+
+### Rip Support
+
+Haml is now compatible with the [Rip](http://hellorip.com/) package management system.
+Thanks to [Josh Peek](http://joshpeek.com/).
+
+### `html2haml` Improvements
+
+* Ruby blocks within ERB are now supported.
+  The Haml code is properly indented and the `end`s are removed.
+  This includes methods with blocks and all language constructs
+  such as `if`, `begin`, and `case`.
+  For example:
+
+      <% content_for :footer do %>
+        <p>Hi there!</p>
+      <% end %>
+
+  is now transformed into:
+
+      - content_for :footer do
+        %p Hi there!
+
+  Thanks to [Jack Chen](http://chendo.net) and [Dr. Nic Williams](http://drnicwilliams)
+  for inspiring this and creating the first draft of the code.
+
+* Inline HTML text nodes are now transformed into inline Haml text.
+  For example, `<p>foo</p>` now becomes `%p foo`, whereas before it became:
+
+      %p
+        foo
+
+  The same is true for inline comments,
+  and inline ERB when running in ERB mode:
+  `<p><%= foo %></p>` will now become `%p= foo`.
+
+* ERB included within text is now transformed into Ruby interpolation.
+  For example:
+
+      <p>
+        Foo <%= bar %> baz!
+        Flip <%= bang %>.
+      </p>
+
+  is now transformed into:
+
+      %p
+        Foo #{bar} baz!
+        Flip #{bang}.
+
+* `<script>` tags are now transformed into `:javascript` filters,
+  and `<style>` tags into `:css` filters.
+  and indentation is preserved.
+  For example:
+
+      <script type="text/javascript">
+        function foo() {
+          return 12;
+        }
+      </script>
+
+  is now transformed into:
+
+      :javascript
+        function foo() {
+          return 12;
+        }
+
+* `<pre>` and `<textarea>` tags are now transformed into the `:preserve` filter.
+  For example:
+
+      <pre>Foo
+        bar
+          baz</pre>
+
+  is now transformed into:
+
+      %pre
+        :preserve
+          Foo
+            bar
+              baz
+
+* Self-closing tags (such as `<br />`) are now transformed into
+  self-closing Haml tags (like `%br/`).
+
+* IE conditional comments are now properly parsed.
+
+* Attributes are now output in a more-standard format,
+  without spaces within the curly braces
+  (e.g. `%p{:foo => "bar"}` as opposed to `%p{ :foo => "bar" }`).
+
+* IDs and classes containing `#` and `.` are now output as string attributes
+  (e.g. `%p{:class => "foo.bar"}`).
+
+* Attributes are now sorted, to maintain a deterministic order.
+
+* `>` or {Haml::Helpers#succeed #succeed} are inserted where necessary
+  when inline formatting is used.
+
+* Multi-line ERB statements are now properly indented,
+  and those without any content are removed.
+
+### Minor Improvements
+
+* {Haml::Helpers#capture_haml capture\_haml} is now faster when using `:ugly`.
+  Thanks to [Alf Mikula](http://alfmikula.blogspot.com/).
+
+* Add an `RDFa` doctype shortcut.
+
 ## 2.2.24
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.24).
@@ -473,7 +1008,7 @@ encoding errors when dealing with non-ASCII input data.
 This helper is being deprecated for the obvious reason
 that it conflicts with the `Kernel#puts` method.
 I'm ashamed I ever chose this name.
-Use `haml_tag` instead and spare me the embarrassment.
+Use `haml_concat` instead and spare me the embarrassment.
 
 #### `= haml_tag`