haml 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbf9b5c93745c83284467b77b73dd156f049dacf55861dd486bd14404d84e84
-  data.tar.gz: 4e2439c5e370db4bd765ca76ab4d76c027d9a9f9f6b68e5d38761e6858f3312f
+  metadata.gz: e3182fca5b2f85849a1abd849d3352858834737b83b7d57d4d29c19e84518f1c
+  data.tar.gz: ea005149aeccb8247ff121a4a33b3118d289f18ed5f12b101fd739892fb4edae
 SHA512:
-  metadata.gz: f0c7b716e9866070fc50281e4486eb519832c3f098cbd58bb62ca18f2659ca85bc44cd6a275121fe71f37f8d9e442ac9b75f254b28747b5fbff47a98b1e633c5
-  data.tar.gz: 3e870080f42d925cddc479a52318d2cb8e6a9dbfd5613e8027c0c4dfd80e4f7636fa9f50cd41d3eca6f72f12bcc1cc7e5a5b2b9120223e1e6218ad8d6dcf9ca8
+  metadata.gz: e8fcd8c9cb45217a405820c13d69330ef53c82aa22b25026d0886937505a5dc101803c55087f74cc5467a1930f43bd5ab6fd7d44d69e1234aeab06db634b8fdd
+  data.tar.gz: b8c0f35f75c6beac4e27c7066eefbf8385346abecbdab2cb3303b2ea2a3f19dfc2d209f171c0801d383d9bc3bd526721e674939e808ec2763712bbd94c7110d8

data/.travis.yml

@@ -9,6 +9,9 @@ rvm:
   - 2.6
   - 2.5
   - jruby-9.2
+env:
+  - RUBYOPT="--enable-frozen-string-literal"
+  - RUBYOPT=""
 gemfile:
   - test/gemfiles/Gemfile.rails-6.0.x
   - test/gemfiles/Gemfile.rails-5.2.x
@@ -26,24 +29,60 @@ matrix:
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
     - rvm: 2.5
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: 2.5
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.5
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.5
+      gemfile: test/gemfiles/Gemfile.rails-5.1.x
+      env: RUBYOPT="--enable-frozen-string-literal"
     - rvm: 2.6
       gemfile: test/gemfiles/Gemfile.rails-4.0.x
     - rvm: 2.6
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
     - rvm: 2.6
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: 2.6
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.6
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.6
+      gemfile: test/gemfiles/Gemfile.rails-5.1.x
+      env: RUBYOPT="--enable-frozen-string-literal"
     - rvm: 2.7
       gemfile: test/gemfiles/Gemfile.rails-4.0.x
     - rvm: 2.7
       gemfile: test/gemfiles/Gemfile.rails-4.1.x
     - rvm: 2.7
       gemfile: test/gemfiles/Gemfile.rails-4.2.x
+    - rvm: 2.7
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.7
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.7
+      gemfile: test/gemfiles/Gemfile.rails-5.1.x
+      env: RUBYOPT="--enable-frozen-string-literal"
     - 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
+    - rvm: jruby-9.2
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: jruby-9.2
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: jruby-9.2
+      gemfile: test/gemfiles/Gemfile.rails-5.1.x
+      env: RUBYOPT="--enable-frozen-string-literal"
   include:
     - rvm: 2.7
       gemfile: test/gemfiles/Gemfile.rails-edge
@@ -69,4 +108,4 @@ before_install:
   - ./cc-test-reporter before-build
 script: "bundle exec rake submodules test"
 after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Haml Changelog
 
+## 5.2.1
+
+Released on November 30, 2020
+([diff](https://github.com/haml/haml/compare/v5.2.0...v5.2.1)).
+
+* Add in improved "multiline" support for attributes [#1043](https://github.com/haml/haml/issues/1043)
+
 ## 5.2
 
 Released on September 28, 2020
-([diff](https://github.com/haml/haml/compare/v5.1.2...v5.2)).
+([diff](https://github.com/haml/haml/compare/v5.1.2...v5.2.0)).
 
 * Fix crash in the attribute optimizer when `#inspect` is overridden in TrueClass / FalseClass [#972](https://github.com/haml/haml/issues/972)
 * Do not HTML-escape templates that are declared to be plaintext [#1014](https://github.com/haml/haml/issues/1014) (Thanks [@cesarizu](https://github.com/cesarizu))

data/REFERENCE.md

@@ -228,15 +228,19 @@ is compiled to:
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'></html>
 
 Attribute hashes can also be stretched out over multiple lines to accommodate
-many attributes. However, newlines may only be placed immediately after commas.
-For example:
+many attributes.
 
-    %script{:type => "text/javascript",
-            :src  => "javascripts/script_#{2 + 7}"}
+    %script{
+      "type": text/javascript",
+      "src": javascripts/script_#{2 + 7}",
+      "data": {
+        "controller": "reporter",
+      },
+    }
 
 is compiled to:
 
-    <script src='javascripts/script_9' type='text/javascript'></script>
+    <script src='javascripts/script_9' type='text/javascript' data-controller='reporter'></script>
 
 #### `:class` and `:id` Attributes {#class-and-id-attributes}
 

data/haml.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rbench'
   spec.add_development_dependency 'minitest', '>= 4.0'
   spec.add_development_dependency 'nokogiri'
-  spec.add_development_dependency 'simplecov', '0.17.1' # Locked to this version due to https://github.com/codeclimate/test-reporter/issues/418
+  spec.add_development_dependency 'simplecov'
 
   spec.description = <<-END
 Haml (HTML Abstraction Markup Language) is a layer on top of HTML or XML that's

data/lib/haml/parser.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ripper'
 require 'strscan'
 
 module Haml
@@ -90,6 +91,9 @@ module Haml
     ID_KEY    = 'id'.freeze
     CLASS_KEY = 'class'.freeze
 
+    # Used for scanning old attributes, substituting the first '{'
+    METHOD_CALL_PREFIX = 'a('
+
     def initialize(options)
       @options = Options.wrap(options)
       # Record the indent levels of "if" statements to validate the subsequent
@@ -651,13 +655,18 @@ module Haml
     # @return [String] rest
     # @return [Integer] last_line
     def parse_old_attributes(text)
-      text = text.dup
       last_line = @line.index + 1
 
       begin
-        attributes_hash, rest = balance(text, ?{, ?})
+        # Old attributes often look like a valid Hash literal, but it sometimes allow code like
+        # `{ hash, foo: bar }`, which is compiled to `_hamlout.attributes({}, nil, hash, foo: bar)`.
+        #
+        # To scan such code correctly, this scans `a( hash, foo: bar }` instead, stops when there is
+        # 1 more :on_embexpr_end (the last '}') than :on_embexpr_beg, and resurrects '{' afterwards.
+        balanced, rest = balance_tokens(text.sub(?{, METHOD_CALL_PREFIX), :on_embexpr_beg, :on_embexpr_end, count: 1)
+        attributes_hash = balanced.sub(METHOD_CALL_PREFIX, ?{)
       rescue SyntaxError => e
-        if text.strip[-1] == ?, && e.message == Error.message(:unbalanced_brackets)
+        if e.message == Error.message(:unbalanced_brackets) && !@template.empty?
           text << "\n#{@next_line.text}"
           last_line += 1
           next_line
@@ -811,6 +820,25 @@ module Haml
       Haml::Util.balance(*args) or raise(SyntaxError.new(Error.message(:unbalanced_brackets)))
     end
 
+    # Unlike #balance, this balances Ripper tokens to balance something like `{ a: "}" }` correctly.
+    def balance_tokens(buf, start, finish, count: 0)
+      text = ''.dup
+      Ripper.lex(buf).each do |_, token, str|
+        text << str
+        case token
+        when start
+          count += 1
+        when finish
+          count -= 1
+        end
+
+        if count == 0
+          return text, buf.sub(text, '')
+        end
+      end
+      raise SyntaxError.new(Error.message(:unbalanced_brackets))
+    end
+
     def block_opened?
       @next_line.tabs > @line.tabs
     end

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.2.0"
+  VERSION = "5.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -101,16 +101,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        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