hamlit 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd08607e661773fdb5b3615f58c436b3efceea82
-  data.tar.gz: 935a17fc15a78de1d6ca821104fa8d3f74f1b54c
+  metadata.gz: 3292ded147aeb720738b722d3ae053e58b50ba1d
+  data.tar.gz: ccc5a8f8dd78f16325c7da108946125f927708df
 SHA512:
-  metadata.gz: ca7571512c56d3ff44304efd1c30135344aed980dfb26395d23006068f76c35ae29ae19bc4533ec3644712a39bd03ad5b088735f325f9a01745f3808e40152e2
-  data.tar.gz: 26145af5ca66444899ac3498c460e1695a6ee280f802fc794664edac648f5bc8afd242d16ca3e40c95bb56d76128b351e23dc43d7a4c5c3bde805108aee5157c
+  metadata.gz: e5e7fc75dd1d78f68283c6f2bc0f48107284320528ecd087e20dc3e2d2ec5c2c3942642818cb3e477b18c76f455a08bc12668b44a70ea36943df216af83c23aa
+  data.tar.gz: 914adab630716407fc272b775f19af94e2245f3cba68881c9abe363ed2c7813ba3388917331c8a4b93dd825d3f5442364c46961871009455294e9ab05fea0d19

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.8
+
+- Fix parsing inline script for != and &=
+
 ## v1.5.7
 
 - Fix the behavior for multi-line script

data/lib/hamlit/parsers/tag.rb

@@ -25,9 +25,7 @@ module Hamlit
         ast = [:html, :tag, tag, attrs]
         inner_removal = parse_whitespace_removal(scanner)
 
-        if scanner.match?(/=/)
-          return ast << parse_script(scanner)
-        elsif !has_block?
+        if !has_block? || scanner.match?(/=|&=|!=/)
           return ast if scanner.scan(/\//)
           return ast << parse_line(scanner, inline: true)
         end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 end

data/spec/rails/app/views/users/inline.html.haml

@@ -0,0 +1,6 @@
+%span= link_to '1', '#',
+  data: { url: '2' }
+%span!= link_to '3', '#',
+  data: { url: '4' }
+%span&= link_to '5', '#',
+  data: { url: '6' }

data/spec/rails/config/routes.rb

@@ -10,6 +10,7 @@ Rails.application.routes.draw do
       get :safe_buffer
       get :old_attributes
       get :whitespace
+      get :inline
     end
   end
 end

data/spec/rails/spec/hamlit_spec.rb

@@ -33,6 +33,14 @@ describe 'Hamlit rails integration', type: :request do
     expect(response.body).to include("<a data-value='[{:count=&gt;1}]'></a>")
   end
 
+  it 'renders multi-line script inside a tag' do
+    get inline_users_path
+    expect(response.body).to include('<span><a data-url="2" href="#">1</a></span>')
+    expect(response.body).to include('<span><a data-url="4" href="#">3</a></span>')
+    expect(response.body).to include('<span><a data-url="6" href="#">5</a></span>')
+    expect(response.body).to include('<span><a data-url="6" href="#">5</a></span>')
+  end
+
   describe 'escaping' do
     it 'escapes script' do
       get users_path(q: '<script>alert("a");</script>')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -413,6 +413,7 @@ files:
 - spec/rails/app/views/users/form.html.haml
 - spec/rails/app/views/users/helpers.html.haml
 - spec/rails/app/views/users/index.html.haml
+- spec/rails/app/views/users/inline.html.haml
 - spec/rails/app/views/users/old_attributes.html.haml
 - spec/rails/app/views/users/safe_buffer.html.haml
 - spec/rails/app/views/users/whitespace.html.haml
@@ -528,6 +529,7 @@ test_files:
 - spec/rails/app/views/users/form.html.haml
 - spec/rails/app/views/users/helpers.html.haml
 - spec/rails/app/views/users/index.html.haml
+- spec/rails/app/views/users/inline.html.haml
 - spec/rails/app/views/users/old_attributes.html.haml
 - spec/rails/app/views/users/safe_buffer.html.haml
 - spec/rails/app/views/users/whitespace.html.haml
@@ -571,3 +573,4 @@ test_files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
+has_rdoc: