haml 5.0.3 → 5.2.0

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
 
@@ -33,8 +34,7 @@ module Haml
         # solved by looking for ::Erubi first.
         # However, in JRuby, the const_defined? finds it anyway, so we must make sure that it's
         # not just a reference to ::Erubi.
-        if defined?(::Erubi) && const_defined?('ActionView::Template::Handlers::ERB::Erubi') &&
-            ActionView::Template::Handlers::ERB::Erubi != ::Erubi
+        if defined?(::Erubi) && (::ActionView::Template::Handlers::ERB.const_get('Erubi') != ::Erubi)
           require "haml/helpers/safe_erubi_template"
           Haml::Filters::RailsErb.template_class = Haml::SafeErubiTemplate
         else

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
 
@@ -234,7 +234,7 @@ MSG
       scanner = StringScanner.new(str.dup.force_encoding(Encoding::ASCII_8BIT))
       bom = scanner.scan(/\xEF\xBB\xBF/n)
       return bom unless scanner.scan(/-\s*#\s*/n)
-      if coding = try_parse_haml_emacs_magic_comment(scanner)
+      if (coding = try_parse_haml_emacs_magic_comment(scanner))
         return bom, coding
       end
 

data/lib/haml/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.2.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
 - Hampton Catlin
 - Norman Clarke
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2020-09-28 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.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 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
@@ -105,7 +119,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: []
@@ -163,8 +177,14 @@ files:
 homepage: http://haml.info/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/haml/haml/issues
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,10 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
 test_files: []
-has_rdoc: false