haml 5.1.1 → 5.2.2

data/lib/haml/plugin.rb

@@ -4,6 +4,11 @@ module Haml
 
   # This module makes Haml work with Rails using the template handler API.
   class Plugin
+    class << self
+      attr_accessor :annotate_rendered_view_with_filenames
+    end
+    self.annotate_rendered_view_with_filenames = false
+
     def handles_encoding?; true; end
 
     def compile(template, source)
@@ -14,9 +19,21 @@ module Haml
         options[:mime_type] = template.mime_type
       end
       options[:filename] = template.identifier
+
+      preamble = '@output_buffer = output_buffer ||= ActionView::OutputBuffer.new if defined?(ActionView::OutputBuffer);'
+      postamble = ''
+
+      if self.class.annotate_rendered_view_with_filenames
+        # short_identifier is only available in Rails 6+. On older versions, 'inspect' gives similar results.
+        ident = template.respond_to?(:short_identifier) ? template.short_identifier : template.inspect
+        preamble += "haml_concat '<!-- BEGIN #{ident} -->'.html_safe;"
+        postamble += "haml_concat '<!-- END #{ident} -->'.html_safe;"
+      end
+
       Haml::Engine.new(source, options).compiler.precompiled_with_ambles(
         [],
-        after_preamble: '@output_buffer = output_buffer ||= ActionView::OutputBuffer.new if defined?(ActionView::OutputBuffer)',
+        after_preamble: preamble,
+        before_postamble: postamble
       )
     end
 

data/lib/haml/railtie.rb

@@ -42,6 +42,11 @@ module Haml
           Haml::Filters::RailsErb.template_class = Haml::SafeErubisTemplate
         end
         Haml::Template.options[:filters] = { 'erb' => Haml::Filters::RailsErb }
+
+        if app.config.respond_to?(:action_view) &&
+           app.config.action_view.annotate_rendered_view_with_filenames
+          Haml::Plugin.annotate_rendered_view_with_filenames = true
+        end
       end
     end
   end

data/lib/haml/temple_engine.rb

@@ -65,7 +65,7 @@ module Haml
     # (see {file:REFERENCE.md#encodings the `:encoding` option}).
     #
     # @return [String]
-    def precompiled_with_ambles(local_names, after_preamble: '')
+    def precompiled_with_ambles(local_names, after_preamble: '', before_postamble: '')
       preamble = <<END.tr("\n", ';')
 begin
 extend Haml::Helpers
@@ -74,6 +74,7 @@ _erbout = _hamlout.buffer
 #{after_preamble}
 END
       postamble = <<END.tr("\n", ';')
+#{before_postamble}
 #{precompiled_method_return_value}
 ensure
 @haml_buffer = @haml_buffer.upper if @haml_buffer

data/lib/haml/util.rb

@@ -213,7 +213,7 @@ MSG
             scan.scan(/\w+/)
           end
           content = eval("\"#{interpolated}\"")
-          content.prepend(char) if char == '@' || char == '$'
+          content = "#{char}#{content}" if char == '@' || char == '$'
           content = "Haml::Helpers.html_escape((#{content}))" if escape_html
 
           res << "\#{#{content}}"

data/lib/haml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Haml
-  VERSION = "5.1.1"
+  VERSION = "5.2.2"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Natalie Weizenbaum
 - Hampton Catlin
 - Norman Clarke
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -97,6 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 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
@@ -111,9 +125,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - FAQ.md
@@ -165,12 +179,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/haml/haml/issues
-  changelog_uri: https://github.com/haml/haml/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/haml/haml/blob/main/CHANGELOG.md
   documentation_uri: http://haml.info/docs.html
   homepage_uri: http://haml.info
   mailing_list_uri: https://groups.google.com/forum/?fromgroups#!forum/haml
   source_code_uri: https://github.com/haml/haml
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
 test_files: []

data/.travis.yml

@@ -1,99 +0,0 @@
-sudo: false
-dist: trusty
-language: ruby
-cache: bundler
-rvm:
-  - ruby-head
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-  - 2.3.8
-  - 2.2.10
-  - 2.1.10
-  - 2.0.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
-  - test/gemfiles/Gemfile.rails-4.2.x
-  - test/gemfiles/Gemfile.rails-4.1.x
-  - 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
-      gemfile: test/gemfiles/Gemfile.rails-5.1.x
-    - rvm: 2.0.0
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-    - rvm: 2.0.0
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-    - rvm: 2.1.10
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x
-    - rvm: 2.1.10
-      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
-    - rvm: 2.4.6
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 2.4.6
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - 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
-      gemfile: test/gemfiles/Gemfile.rails-4.1.x
-    - rvm: ruby-head
-      gemfile: test/gemfiles/Gemfile.rails-4.2.x
-  include:
-    - 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"