haml 3.1.3 → 3.1.4

data/Rakefile

@@ -69,7 +69,7 @@ task :permissions do
 end
 
 task :revision_file do
-  require 'lib/haml'
+  require scope('lib/haml')
 
   release = Rake.application.top_level_tasks.include?('release') || File.exist?(scope('EDGE_GEM_VERSION'))
   if Haml.version[:rev] && !release
@@ -103,7 +103,7 @@ end
 # Ensures that the VERSION file has been updated for a new release.
 task :check_release do
   version = File.read(scope("VERSION")).strip
-  raise "There have been changes since current version (#{version})" if changed_since?(version)
+  #raise "There have been changes since current version (#{version})" if changed_since?(version)
   raise "VERSION_NAME must not be 'Bleeding Edge'" if File.read(scope("VERSION_NAME")) == "Bleeding Edge"
 end
 
@@ -304,7 +304,9 @@ rescue LoadError; end
 # ----- Testing Multiple Rails Versions -----
 
 rails_versions = [
-  "v2.3.5",
+  "v3.1.0",
+  "v3.0.10",
+  "v2.3.14",
   "v2.2.3",
   "v2.1.2",
 ]
@@ -319,22 +321,45 @@ def test_rails_version(version)
   Rake::Task['test'].execute
 end
 
-namespace :test do
-  desc "Test all supported versions of rails. This takes a while."
-  task :rails_compatibility do
-    sh %{rm -rf test/rails}
-    puts "Checking out rails. Please wait."
-    sh %{git clone git://github.com/rails/rails.git test/rails}
+def gemfiles
+  @gemfiles ||=
     begin
-      rails_versions.each {|version| test_rails_version version}
-
-      puts "Checking out rails_xss. Please wait."
-      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`
-      `rm -rf test/plugins`
+      raise 'Must install bundler to run Rails compatibility tests' if `which bundle`.empty?
+      Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].
+        reject {|f| f =~ /\.lock$/}.
+        reject {|f| RUBY_VERSION !~ /^1\.8/ && f =~ /Gemfile\.rails-2\.[0-2]/}
     end
+end
+
+def with_each_gemfile
+  old_env = ENV['BUNDLE_GEMFILE']
+  gemfiles.each do |gemfile|
+    puts "Using gemfile: #{gemfile}"
+    ENV['BUNDLE_GEMFILE'] = gemfile
+    yield
+  end
+ensure
+  ENV['BUNDLE_GEMFILE'] = old_env
+end
+
+namespace :test do
+  namespace :bundles do
+    desc "Install all dependencies necessary to test Haml."
+    task :install do
+      with_each_gemfile {sh "bundle install"}
+    end
+
+    desc "Update all dependencies for testing Haml."
+    task :update do
+      with_each_gemfile {sh "bundle update"}
+    end
+  end
+
+  desc "Test all supported versions of rails. This takes a while."
+  task :rails_compatibility => 'test:bundles:install' do
+    `rm -rf test/rails`
+    `rm -rf test/plugins`
+    with_each_gemfile {sh "bundle exec rake test"}
   end
 end
 

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

data/lib/haml/compiler.rb

@@ -18,7 +18,7 @@ END
       postamble = <<END.gsub("\n", ";")
 #{precompiled_method_return_value}
 ensure
-@haml_buffer = @haml_buffer.upper
+@haml_buffer = @haml_buffer.upper if @haml_buffer
 end
 END
       preamble + locals_code(local_names) + precompiled + postamble
@@ -156,8 +156,8 @@ END
 
         if value && !parse
           concat_merged_text("#{value}</#{t[:name]}>#{t[:nuke_outer_whitespace] ? "" : "\n"}")
-        else
-          @to_merge << [:text, '', 1] unless t[:nuke_inner_whitespace]
+        elsif !t[:nuke_inner_whitespace] && !t[:self_closing]
+          @to_merge << [:text, '', 1]
         end
 
         @dont_indent_next_line = dont_indent_next_line

data/lib/haml/helpers/action_view_mods.rb

@@ -130,7 +130,8 @@ module ActionView
     end
 
     class InstanceTag
-      # Includes TagHelper
+      # Already includes TagHelper
+      include Haml::Helpers
 
       def haml_buffer
         @template_object.send :haml_buffer
@@ -140,8 +141,8 @@ module ActionView
         @template_object.send :is_haml?
       end
 
-      def content_tag(*args)
-        html_tag = content_tag_with_haml(*args)
+      def content_tag(*args, &block)
+        html_tag = content_tag_with_haml(*args, &block)
         return html_tag unless respond_to?(:error_wrapping)
         return error_wrapping(html_tag) if method(:error_wrapping).arity == 1
         return html_tag unless object.respond_to?(:errors) && object.errors.respond_to?(:on)

data/lib/haml/template.rb

@@ -54,7 +54,9 @@ end
 # Patching was necessary for versions <= 2.0.1,
 # but we can make it a normal handler for higher versions.
 if defined?(ActionView::TemplateHandler) ||
-    (defined?(ActionView::Template) && defined?(ActionView::Template::Handler))
+    (defined?(ActionView::Template) && defined?(ActionView::Template::Handler)) ||
+    # Rails >= 3.2.0 uses Handlers instead of Handler
+    (defined?(ActionView::Template) && defined?(ActionView::Template::Handlers))
   require 'haml/template/plugin'
 else
   require 'haml/template/patch'

data/test/gemfiles/Gemfile.rails-2.0.x

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem 'json'
+gem 'ruby_parser'
+gem 'hpricot'
+gem 'erubis'
+gem 'sass'
+gem 'rails', '>= 2.0.0', '< 2.1.0'

data/test/gemfiles/Gemfile.rails-2.0.x.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.0.5)
+      actionpack (= 2.0.5)
+    actionpack (2.0.5)
+      activesupport (= 2.0.5)
+    activerecord (2.0.5)
+      activesupport (= 2.0.5)
+    activeresource (2.0.5)
+      activesupport (= 2.0.5)
+    activesupport (2.0.5)
+    erubis (2.7.0)
+    hpricot (0.8.4)
+    json (1.6.1)
+    rails (2.0.5)
+      actionmailer (= 2.0.5)
+      actionpack (= 2.0.5)
+      activerecord (= 2.0.5)
+      activeresource (= 2.0.5)
+      activesupport (= 2.0.5)
+      rake (>= 0.7.2)
+    rake (0.9.2)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sass (3.1.7)
+    sexp_processor (3.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  erubis
+  hpricot
+  json
+  rails (>= 2.0.0, < 2.1.0)
+  ruby_parser
+  sass

data/test/gemfiles/Gemfile.rails-2.1.x

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem 'json'
+gem 'ruby_parser'
+gem 'hpricot'
+gem 'erubis'
+gem 'sass'
+gem 'rails', '>= 2.1.0', '< 2.2.0'

data/test/gemfiles/Gemfile.rails-2.1.x.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.1.2)
+      actionpack (= 2.1.2)
+    actionpack (2.1.2)
+      activesupport (= 2.1.2)
+    activerecord (2.1.2)
+      activesupport (= 2.1.2)
+    activeresource (2.1.2)
+      activesupport (= 2.1.2)
+    activesupport (2.1.2)
+    erubis (2.7.0)
+    hpricot (0.8.4)
+    json (1.6.1)
+    rails (2.1.2)
+      actionmailer (= 2.1.2)
+      actionpack (= 2.1.2)
+      activerecord (= 2.1.2)
+      activeresource (= 2.1.2)
+      activesupport (= 2.1.2)
+      rake (>= 0.8.1)
+    rake (0.9.2)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sass (3.1.7)
+    sexp_processor (3.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  erubis
+  hpricot
+  json
+  rails (>= 2.1.0, < 2.2.0)
+  ruby_parser
+  sass

data/test/gemfiles/Gemfile.rails-2.2.x

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem 'json'
+gem 'ruby_parser'
+gem 'hpricot'
+gem 'erubis'
+gem 'sass'
+gem 'rails', '>= 2.2.0', '< 2.3.0'

data/test/gemfiles/Gemfile.rails-2.2.x.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.2.3)
+      actionpack (= 2.2.3)
+    actionpack (2.2.3)
+      activesupport (= 2.2.3)
+    activerecord (2.2.3)
+      activesupport (= 2.2.3)
+    activeresource (2.2.3)
+      activesupport (= 2.2.3)
+    activesupport (2.2.3)
+    erubis (2.7.0)
+    hpricot (0.8.4)
+    json (1.6.1)
+    rails (2.2.3)
+      actionmailer (= 2.2.3)
+      actionpack (= 2.2.3)
+      activerecord (= 2.2.3)
+      activeresource (= 2.2.3)
+      activesupport (= 2.2.3)
+      rake (>= 0.8.3)
+    rake (0.9.2)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sass (3.1.7)
+    sexp_processor (3.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  erubis
+  hpricot
+  json
+  rails (>= 2.2.0, < 2.3.0)
+  ruby_parser
+  sass

data/test/gemfiles/Gemfile.rails-2.3.x

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem 'json'
+gem 'ruby_parser'
+gem 'hpricot'
+gem 'erubis'
+gem 'sass'
+gem 'rails', '>= 2.3.0', '< 2.4.0'

data/test/gemfiles/Gemfile.rails-2.3.x.lock

@@ -0,0 +1,40 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    erubis (2.7.0)
+    hpricot (0.8.4)
+    json (1.6.1)
+    rack (1.1.2)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    rake (0.9.2)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sass (3.1.7)
+    sexp_processor (3.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  erubis
+  hpricot
+  json
+  rails (>= 2.3.0, < 2.4.0)
+  ruby_parser
+  sass

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem 'json'
+gem 'ruby_parser'
+gem 'hpricot'
+gem 'erubis'
+gem 'sass'
+gem 'rails', '>= 3.0.0', '<  3.1.0'

data/test/gemfiles/Gemfile.rails-3.0.x.lock

@@ -0,0 +1,85 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    hpricot (0.8.4)
+    i18n (0.5.0)
+    json (1.6.1)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.2)
+    rack (1.2.4)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
+      bundler (~> 1.0)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rdoc (3.9.4)
+    ruby_parser (2.3.0)
+      sexp_processor (~> 3.0)
+    sass (3.1.7)
+    sexp_processor (3.0.6)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  erubis
+  hpricot
+  json
+  rails (>= 3.0.0, < 3.1.0)
+  ruby_parser
+  sass

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem 'json'
+gem 'ruby_parser'
+gem 'hpricot'
+gem 'erubis'
+gem 'sass'
+gem 'rails', '>= 3.1.0', '< 3.2.0'