haml 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2164872cd8f38c57307ec65c2834988d49538cec038795797be328bd18e3e1c4
-  data.tar.gz: 6f090e38ab9856973b42a8f61bc34fe10fa7df3595dfc3939c0ead7c422d66d1
+  metadata.gz: fb6c73536c5c41a0bdc61a99d45dd465616af8ef38392c6eadee4e82a5150556
+  data.tar.gz: e932ae5a4187ff9b4b6c4ea09c4d478009408a576282bee619075314dc7d88f7
 SHA512:
-  metadata.gz: 510cbbc03d5d46c0430d7a866166fc089dd253a98584d540d9a46cd2610bb5fc327d39e830c05a939266b330c1048ce9e47a269b39b2c7d35cb0a4ed5d370be0
-  data.tar.gz: 3292001c396a698256d7292309e631c6d81bb02f26a4fc1b4763ad537dd97a808aa9abd27b3841091afe9a120dfb5dc868c6dfb8c96cbd6538383e92f2871a91
+  metadata.gz: 99f293970f051c7b007b8e0620bc64ee416868907b20e7ff10985c27920e7d3221c3ac7e6e4d1b51ecb763cf3a6315db886e0f1ca2cd978bb81e5febcf24a10c
+  data.tar.gz: 37812661dcea2d7de576c38f38df1f4a07231108ef47655cb1ea32f5e2470abe8c9501d1b54a69865d47fb71c9213914d9394fe9372ca8ba601d9bdf33e09a4e

data/.travis.yml

@@ -4,14 +4,18 @@ language: ruby
 cache: bundler
 rvm:
   - ruby-head
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - 2.3.8
+  - 2.2.10
   - 2.1.10
   - 2.0.0
-  - jruby-9.1.12.0
+  - jruby-9.2.7.0
   - rbx-3
 gemfile:
+  - test/gemfiles/Gemfile.rails-6.0.x
+  - test/gemfiles/Gemfile.rails-5.2.x
   - test/gemfiles/Gemfile.rails-5.1.x
   - test/gemfiles/Gemfile.rails-5.0.x
   - test/gemfiles/Gemfile.rails-5.0.x.erubi
@@ -20,6 +24,20 @@ gemfile:
   - test/gemfiles/Gemfile.rails-4.0.x
 matrix:
   exclude:
+    - rvm: 2.0.0
+      gemfile: test/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.1.10
+      gemfile: test/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.2.10
+      gemfile: test/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.3.8
+      gemfile: test/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.4.6
+      gemfile: test/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.0.0
+      gemfile: test/gemfiles/Gemfile.rails-5.2.x
+    - rvm: 2.1.10
+      gemfile: test/gemfiles/Gemfile.rails-5.2.x
     - rvm: 2.0.0
       gemfile: test/gemfiles/Gemfile.rails-5.1.x
     - rvm: 2.1.10
@@ -32,12 +50,28 @@ matrix:
       gemfile: test/gemfiles/Gemfile.rails-5.0.x
     - rvm: 2.1.10
       gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-    - rvm: 2.4.2
+    - rvm: 2.4.6
       gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 2.4.2
+    - rvm: 2.4.6
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: 2.4.2
+    - rvm: 2.4.6
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: 2.5.5
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.5.5
+      gemfile: test/gemfiles/Gemfile.rails-4.1.x
+    - rvm: 2.5.5
+      gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: 2.6.3
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.6.3
+      gemfile: test/gemfiles/Gemfile.rails-4.1.x
+    - rvm: 2.6.3
+      gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: 2.6.3
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.6.3
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
     - rvm: ruby-head
       gemfile: test/gemfiles/Gemfile.rails-4.0.x
     - rvm: ruby-head
@@ -45,10 +79,21 @@ matrix:
     - rvm: ruby-head
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
   include:
-    - rvm: 2.4.2
+    - rvm: 2.6.3
       gemfile: test/gemfiles/Gemfile.rails-edge
   allow_failures:
+    - rvm: ruby-head
     - rvm: rbx-3
     - gemfile: test/gemfiles/Gemfile.rails-edge
+    - rvm: jruby-9.2.7.0
+      gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: jruby-9.2.7.0
+      gemfile: test/gemfiles/Gemfile.rails-4.1.x
+    - rvm: jruby-9.2.7.0
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x
+    - rvm: jruby-9.2.7.0
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
   fast_finish: true
+before_install: gem i rubygems-update -v '<3' && update_rubygems # https://github.com/travis-ci/travis-ci/issues/8974
+before_install: gem i bundler -v '<2'
 script: "bundle exec rake submodules test"

data/.yardopts

@@ -7,8 +7,7 @@
 --title            "Haml Documentation"
 --query            'object.type != :classvariable'
 --query            'object.type != :constant || @api && @api.text == "public"'
---exclude          lib/haml/template/patch.rb
---exclude          lib/haml/template/plugin.rb
+--exclude          lib/haml/plugin.rb
 --exclude          lib/haml/railtie.rb
 --exclude          lib/haml/helpers/action_view_mods.rb
 --exclude          lib/haml/helpers/xss_mods.rb

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Haml Changelog
 
+## 5.1.0
+
+Released on May 16, 2019
+([diff](https://github.com/haml/haml/compare/v5.0.4...v5.1.0)).
+
+* Rails 6 support [#1008](https://github.com/haml/haml/pull/1008) (thanks [Seb Jacobs](https://github.com/sebjacobs))
+* Add `escape_filter_interpolations` option for backwards compatibility with haml 4 defaults [#984](https://github.com/haml/haml/pull/984) (thanks [Will Jordan](https://github.com/wjordan))
+* Fix error on empty :javascript and :css filter blocks [#986](https://github.com/haml/haml/pull/986) (thanks [Will Jordan](https://github.com/wjordan))
+* Respect changes in Haml::Options.defaults in `Haml::TempleEngine` options (Takashi Kokubun)
+* Un-freeze TempleEngine precompiled string literals [#983](https://github.com/haml/haml/pull/983) (thanks [Will Jordan](https://github.com/wjordan))
+* Various performance/memory improvements [#965](https://github.com/haml/haml/pull/965), [#966](https://github.com/haml/haml/pull/966), [#963](https://github.com/haml/haml/pull/963) (thanks [Dillon Welch](https://github.com/oniofchaos))
+* Enable `frozen_string_literal` magic comment for all .rb files [#967](https://github.com/haml/haml/pull/967) (thanks [Dillon Welch](https://github.com/oniofchaos))
+
 ## 5.0.4
 
 Released on October 13, 2017
@@ -1452,4 +1465,3 @@ 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/Gemfile

@@ -5,7 +5,7 @@ gem "m"
 gem "pry"
 
 group :docs do
-  gem "yard", "~> 0.8.0"
+  gem "yard"
   gem "kramdown"
   gem "sass"
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin and Natalie Weizenbaum
+Copyright (c) 2006-2019 Hampton Catlin and Natalie Weizenbaum
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -191,7 +191,7 @@ Some of Natalie's work on Haml was supported by Unspace Interactive.
 
 Beyond that, the implementation is licensed under the MIT License.
 
-Copyright (c) 2006-2013 Hampton Catlin, Natalie Weizenbaum and the Haml team
+Copyright (c) 2006-2019 Hampton Catlin, Natalie Weizenbaum and the Haml team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/REFERENCE.md

@@ -115,6 +115,11 @@ Haml::Options.defaults:
 
     Haml::Options.defaults[:format] = :html5
 
+In sinatra specifically, you can set them in global config with:
+```ruby
+set :haml, { escape_html: true }
+```
+
 Finally, you can also set them by passing an options hash to
 {Haml::Engine#initialize}. For the complete list of available options, please
 see {Haml::Options}.
@@ -1120,8 +1125,8 @@ is compiled to
       <p>I <strong>really</strong> prefer <em>raspberry</em> jam.</p>
     </div>
 
-Note that `#{}` interpolation within filters is HTML-escaped if you specify
-{Haml::Options#escape_html `:escape_html`} option.
+Note that `#{}` interpolation within filters is HTML-escaped if you specify true to
+{Haml::Options#escape_filter_interpolations `:escape_filter_interpolations`} option.
 
 The functionality of some filters such as Markdown can be provided by many
 different libraries. Usually you don't have to worry about this - you can just

data/benchmark.rb

@@ -12,7 +12,7 @@ END
   exit 1
 end
 
-%w[erb erubis rails active_support action_controller
+%w[erb erubi rails active_support action_controller
    action_view action_pack haml/template rbench].each {|dep| require(dep)}
 
 def view
@@ -28,7 +28,7 @@ end
 RBench.run(times) do
   column :haml, :title => "Haml"
   column :erb, :title => "ERB"
-  column :erubis, :title => "Erubis"
+  column :erubi, :title => "Erubi"
 
   template_name = 'standard'
   haml_template    = File.read("#{File.dirname(__FILE__)}/test/templates/#{template_name}.haml")
@@ -38,12 +38,16 @@ RBench.run(times) do
     obj = Object.new
 
     Haml::Engine.new(haml_template).def_method(obj, :haml)
-    Erubis::Eruby.new(erb_template).def_method(obj, :erubis)
-    obj.instance_eval("def erb; #{ERB.new(erb_template, nil, '-').src}; end")
+    if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+      obj.instance_eval("def erb; #{ERB.new(erb_template, trim_mode: '-').src}; end")
+    else
+      obj.instance_eval("def erb; #{ERB.new(erb_template, nil, '-').src}; end")
+    end
+    obj.instance_eval("def erubi; #{Erubi::Engine.new(erb_template).src}; end")
 
     haml      { obj.haml }
     erb       { obj.erb }
-    erubis    { obj.erubis }
+    erubi     { obj.erubi }
   end
 
   report "ActionView" do
@@ -51,8 +55,8 @@ RBench.run(times) do
     render view, 'templates/standard'
     render view, 'erb/standard'
 
-    haml { render view, 'templates/standard' }
-    erb  { render view, 'erb/standard' }
+    haml  { render view, 'templates/standard' }
+    erubi { render view, 'erb/standard' }
   end
 
   report "ActionView with deep partials" do
@@ -60,7 +64,7 @@ RBench.run(times) do
     render view, 'templates/action_view'
     render view, 'erb/action_view'
 
-    haml { render view, 'templates/action_view' }
-    erb  { render view, 'erb/action_view' }
+    haml  { render view, 'templates/action_view' }
+    erubi { render view, 'erb/action_view' }
   end
 end

data/haml.gemspec

@@ -6,15 +6,13 @@ Gem::Specification.new do |spec|
   spec.summary     = "An elegant, structured (X)HTML/XML templating engine."
   spec.version     = Haml::VERSION
   spec.authors     = ['Natalie Weizenbaum', 'Hampton Catlin', 'Norman Clarke', 'Akira Matsuda']
-  spec.email       = ['haml@googlegroups.com', 'norman@njclarke.com']
+  spec.email       = ['haml@googlegroups.com', 'ronnie@dio.jp']
 
-  readmes          = Dir['*'].reject{ |x| x =~ /(^|[^.a-z])[a-z]+/ || x == "TODO" }
   spec.executables = ['haml']
   spec.files       = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{\Atest/})
   end
   spec.homepage    = 'http://haml.info/'
-  spec.has_rdoc    = false
   spec.license     = "MIT"
 
   spec.required_ruby_version = '>= 2.0.0'

data/lib/haml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'haml/version'
 
 # The module that contains everything Haml-related:

data/lib/haml/attribute_builder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   module AttributeBuilder
     # https://html.spec.whatwg.org/multipage/syntax.html#attributes-2

data/lib/haml/attribute_compiler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'haml/attribute_parser'
 
 module Haml

data/lib/haml/attribute_parser.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+
 begin
   require 'ripper'
 rescue LoadError
 end
+require 'temple/static_analyzer'
 
 module Haml
   # Haml::AttriubuteParser parses Hash literal to { String (key name) => String (value literal) }.

data/lib/haml/buffer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   # This class is used only internally. It holds the buffer of HTML that
   # is eventually output as the resulting document.
@@ -132,7 +133,9 @@ module Haml
     def attributes(class_id, obj_ref, *attributes_hashes)
       attributes = class_id
       attributes_hashes.each do |old|
-        AttributeBuilder.merge_attributes!(attributes, Hash[old.map {|k, v| [k.to_s, v]}])
+        result = {}
+        old.each { |k, v| result[k.to_s] = v }
+        AttributeBuilder.merge_attributes!(attributes, result)
       end
       AttributeBuilder.merge_attributes!(attributes, parse_object_ref(obj_ref)) if obj_ref
       AttributeBuilder.build_attributes(

data/lib/haml/compiler.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'haml/attribute_builder'
 require 'haml/attribute_compiler'
 require 'haml/temple_line_counter'
@@ -315,7 +316,7 @@ module Haml
 
       case last.first
       when :text
-        last[1].rstrip!
+        last[1] = last[1].rstrip
         if last[1].empty?
           @to_merge.slice! index
           rstrip_buffer! index

data/lib/haml/engine.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'forwardable'
 
 require 'haml/parser'
@@ -51,6 +52,9 @@ module Haml
     #   see {file:REFERENCE.md#options the Haml options documentation}
     # @raise [Haml::Error] if there's a Haml syntax error in the template
     def initialize(template, options = {})
+      # Reflect changes of `Haml::Options.defaults` to `Haml::TempleEngine` options, but `#initialize_encoding`
+      # should be run against the arguemnt `options[:encoding]` for backward compatibility with old `Haml::Engine`.
+      options = Options.defaults.dup.tap { |o| o.delete(:encoding) }.merge!(options)
       @options = Options.new(options)
 
       @template = check_haml_encoding(template) do |msg, line|
@@ -166,8 +170,13 @@ module Haml
       end
 
       begin
-        eval("Proc.new { |*_haml_locals| _haml_locals = _haml_locals[0] || {};" <<
-             @temple_engine.precompiled_with_ambles(local_names) << "}\n", scope, @options.filename, @options.line)
+        str = @temple_engine.precompiled_with_ambles(local_names)
+        eval(
+          "Proc.new { |*_haml_locals| _haml_locals = _haml_locals[0] || {}; #{str}}\n",
+          scope,
+          @options.filename,
+          @options.line
+        )
       rescue ::SyntaxError => e
         raise SyntaxError, e.message
       end

data/lib/haml/error.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   # An exception raised by Haml code.
   class Error < StandardError

data/lib/haml/escapable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   # Like Temple::Filters::Escapable, but with support for escaping by
   # Haml::Herlpers.html_escape and Haml::Herlpers.escape_once.

data/lib/haml/exec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'optparse'
 require 'rbconfig'
 require 'pp'

data/lib/haml/filters.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require "tilt"
 
 module Haml
@@ -164,7 +165,11 @@ module Haml
           if contains_interpolation?(text)
             return if options[:suppress_eval]
 
-            text = unescape_interpolation(text, options[:escape_html]).gsub(/(\\+)n/) do |s|
+            escape = options[:escape_filter_interpolations]
+            # `escape_filter_interpolations` defaults to `escape_html` if unset.
+            escape = options[:escape_html] if escape.nil?
+
+            text = unescape_interpolation(text, escape).gsub(/(\\+)n/) do |s|
               escapes = $1.size
               next s if escapes % 2 == 0
               "#{'\\' * (escapes - 1)}\n"
@@ -182,9 +187,8 @@ RUBY
             return
           end
 
-          rendered = Haml::Helpers::find_and_preserve(filter.render_with_options(text, compiler.options), compiler.options[:preserve])
-          rendered.rstrip!
-          push_text("#{rendered}\n")
+          rendered = Haml::Helpers::find_and_preserve(filter.render_with_options(text.to_s, compiler.options), compiler.options[:preserve])
+          push_text("#{rendered.rstrip}\n")
         end
       end
     end
@@ -247,10 +251,7 @@ RUBY
 
       # @see Base#render
       def render(text)
-        text = "\n#{text}"
-        text.rstrip!
-        text.gsub!("\n", "\n    ")
-        "<![CDATA[#{text}\n]]>"
+        "<![CDATA[#{"\n#{text.rstrip}".gsub("\n", "\n    ")}\n]]>"
       end
     end
 

data/lib/haml/generator.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 module Haml
   # Ruby code generator, which is a limited version of Temple::Generator.
   # Limit methods since Haml doesn't need most of them.

data/lib/haml/helpers.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'erb'
 
 module Haml
@@ -109,10 +110,7 @@ MESSAGE
     #   @yield The block within which to escape newlines
     def find_and_preserve(input = nil, tags = haml_buffer.options[:preserve], &block)
       return find_and_preserve(capture_haml(&block), input || tags) if block
-      tags = tags.each_with_object('') do |t, s|
-        s << '|' unless s.empty?
-        s << Regexp.escape(t)
-      end
+      tags = tags.map { |tag| Regexp.escape(tag) }.join('|')
       re = /<(#{tags})([^>]*)>(.*?)(<\/\1>)/im
       input.to_s.gsub(re) do |s|
         s =~ re # Can't rely on $1, etc. existing since Rails' SafeBuffer#gsub is incompatible
@@ -200,8 +198,8 @@ MESSAGE
     # @yield [item] A block which contains Haml code that goes within list items
     # @yieldparam item An element of `enum`
     def list_of(enum, opts={}, &block)
-      opts_attributes = opts.each_with_object('') {|(k, v), s| s << " #{k}='#{v}'"}
-      enum.each_with_object('') do |i, ret|
+      opts_attributes = opts.map { |k, v| " #{k}='#{v}'" }.join
+      enum.map do |i|
         result = capture_haml(i, &block)
 
         if result.count("\n") > 1
@@ -211,9 +209,8 @@ MESSAGE
           result.strip!
         end
 
-        ret << "\n" unless ret.empty?
-        ret << %Q!<li#{opts_attributes}>#{result}</li>!
-      end
+        %Q!<li#{opts_attributes}>#{result}</li>!
+      end.join("\n")
     end
 
     # Returns a hash containing default assignments for the `xmlns`, `lang`, and `xml:lang`
@@ -704,4 +701,3 @@ class Object
     false
   end
 end
-

data/lib/haml/helpers/action_view_extensions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   module Helpers
     @@action_view_defined = true

data/lib/haml/helpers/action_view_mods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   module Helpers
     module ActionViewMods
@@ -52,10 +53,12 @@ module ActionView
     end
 
     module TagHelper
+      DEFAULT_PRESERVE_OPTIONS = %w(textarea pre code).freeze
+
       def content_tag_with_haml(name, *args, &block)
         return content_tag_without_haml(name, *args, &block) unless is_haml?
 
-        preserve = haml_buffer.options.fetch(:preserve, %w[textarea pre code]).include?(name.to_s)
+        preserve = haml_buffer.options.fetch(:preserve, DEFAULT_PRESERVE_OPTIONS).include?(name.to_s)
 
         if block_given? && block_is_haml?(block) && preserve
           return content_tag_without_haml(name, *args) do

data/lib/haml/helpers/action_view_xss_mods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionView
   module Helpers
     module CaptureHelper

data/lib/haml/helpers/safe_erubi_template.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'action_view'
 
 module Haml

data/lib/haml/helpers/safe_erubis_template.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'action_view'
 
 module Haml

data/lib/haml/helpers/xss_mods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   module Helpers
     # This module overrides Haml helpers to work properly

data/lib/haml/options.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   # This class encapsulates all of the configuration options that Haml
   # understands. Please see the {file:REFERENCE.md#options Haml Reference} to
@@ -8,7 +9,7 @@ module Haml
     @valid_formats = [:html4, :html5, :xhtml]
 
     @buffer_option_keys = [:autoclose, :preserve, :attr_wrapper, :format,
-      :encoding, :escape_html, :escape_attrs, :hyphenate_data_attrs, :cdata]
+      :encoding, :escape_html, :escape_filter_interpolations, :escape_attrs, :hyphenate_data_attrs, :cdata]
 
     # The default option values.
     # @return Hash
@@ -85,6 +86,13 @@ module Haml
     # Defaults to false.
     attr_accessor :escape_html
 
+    # Sets whether or not to escape HTML-sensitive characters in interpolated strings.
+    # See also {file:REFERENCE.md#escaping_html Escaping HTML} and
+    # {file:REFERENCE.md#unescaping_html Unescaping HTML}.
+    #
+    # Defaults to the current value of `escape_html`.
+    attr_accessor :escape_filter_interpolations
+
     # The name of the Haml file being parsed.
     # This is only used as information when exceptions are raised. This is
     # automatically assigned when working through ActionView, so it's really

data/lib/haml/parser.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'strscan'
 
 module Haml
@@ -698,7 +699,7 @@ module Haml
       end
 
       static_attributes = {}
-      dynamic_attributes = "{"
+      dynamic_attributes = "{".dup
       attributes.each do |name, (type, val)|
         if type == :static
           static_attributes[name] = val
@@ -738,7 +739,7 @@ module Haml
 
       return name, [:static, content.first[1]] if content.size == 1
       return name, [:dynamic,
-        %!"#{content.each_with_object('') {|(t, v), s| s << (t == :str ? inspect_obj(v)[1...-1] : "\#{#{v}}")}}"!]
+        %!"#{content.each_with_object(''.dup) {|(t, v), s| s << (t == :str ? inspect_obj(v)[1...-1] : "\#{#{v}}")}}"!]
     end
 
     def next_line

data/lib/haml/plugin.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module Haml
 
   # This module makes Haml work with Rails using the template handler API.
   class Plugin
     def handles_encoding?; true; end
 
-    def compile(template)
+    def compile(template, source)
       options = Haml::Template.options.dup
       if template.respond_to?(:type)
         options[:mime_type] = template.type
@@ -13,14 +14,16 @@ module Haml
         options[:mime_type] = template.mime_type
       end
       options[:filename] = template.identifier
-      Haml::Engine.new(template.source, options).compiler.precompiled_with_ambles(
+      Haml::Engine.new(source, options).compiler.precompiled_with_ambles(
         [],
         after_preamble: '@output_buffer = output_buffer ||= ActionView::OutputBuffer.new if defined?(ActionView::OutputBuffer)',
       )
     end
 
-    def self.call(template)
-      new.compile(template)
+    def self.call(template, source = nil)
+      source ||= template.source
+
+      new.compile(template, source)
     end
 
     def cache_fragment(block, name = {}, options = nil)

data/lib/haml/railtie.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'haml/template/options'
 
 # 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")
+  if activesupport_spec.version.to_s < '4.0'
+    raise Exception.new("\n\n** Haml now requires Rails 4.0 and later. Use Haml version 4.0.x\n\n")
   end
 end
 

data/lib/haml/sass_rails_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   module Filters
     # This is an extension of Sass::Rails's SassTemplate class that allows

data/lib/haml/template.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'haml/template/options'
 if defined?(ActiveSupport)
   ActiveSupport.on_load(:action_view) do

data/lib/haml/template/options.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # We keep options in its own self-contained file
 # so that we can load it independently in Rails 3,
 # where the full template stuff is lazy-loaded.

data/lib/haml/temple_engine.rb

@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'temple'
 require 'haml/escapable'
 require 'haml/generator'
@@ -13,6 +14,7 @@ module Haml
       encoding:             nil,
       escape_attrs:         true,
       escape_html:          false,
+      escape_filter_interpolations: nil,
       filename:             '(haml)',
       format:               :html5,
       hyphenate_data_attrs: true,
@@ -49,12 +51,12 @@ module Haml
     # @return [String]
     def precompiled
       encoding = Encoding.find(@encoding || '')
-      return @precompiled.force_encoding(encoding) if encoding == Encoding::ASCII_8BIT
+      return @precompiled.dup.force_encoding(encoding) if encoding == Encoding::ASCII_8BIT
       return @precompiled.encode(encoding)
     end
 
     def precompiled_with_return_value
-      "#{precompiled};#{precompiled_method_return_value}"
+      "#{precompiled};#{precompiled_method_return_value}".dup
     end
 
     # The source code that is evaluated to produce the Haml document.
@@ -64,20 +66,20 @@ module Haml
     #
     # @return [String]
     def precompiled_with_ambles(local_names, after_preamble: '')
-      preamble = <<END.tr!("\n", ';')
+      preamble = <<END.tr("\n", ';')
 begin
 extend Haml::Helpers
 _hamlout = @haml_buffer = Haml::Buffer.new(haml_buffer, #{Options.new(options).for_buffer.inspect})
 _erbout = _hamlout.buffer
 #{after_preamble}
 END
-      postamble = <<END.tr!("\n", ';')
+      postamble = <<END.tr("\n", ';')
 #{precompiled_method_return_value}
 ensure
 @haml_buffer = @haml_buffer.upper if @haml_buffer
 end
 END
-      "#{preamble}#{locals_code(local_names)}#{precompiled}#{postamble}"
+      "#{preamble}#{locals_code(local_names)}#{precompiled}#{postamble}".dup
     end
 
     private
@@ -99,12 +101,12 @@ END
     def locals_code(names)
       names = names.keys if Hash === names
 
-      names.each_with_object('') do |name, code|
+      names.map do |name|
         # Can't use || because someone might explicitly pass in false with a symbol
         sym_local = "_haml_locals[#{inspect_obj(name.to_sym)}]"
         str_local = "_haml_locals[#{inspect_obj(name.to_s)}]"
-        code << "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local};"
-      end
+        "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local};"
+      end.join
     end
 
     def inspect_obj(obj)

data/lib/haml/temple_line_counter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
   # A module to count lines of expected code. This would be faster than actual code generation
   # and counting newlines in it.

data/lib/haml/util.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 begin
   require 'erubis/tiny'
@@ -166,7 +166,7 @@ MSG
     #   and the rest of the string.
     #   `["Foo (Bar (Baz bang) bop)", " (Bang (bop bip))"]` in the example above.
     def balance(scanner, start, finish, count = 0)
-      str = ''
+      str = ''.dup
       scanner = StringScanner.new(scanner) unless scanner.is_a? StringScanner
       regexp = Regexp.new("(.*?)[\\#{start.chr}\\#{finish.chr}]", Regexp::MULTILINE)
       while scanner.scan(regexp)
@@ -199,7 +199,7 @@ MSG
     end
 
     def unescape_interpolation(str, escape_html = nil)
-      res = ''
+      res = ''.dup
       rest = Haml::Util.handle_interpolation str.dump do |scan|
         escapes = (scan[2].size - 1) / 2
         char = scan[3] # '{', '@' or '$'
@@ -212,7 +212,7 @@ MSG
           else
             scan.scan(/\w+/)
           end
-          content = eval('"' + interpolated + '"')
+          content = eval("\"#{interpolated}\"")
           content.prepend(char) if char == '@' || char == '$'
           content = "Haml::Helpers.html_escape((#{content}))" if escape_html
 

data/lib/haml/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Haml
-  VERSION = "5.0.4"
+  VERSION = "5.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -105,7 +105,7 @@ description: |
   but it can function as a stand-alone templating engine.
 email:
 - haml@googlegroups.com
-- norman@njclarke.com
+- ronnie@dio.jp
 executables:
 - haml
 extensions: []
@@ -179,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.