hamlit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ddd725e168d26ee17fdcfeeff3988fc46d1a3f2
-  data.tar.gz: 7007913e4c3109c688529e9cecf93ae5a5ac1a72
+  metadata.gz: d2a83cb9f5876957f819ff865a43be7ce1eb7c22
+  data.tar.gz: 482c96d3f4d086cfd8b730cde51ea00b9f07149a
 SHA512:
-  metadata.gz: c540899eece79a297d71d6d369d4aa65db1e9f145872ec1767778ae8ba55368d129cbed4f1a639163bd9904717dc36662ba368ad57f56c97af52edb02345dcac
-  data.tar.gz: 688cba8235f8978e30d98f731f711c1da70f554389ee1ec2dffab6f999d521c335229878bc37a40957558685fa637d5f0b5fd13cc78c5f65ed9242cf78f9a2b0
+  metadata.gz: 3b84f182a19e5625d68b3731e7720978464232e9e6034806c156c3ef35b3a66840722615e311e9c16ef0b26bfb24efe84e35c375323e81889d866a0b5d93bae9
+  data.tar.gz: fbe95e02dfed0e1c7f54341aaad968811fefd9cedc7c295cc20a7643a4f2cd22ddbc993e4a2cfbecd0a3f58653bf9e485fc02d1ba96442dfce88adbad0c7e15f

data/lib/hamlit/compilers/old_attribute.rb

@@ -138,9 +138,10 @@ module Hamlit
       def reject_nested_columns(str, columns)
         result     = []
         open_count = 0
+        emb_count  = 0
 
         Ripper.lex(str).each do |(row, col), type, str|
-          if columns.include?(col) && open_count == 1
+          if columns.include?(col) && open_count == 1 && emb_count == 0
             result << col
           end
 
@@ -149,6 +150,10 @@ module Hamlit
             open_count += 1
           when :on_rbrace
             open_count -= 1
+          when :on_embexpr_beg
+            emb_count += 1
+          when :on_embexpr_end
+            emb_count -= 1
           end
         end
         result

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/rails/app/controllers/users_controller.rb

@@ -17,4 +17,7 @@ class UsersController < ApplicationController
 
   def safe_buffer
   end
+
+  def old_attributes
+  end
 end

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

@@ -0,0 +1,3 @@
+%a{ value: "#{I18n.t "foo", count: 1}" }
+%span{ data: { value: "#{I18n.t "foo", count: 2}" } }
+.foo{ data: { value: "#{I18n.t "foo", count: 3}"}}

data/spec/rails/config/locales/en.yml

@@ -21,3 +21,4 @@
 
 en:
   hello: "Hello world"
+  foo: "foo %{count}"

data/spec/rails/config/routes.rb

@@ -8,6 +8,7 @@ Rails.application.routes.draw do
       get :form
       get :helpers
       get :safe_buffer
+      get :old_attributes
     end
   end
 end

data/spec/rails/spec/hamlit_spec.rb

@@ -24,6 +24,13 @@ describe 'Hamlit rails integration', type: :request do
     expect(response.body).to include('<safe>')
   end
 
+  it 'renders a complex old attributes' do
+    get old_attributes_users_path
+    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>")
+  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: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -402,6 +402,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/old_attributes.html.haml
 - spec/rails/app/views/users/safe_buffer.html.haml
 - spec/rails/bin/bundle
 - spec/rails/bin/rails
@@ -514,6 +515,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/old_attributes.html.haml
 - spec/rails/app/views/users/safe_buffer.html.haml
 - spec/rails/bin/bundle
 - spec/rails/bin/rails