haml 4.1.0.alpha.2 → 4.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e558b5f2cf40a4dc76dd5a6d4a6fd7410087cea
-  data.tar.gz: de7642c1dd34404f48def114391e5070ea0d78fa
+  metadata.gz: e6db8c2e57e4132457faca789a5700112ee9a8e5
+  data.tar.gz: c4f15045d582be5eeb7daecb3781c6102920beb9
 SHA512:
-  metadata.gz: 1713fd685aee4177c59ea3f3353c65a875c2cc3cbf8a840c20c96d2bd2308dad11f28c04d73fde0bfcedfd7e3e50e90a2b20ae17ee0fe8769285971cb5f651bf
-  data.tar.gz: f6a1e655ac0fdaeeb9ae8e215fad6b79673da33f9c404ac192dca1f8dbc8bb81becb33250554c3e2b29907054efb6e28b22349a1153126ba09b40fd1ff734de5
+  metadata.gz: 3fabebdd299e3cea1516c42d40b6d63c96dbcf073434d11794403933b7b6fb233e0460908317256abbb07b7281da3b3582ac1b26676725cdc6462cbd31234d00
+  data.tar.gz: 3eff7188b9d214cf4face1dc8078c598c45369cb70a4caad27d74fc53d29ab7de5748ff7997a24b6dc807c4ee926c72bf6373885bc517ba525b541fe8bdf5ee9

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 ## 4.1.0 (Unreleased)
 
 * Haml now requires Ruby 1.9.2 or above.
+* Rails 3.0 and 3.1 are no longer supported, matching the official
+  [Maintenance Policy for Ruby on Rails](http://weblog.rubyonrails.org/2013/2/24/maintenance-policy-for-ruby-on-rails/).
+  (Tee Parham)
 * Fix for attribute merging. When an attribute method (or literal nested hash)
   was used in an old style attribute hash and there is also a (non-static) new
   style hash there is an error. The fix can result in different behavior in
@@ -12,6 +15,16 @@
 * General performance and memory usage improvements. (Akira Matsuda)
 * Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
 
+## 4.0.5
+
+Released on Jan 7, 2014 ([diff](https://github.com/haml/haml/compare/4.0.4...4.0.5)).
+
+* Fix haml_concat appending unescaped HTML after a call to haml_tag.
+* Fix for bug whereby when HAML :ugly option is "true",
+  ActionView::Helpers::CaptureHelper::capture returns the whole view buffer
+  when passed a block that returns nothing (thanks [Mircea
+  Moise](https://github.com/mmircea16)).
+
 ## 4.0.4
 
 Released on November 5, 2013 ([diff](https://github.com/haml/haml/compare/4.0.3...4.0.4)).
@@ -1349,3 +1362,4 @@ has been moved to [YARD](http://yard.soen.ca).
 YARD is an excellent documentation system,
 and allows us to write our documentation in [Maruku](http://maruku.rubyforge.org),
 which is also excellent.
+>>>>>>> External Changes

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/haml/haml.png?branch=master)](http://travis-ci.org/haml/haml)
 [![Code Climate](https://codeclimate.com/github/haml/haml.png)](https://codeclimate.com/github/haml/haml)
+[![Coverage Status](https://coveralls.io/repos/haml/haml/badge.png)](https://coveralls.io/r/haml/haml)
 
 Haml is a templating engine for HTML. It's designed to make it both easier and
 more pleasant to write HTML documents, by eliminating redundancy, reflecting the
@@ -30,6 +31,13 @@ documentation](http://haml.info/docs/yardoc/).
 
 To use Haml with Rails, simply add Haml to your Gemfile and run `bundle`.
 
+    gem 'haml'
+
+Haml 4.1 requires an actively maintained version of Rails (version 3.2 or later).
+If you are using Rails 3.0 or 3.1, you should use Haml version 4.0.x:
+
+    gem 'haml', '~> 4.0.4'
+
 If you'd like to replace Rails's Erb-based generators with Haml, add
 [haml-rails](https://github.com/indirect/haml-rails) to your Gemfile as well.
 
@@ -137,6 +145,7 @@ both 1.9 and 2.0.
 * [Norman Clarke](http://github.com/norman)
 * [Matt Wildig](http://github.com/mattwildig)
 * [Akira Matsuda](https://github.com/amatsuda)
+* [Tee Parham](https://github.com/teeparham)
 
 ### Alumni
 

data/lib/haml/buffer.rb

@@ -4,6 +4,10 @@ module Haml
   # It's called from within the precompiled code,
   # and helps reduce the amount of processing done within `instance_eval`ed code.
   class Buffer
+    ID_KEY    = 'id'.freeze
+    CLASS_KEY = 'class'.freeze
+    DATA_KEY  = 'data'.freeze
+
     include Haml::Helpers
     include Haml::Util
 
@@ -115,8 +119,8 @@ module Haml
         text.sub!(tabs, '') if dont_tab_up
       end
 
-      @buffer << text
       @real_tabs += tab_change
+      @buffer << text
     end
 
     # Modifies the indentation of the document.
@@ -231,19 +235,19 @@ RUBY
     # @param from [{String => #to_s}] The attribute hash to merge from
     # @return [{String => String}] `to`, after being merged
     def self.merge_attrs(to, from)
-      from['id'] = Compiler.filter_and_join(from['id'], '_') if from['id']
-      if to['id'] && from['id']
-        to['id'] << "_#{from.delete('id')}"
-      elsif to['id'] || from['id']
-        from['id'] ||= to['id']
+      from[ID_KEY] = Compiler.filter_and_join(from[ID_KEY], '_') if from[ID_KEY]
+      if to[ID_KEY] && from[ID_KEY]
+        to[ID_KEY] << "_#{from.delete(ID_KEY)}"
+      elsif to[ID_KEY] || from[ID_KEY]
+        from[ID_KEY] ||= to[ID_KEY]
       end
 
-      from['class'] = Compiler.filter_and_join(from['class'], ' ') if from['class']
-      if to['class'] && from['class']
+      from[CLASS_KEY] = Compiler.filter_and_join(from[CLASS_KEY], ' ') if from[CLASS_KEY]
+      if to[CLASS_KEY] && from[CLASS_KEY]
         # Make sure we don't duplicate class names
-        from['class'] = (from['class'].to_s.split(' ') | to['class'].split(' ')).sort.join(' ')
-      elsif to['class'] || from['class']
-        from['class'] ||= to['class']
+        from[CLASS_KEY] = (from[CLASS_KEY].to_s.split(' ') | to[CLASS_KEY].split(' ')).sort.join(' ')
+      elsif to[CLASS_KEY] || from[CLASS_KEY]
+        from[CLASS_KEY] ||= to[CLASS_KEY]
       end
 
       from.keys.each do |key|
@@ -327,7 +331,7 @@ RUBY
         id = "#{ prefix }_#{ id }"
       end
 
-      {'id' => id, 'class' => class_name}
+      {ID_KEY => id, CLASS_KEY => class_name}
     end
 
     # Changes a word from camel case to underscores.

data/lib/haml/helpers.rb

@@ -194,19 +194,18 @@ MESSAGE
     # @yieldparam item An element of `enum`
     def list_of(enum, opts={}, &block)
       opts_attributes = opts.empty? ? "" : " ".<<(opts.map{|k,v| "#{k}='#{v}'" }.join(" "))
-      to_return = enum.collect do |i|
+      enum.collect do |i|
         result = capture_haml(i, &block)
 
-        if result.count("\n") > 1
+        result = if result.count("\n") > 1
           result.gsub!("\n", "\n  ")
-          result = "\n  #{result.strip}\n"
+          "\n  #{result.strip}\n"
         else
-          result = result.strip
+          result.strip
         end
 
         %Q!<li#{opts_attributes}>#{result}</li>!
-      end
-      to_return.join("\n")
+      end.join("\n")
     end
 
     # Returns a hash containing default assignments for the `xmlns`, `lang`, and `xml:lang`
@@ -372,25 +371,16 @@ MESSAGE
         position = haml_buffer.buffer.length
 
         haml_buffer.capture_position = position
-        block.call(*args)
+        value = block.call(*args)
 
         captured = haml_buffer.buffer.slice!(position..-1)
-        return captured if haml_buffer.options[:ugly]
-        # Note that the "reject" is needed for rbx 1.2.4, which includes empty
-        # strings in the returned array when splitting by /^/.
-        captured = captured.split(/^/)
-        captured.delete('')
-
-        min_tabs = nil
-        captured.each do |line|
-          tabs = line.index(/[^ ]/) || line.length
-          min_tabs ||= tabs
-          min_tabs = min_tabs > tabs ? tabs : min_tabs
+
+        if captured == '' and value != haml_buffer.buffer
+          captured = (value.is_a?(String) ? value : nil)
         end
 
-        captured.map do |line|
-          line.slice(min_tabs, line.length)
-        end.join
+        return nil if captured.nil?
+        return (haml_buffer.options[:ugly] ? captured : prettify(captured))
       end
     ensure
       haml_buffer.capture_position = nil
@@ -400,10 +390,10 @@ MESSAGE
     #
     # @param text [#to_s] The text to output
     def haml_concat(text = "")
-      unless haml_buffer.options[:ugly] || haml_indent == 0
-        haml_buffer.buffer << %[#{haml_indent}#{text.to_s.gsub("\n", "\n#{haml_indent}")}\n]
-      else
+      if haml_buffer.options[:ugly] || haml_indent == 0
         haml_buffer.buffer << "#{text}\n"
+      else
+        haml_buffer.buffer << %[#{haml_indent}#{text.to_s.gsub("\n", "\n#{haml_indent}")}\n]
       end
       ErrorReturn.new("haml_concat")
     end
@@ -669,6 +659,22 @@ MESSAGE
       _erbout = _erbout = _hamlout.buffer
       proc { |*args| proc.call(*args) }
     end
+
+    def prettify(text)
+      text = text.split(/^/)
+      text.delete('')
+
+      min_tabs = nil
+      text.each do |line|
+        tabs = line.index(/[^ ]/) || line.length
+        min_tabs ||= tabs
+        min_tabs = min_tabs > tabs ? tabs : min_tabs
+      end
+
+      text.map do |line|
+        line.slice(min_tabs, line.length)
+      end.join
+    end
   end
 end
 

data/lib/haml/helpers/action_view_extensions.rb

@@ -45,8 +45,8 @@ module Haml
       # @yield A block in which all input to `#haml_concat` is treated as raw.
       # @see Haml::Util#rails_xss_safe?
       def with_raw_haml_concat
+        old = instance_variable_defined?('@_haml_concat_raw') ? @_haml_concat_raw : false
         @_haml_concat_raw = true
-        old = @_haml_concat_raw
         yield
       ensure
         @_haml_concat_raw = old

data/lib/haml/helpers/action_view_mods.rb

@@ -41,20 +41,8 @@ module ActionView
         if Haml::Helpers.block_is_haml?(block)
           #double assignment is to avoid warnings
           _hamlout = _hamlout = eval('_hamlout', block.binding) # Necessary since capture_haml checks _hamlout
-          value = nil
-          buffer = capture_haml(*args) { value = yield(*args) }
-          str =
-            if !buffer.empty?
-              buffer
-            elsif value.is_a?(String)
-              value
-            else
-              nil
-            end
-          # NonCattingString is present in Rails less than 3.1.0. When support
-          # for 3.0 is dropped, this can be removed.
-          return ActionView::NonConcattingString.new(str) if str && defined?(ActionView::NonConcattingString)
-          return str
+
+          capture_haml(*args, &block)
         else
           capture_without_haml(*args, &block)
         end
@@ -151,4 +139,4 @@ module ActionView
       alias_method :form_for, :form_for_with_haml
     end
   end
-end
+end

data/lib/haml/options.rb

@@ -6,7 +6,9 @@ module Haml
 
     @defaults = {
       :attr_wrapper         => "'",
-      :autoclose            => %w(meta img link br hr input area param col base),
+      :autoclose            => %w(area base basefont br col command embed frame
+                                  hr img input isindex keygen link menuitem meta
+                                  param source track wbr),
       :encoding             => "UTF-8",
       :escape_attrs         => true,
       :escape_html          => false,

data/lib/haml/parser.rb

@@ -85,6 +85,9 @@ module Haml
     # The Regex that matches a literal string or symbol value
     LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?!\\|\#{|\#@|\#\$|\2).|\\.)*\2/
 
+    ID_KEY    = 'id'.freeze
+    CLASS_KEY = 'class'.freeze
+
     def initialize(template, options)
       @options            = options
       @flat               = false
@@ -165,8 +168,8 @@ module Haml
       return @template_tabs + 1 if flat? && line.whitespace =~ /^#{@flat_spaces}/
 
       message = Error.message(:inconsistent_indentation,
-        Haml::Util.human_indentation(line.whitespace),
-        Haml::Util.human_indentation(@indentation)
+        human_indentation(line.whitespace),
+        human_indentation(@indentation)
       )
       raise SyntaxError.new(message, line.index)
     end
@@ -509,13 +512,13 @@ module Haml
       list.scan(/([#.])([-:_a-zA-Z0-9]+)/) do |type, property|
         case type
         when '.'
-          if attributes['class']
-            attributes['class'] += " "
+          if attributes[CLASS_KEY]
+            attributes[CLASS_KEY] += " "
           else
-            attributes['class'] = ""
+            attributes[CLASS_KEY] = ""
           end
-          attributes['class'] += property
-        when '#'; attributes['id'] = property
+          attributes[CLASS_KEY] += property
+        when '#'; attributes[ID_KEY] = property
         end
       end
       attributes

data/lib/haml/railtie.rb

@@ -1,4 +1,11 @@
 if defined?(ActiveSupport)
+  # check for a compatible Rails version when Haml is loaded
+  if (activesupport_spec = Gem.loaded_specs['activesupport'])
+    if activesupport_spec.version.to_s < '3.2'
+      raise Exception.new("\n\n** Haml now requires Rails 3.2 and later. Use Haml version 4.0.4\n\n")
+    end
+  end
+
   require 'haml/template/options'
   ActiveSupport.on_load(:before_initialize) do
     ActiveSupport.on_load(:action_view) do
@@ -19,4 +26,4 @@ module Haml
 end
 
 require "haml/helpers/safe_erubis_template"
-Haml::Filters::Erb.template_class = Haml::SafeErubisTemplate
+Haml::Filters::Erb.template_class = Haml::SafeErubisTemplate

data/lib/haml/template/plugin.rb

@@ -1,17 +1,7 @@
 module Haml
 
   # This module makes Haml work with Rails using the template handler API.
-  class Plugin < ActionView::Template::Handlers::ERB.superclass
-
-    # Rails 3.1+, template handlers don't inherit from anything. In <= 3.0, they
-    # do. To avoid messy logic figuring this out, we just inherit from whatever
-    # the ERB handler does.
-
-    # In Rails 3.1+, we don't need to include Compilable.
-    if (ActionPack::VERSION::MAJOR == 3) && (ActionPack::VERSION::MINOR < 1)
-      include ActionView::Template::Handlers::Compilable
-    end
-
+  class Plugin
     def handles_encoding?; true; end
 
     def compile(template)
@@ -25,7 +15,6 @@ module Haml
       Haml::Engine.new(template.source, options).compiler.precompiled_with_ambles([])
     end
 
-    # In Rails 3.1+, #call takes the place of #compile
     def self.call(template)
       new.compile(template)
     end
@@ -38,4 +27,4 @@ module Haml
   end
 end
 
-ActionView::Template.register_template_handler(:haml, Haml::Plugin)
+ActionView::Template.register_template_handler(:haml, Haml::Plugin)

data/lib/haml/temple.rb

@@ -0,0 +1,85 @@
+require 'haml'
+require 'temple'
+
+module Haml
+
+  module Temple
+
+    module Expressions
+      def on_plain
+        [:static, "\n" + value[:text]]
+      end
+
+      def on_root
+        [:multi]
+      end
+
+      def on_doctype
+        [:html, :doctype, value[:version] || 5]
+      end
+
+      def on_tag
+        exp = [:html, :tag, value[:name], [:html, :attrs]]
+        if value[:value] && value[:value] != ""
+          if value[:parse]
+            exp.push << [:dynamic, value[:value]]
+          else
+            exp.push << [:static, value[:value]]
+          end
+        end
+
+        if attribs = value[:attributes]
+          attribs.each do |key, value|
+            exp.last << [:html, :attr, key, [:static, value]]
+          end
+        end
+
+        exp
+      end
+    end
+
+    class Parser
+      def initialize(*args)
+        @options = Options.new
+      end
+
+      def call(haml)
+        parser = ::Haml::Parser.new(haml, @options)
+        tree = parser.parse.tap {|x| p x; puts '-' * 10}
+        compile(tree).tap {|x| p x; puts '-' * 10}
+      end
+
+      private
+
+      def compile(node)
+        exp = node.to_temple
+        return exp if node.children.empty?
+        if node.children.length == 1
+          exp.push compile(node.children[0])
+        else
+          exp.push [:multi, *node.children.map {|c| compile(c)}]
+        end
+        exp
+      end
+    end
+
+    class Engine < ::Temple::Engine
+      use ::Haml::Temple::Parser
+      html :Pretty
+      filter :ControlFlow
+      generator :ArrayBuffer
+    end
+  end
+
+  class Parser::ParseNode
+    include ::Haml::Temple::Expressions
+
+    def to_temple
+      begin
+        send "on_#{type}"
+      end
+    end
+  end
+end
+
+Haml::Temple::Template = Temple::Templates::Tilt(Haml::Temple::Engine, :register_as => :haml)

data/lib/haml/util.rb

@@ -56,19 +56,6 @@ module Haml
       $stderr = the_real_stderr
     end
 
-    # Returns an ActionView::Template* class.
-    # In pre-3.0 versions of Rails, most of these classes
-    # were of the form `ActionView::TemplateFoo`,
-    # while afterwards they were of the form `ActionView::Template::Foo`.
-    #
-    # @param name [#to_s] The name of the class to get.
-    #   For example, `:Error` will return `ActionView::TemplateError`
-    #   or `ActionView::Template::Error`.
-    def av_template_class(name)
-      return ActionView.const_get("Template#{name}") if ActionView.const_defined?("Template#{name}")
-      return ActionView::Template.const_get(name.to_s)
-    end
-
     ## Rails XSS Safety
 
     # Whether or not ActionView's XSS protection is available and enabled,

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.1.0.alpha.2"
+  VERSION = "4.1.0.beta.1"
 end

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

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
 
-gem 'rails', '>= 3.2.0', '< 3.3.0'
+gem 'rails', '~> 3.2.0'
 gemspec :path => "../.."
-

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

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem 'bundler', '~> 1.3.0'
-gem 'rails', '~> 4.0.0.rc1'
+gem 'coveralls', require: false
+gem 'rails', '~> 4.0.0'
 gemspec :path => '../..'

data/test/helper_test.rb

@@ -14,6 +14,16 @@ module Haml::Helpers
   def something_that_uses_haml_concat
     haml_concat('foo').to_s
   end
+
+  def render_something_with_haml_concat
+    haml_concat "<p>"
+  end
+
+  def render_something_with_haml_tag_and_concat
+    haml_tag 'p' do
+      haml_concat '<foo>'
+    end
+  end
 end
 
 class HelperTest < MiniTest::Unit::TestCase
@@ -34,12 +44,6 @@ class HelperTest < MiniTest::Unit::TestCase
     @base = ActionView::Base.new
     @base.controller = ActionController::Base.new
     @base.view_paths << File.expand_path("../templates", __FILE__)
-
-    if defined?(ActionController::Response)
-      # This is needed for >=3.0.0
-      @base.controller.response = ActionController::Response.new
-    end
-
     @base.instance_variable_set('@post', Post.new("Foo bar\nbaz", nil, PostErrors.new))
   end
 
@@ -48,6 +52,15 @@ class HelperTest < MiniTest::Unit::TestCase
     super
   end
 
+  def test_rendering_with_escapes
+    output = render(<<-HAML, :action_view)
+- render_something_with_haml_concat
+- render_something_with_haml_tag_and_concat
+- render_something_with_haml_concat
+HAML
+    assert_equal("&lt;p&gt;\n<p>\n  <foo>\n</p>\n&lt;p&gt;\n", output)
+  end
+
   def test_flatten
     assert_equal("FooBar", Haml::Helpers.flatten("FooBar"))
 
@@ -101,7 +114,7 @@ HAML
 
     begin
       ActionView::Base.new.render(:inline => "<%= flatten('Foo\\nBar') %>")
-    rescue NoMethodError, Haml::Util.av_template_class(:Error)
+    rescue NoMethodError, ActionView::Template::Error
       proper_behavior = true
     end
     assert(proper_behavior)

data/test/template_test.rb

@@ -91,7 +91,7 @@ class TemplateTest < MiniTest::Unit::TestCase
         assert_equal(pair.first, pair.last, message)
       end
     end
-  rescue Haml::Util.av_template_class(:Error) => e
+  rescue ActionView::Template::Error => e
     if e.message =~ /Can't run [\w:]+ filter; required (one of|file) ((?:'\w+'(?: or )?)+)(, but none were found| not found)/
       puts "\nCouldn't require #{$2}; skipping a test."
     else
@@ -111,6 +111,29 @@ class TemplateTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_render_method_returning_null_with_ugly
+    @base.instance_eval do
+      def empty
+        nil
+      end
+      def render_something(&block)
+        capture(self, &block)
+      end
+    end
+
+    content_to_render = "%h1 This is part of the broken view.\n= render_something do |thing|\n  = thing.empty do\n    = 'test'"
+    result = render(content_to_render, :ugly => true)
+    expected_result = "<h1>This is part of the broken view.</h1>\n"
+    assert_equal(expected_result, result)
+  end
+
+  def test_simple_rendering_with_ugly
+    content_to_render = "%p test\n= capture { 'foo' }"
+    result = render(content_to_render, :ugly => true)
+    expected_result = "<p>test</p>\nfoo\n"
+    assert_equal(expected_result, result)
+  end
+
   def test_templates_should_render_correctly_with_render_proc
     assert_renders_correctly("standard") do |name|
       engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :format => :xhtml)

data/test/test_helper.rb

@@ -1,18 +1,29 @@
+begin
+  if RUBY_VERSION >= '2.0.0'
+    require 'coveralls'
+    Coveralls.wear!
+  end
+rescue LoadError
+  # ignore error for other test Gemfiles
+end
+
 if ENV["COVERAGE"]
   require "simplecov"
   SimpleCov.start
 end
 
-require 'rubygems'
-gem "minitest"
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'action_pack'
 require 'action_controller'
 require 'action_view'
 require 'nokogiri'
-
 require 'rails'
+
+if defined?(I18n.enforce_available_locales)
+  I18n.enforce_available_locales = true
+end
+
 class TestApp < Rails::Application
   config.root = ""
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 4.1.0.alpha.2
+  version: 4.1.0.beta.1
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,78 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: tilt
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rails
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rbench
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: minitest
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: nokogiri
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.6.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.6.0
 description: |
   Haml (HTML Abstraction Markup Language) is a layer on top of HTML or XML that's
   designed to express the structure of documents in a non-repetitive, elegant, and
@@ -96,6 +96,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- CHANGELOG.md
+- FAQ.md
+- MIT-LICENSE
+- README.md
+- REFERENCE.md
+- Rakefile
+- bin/haml
 - lib/haml.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
@@ -104,39 +112,34 @@ files:
 - lib/haml/exec.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
-- lib/haml/options.rb
-- lib/haml/parser.rb
-- lib/haml/railtie.rb
-- lib/haml/sass_rails_filter.rb
-- lib/haml/template.rb
-- lib/haml/util.rb
-- lib/haml/version.rb
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/action_view_xss_mods.rb
 - lib/haml/helpers/safe_erubis_template.rb
 - lib/haml/helpers/xss_mods.rb
+- lib/haml/options.rb
+- lib/haml/parser.rb
+- lib/haml/railtie.rb
+- lib/haml/sass_rails_filter.rb
+- lib/haml/template.rb
 - lib/haml/template/options.rb
 - lib/haml/template/plugin.rb
-- bin/haml
+- lib/haml/temple.rb
+- lib/haml/util.rb
+- lib/haml/version.rb
 - test/engine_test.rb
-- test/filters_test.rb
-- test/helper_test.rb
-- test/parser_test.rb
-- test/template_test.rb
-- test/test_helper.rb
-- test/util_test.rb
 - test/erb/_av_partial_1.erb
 - test/erb/_av_partial_2.erb
 - test/erb/action_view.erb
 - test/erb/standard.erb
-- test/gemfiles/Gemfile.rails-3.0.x
-- test/gemfiles/Gemfile.rails-3.1.x
+- test/filters_test.rb
 - test/gemfiles/Gemfile.rails-3.2.x
 - test/gemfiles/Gemfile.rails-4.0.x
 - test/gemfiles/Gemfile.rails-4.0.x.lock
+- test/helper_test.rb
 - test/markaby/standard.mab
 - test/mocks/article.rb
+- test/parser_test.rb
 - test/results/content_for_layout.xhtml
 - test/results/eval_suppressed.xhtml
 - test/results/helpers.xhtml
@@ -155,6 +158,7 @@ files:
 - test/results/tag_parsing.xhtml
 - test/results/very_basic.xhtml
 - test/results/whitespace_handling.xhtml
+- test/template_test.rb
 - test/templates/_av_partial_1.haml
 - test/templates/_av_partial_1_ugly.haml
 - test/templates/_av_partial_2.haml
@@ -188,13 +192,8 @@ files:
 - test/templates/very_basic.haml
 - test/templates/whitespace_handling.haml
 - test/templates/with_bom.haml
-- Rakefile
-- ".yardopts"
-- CHANGELOG.md
-- FAQ.md
-- MIT-LICENSE
-- README.md
-- REFERENCE.md
+- test/test_helper.rb
+- test/util_test.rb
 homepage: http://haml.info/
 licenses:
 - MIT
@@ -230,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.

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

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem 'rails', '>= 3.0.0', '<  3.1.0'
-gemspec :path => "../.."
-

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

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'rails', '>= 3.1.0', '< 3.2.0'
-gemspec :path => "../.."
-
-