hamlit 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41181b03fb2da5795efd910df32b4af7dec36c76
-  data.tar.gz: 5c87563fb9b05df21292a6fef7893d776030a422
+  metadata.gz: 89d7cfad07da030166e5964134abf59d18e44865
+  data.tar.gz: 441d90d73df696acc1348d3f8ce755d43aa30c1c
 SHA512:
-  metadata.gz: 9179fb592fc4469d868ce8c13d44559db430cc3485c1774283006f36664dd6ed91f196fa6b7860cc0d810efaab353b30b97a1c85be85f8fd8e86c2b0ced0d624
-  data.tar.gz: 80f76409f03008b7a0bb951f26c9edaf2a5c9071b031ce47d12de288672cebf766c0da3787121a55d805d13eb66543a7bf532ba81ca382219c8493a6968cb272
+  metadata.gz: f87e5a80a46d4b9d092c6788d5debb783281cb59bc4c50b43141ebc7bf0041835b4097784819023c207b013665aced148855c16d71b0c450eccb037ac7e22c07
+  data.tar.gz: d493776d47975894589784a773c1f003b10227b20a3e2e086ce55431fa1b016d5f1290d0218fc5ec7c6241fe8a4501a18e010a6c0a6c7d7ade8d2c5d66911a41

data/CHANGELOG.md

@@ -0,0 +1,73 @@
+## v0.4.2
+
+- Bugfix about parsing nested attributes
+  - https://github.com/k0kubun/hamlit/issues/12
+  - Thanks to @creasty
+
+## v0.4.1
+
+- Escape haml operators by backslash
+  - https://github.com/k0kubun/hamlit/issues/11
+  - Thanks to @mono0x
+
+## v0.4.0 (yanked)
+
+- Automatically escape html in sinatra
+  - This behavior is not compatible with Haml.
+  - Removed from next version.
+
+## v0.3.4
+
+- Allow tab indentation.
+  - https://github.com/k0kubun/hamlit/issues/9
+  - Thanks to @tdtds
+
+## v0.3.3
+
+- Accept multi byte parsing.
+  - https://github.com/k0kubun/hamlit/issues/8
+  - Thanks to @machu
+
+## v0.3.2
+
+- Bugfix for compiling old attributes.
+  - https://github.com/k0kubun/hamlit/issues/7
+  - Thanks to @creasty
+
+## v0.3.1
+
+- Hyphenate data attributes.
+  - https://github.com/k0kubun/hamlit/issues/5
+  - Thanks to @os0x
+
+## v0.3.0
+
+- Specify a version in dependency of temple.
+
+## v0.2.0
+
+- Allow comments in script.
+  - https://github.com/k0kubun/hamlit/issues/3
+  - Thanks to @eagletmt
+
+## v0.1.3
+
+- Bugfix for attribute nesting on runtime.
+  - https://github.com/k0kubun/hamlit/issues/1
+  - Thanks to @eagletmt
+
+## v0.1.2
+
+- Ignore false or nil values in attributes
+  - Partial fix for https://github.com/k0kubun/hamlit/issues/2
+  - Thanks to @eagletmt
+
+## v0.1.1
+
+- Drop obsolete `--ugly` option for CLI.
+  - Currently pretty mode is not implemented.
+
+## v0.1.0
+
+- Initial release.
+  - Passing haml-spec with ugly mode.

data/lib/hamlit/compilers/old_attribute.rb

@@ -140,12 +140,16 @@ module Hamlit
       end
 
       def reject_nested_columns(str, columns)
-        result     = []
+        result = []
         open_count = 0
-        emb_count  = 0
+        count = {
+          emb:     0,
+          paren:   0,
+          bracket: 0,
+        }
 
         Ripper.lex(str).each do |(row, col), type, str|
-          if columns.include?(col) && open_count == 1 && emb_count == 0
+          if columns.include?(col) && open_count == 1 && count.values.all?(&:zero?)
             result << col
           end
 
@@ -155,9 +159,17 @@ module Hamlit
           when :on_rbrace
             open_count -= 1
           when :on_embexpr_beg
-            emb_count += 1
+            count[:emb] += 1
           when :on_embexpr_end
-            emb_count -= 1
+            count[:emb] -= 1
+          when :on_lparen
+            count[:paren] += 1
+          when :on_rparen
+            count[:paren] -= 1
+          when :on_lbracket
+            count[:bracket] += 1
+          when :on_rbracket
+            count[:bracket] -= 1
           end
         end
         result

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

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

@@ -1,3 +1,5 @@
 %a{ value: "#{I18n.t "foo", count: 1}" }
 %span{ data: { value: "#{I18n.t "foo", count: 2}" } }
 .foo{ data: { value: "#{I18n.t "foo", count: 3}"}}
+%a{ data: { value: t('foo', count: 4) } }
+%a{ data: { value: [count: 1] } }

data/spec/rails/spec/hamlit_spec.rb

@@ -29,6 +29,8 @@ describe 'Hamlit rails integration', type: :request do
     expect(response.body).to include("<a value='foo 1'></a>")
     expect(response.body).to include("<span data-value='foo 2'></span>")
     expect(response.body).to include("<div class='foo' data-value='foo 3'></div>")
+    expect(response.body).to include("<a data-value='foo 4'></a>")
+    expect(response.body).to include("<a data-value='[{:count=>1}]'></a>")
   end
 
   describe 'escaping' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -287,6 +287,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md