hamlit 2.8.6 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a81acbe27600ac91e5a827a8ce114666a78a6d4e6d4928ead844f6d45dd36e3b
-  data.tar.gz: 83021e624060ae3a5bac115e8bb4f0134208bd34b1e3f2deec23d815973cf2e6
+  metadata.gz: 1f85249809ae3c05e918d5fb69f544d908c1573aa0835ea9804df69e2f94d5b4
+  data.tar.gz: dded39056d8210c15156774fe4bb3a60e270bf62ae5f4b803cb058b0a0369810
 SHA512:
-  metadata.gz: 11a5de507de1470d1c615446454ad3f32595ee55ca2ea8183f594d3fc92095f5f0fe78980e0c4f000b221743a3afd5d87b5f94411c5b1f1c532c538e3c6bb47e
-  data.tar.gz: f29126f085e3148e9d79147a6f12b4b4a94d03e4ea64999027bd01474af8b526f8038104698f96c0d2a6cedb5b57ca662cdfdfa559219e4f843604b4d7dd3986
+  metadata.gz: ef3929f4707374a2c826005ca325cb23c6a2903ff8fc27efbe3eaed3dcc99d47b607e0c963c6cda5261761d7e0da69609602ca67365e4b631a228a496e722324
+  data.tar.gz: d4519892eeb2946af49181d2ddd9a56bdc3477718ae5c637d70e5b59da23d14420f7c9bca7256ef3e27613ef2012efb8e7f678bc1a1bba5b8ff4779633d72613

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.8.7](https://github.com/k0kubun/hamlit/compare/v2.8.6...v2.8.7) - 2018-02-17
+
+### Fixed
+
+- Fix parser error on string interpolation in attributes
+
 ## [2.8.6](https://github.com/k0kubun/hamlit/compare/v2.8.5...v2.8.6) - 2017-12-22
 
 ### Fixed

data/Gemfile

@@ -13,7 +13,8 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
 end
 
 gem 'benchmark-ips', '2.3.0'
-gem 'm'
+gem 'maxitest'
+gem 'minitest-line'
 gem 'pry-byebug'
 
 # To resolve circular require warning

data/lib/hamlit/attribute_parser.rb

@@ -71,31 +71,33 @@ module Hamlit
 
     def each_attr(tokens)
       attr_tokens = []
-      array_open  = 0
-      brace_open  = 0
-      paren_open  = 0
+      open_tokens = Hash.new { |h, k| h[k] = 0 }
 
       tokens.each do |token|
         _, type, _ = token
         case type
         when :on_comma
-          if array_open == 0 && brace_open == 0 && paren_open == 0
+          if open_tokens.values.all?(&:zero?)
             yield(attr_tokens)
             attr_tokens = []
             next
           end
         when :on_lbracket
-          array_open += 1
+          open_tokens[:array] += 1
         when :on_rbracket
-          array_open -= 1
+          open_tokens[:array] -= 1
         when :on_lbrace
-          brace_open += 1
+          open_tokens[:block] += 1
         when :on_rbrace
-          brace_open -= 1
+          open_tokens[:block] -= 1
         when :on_lparen
-          paren_open += 1
+          open_tokens[:paren] += 1
         when :on_rparen
-          paren_open -= 1
+          open_tokens[:paren] -= 1
+        when :on_embexpr_beg
+          open_tokens[:embexpr] += 1
+        when :on_embexpr_end
+          open_tokens[:embexpr] -= 1
         when :on_sp
           next if attr_tokens.empty?
         end

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.8.6'
+  VERSION = '2.8.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation