hamlit 1.5.4 → 1.5.5

data/doc/filters/sass.md

@@ -0,0 +1,62 @@
+# [sass\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/sass_spec.rb#L3)
+## Input
+```haml
+:sass
+  .users_controller
+    .show_action
+      margin: 10px
+      padding: 20px
+
+```
+
+## Output
+### Haml, Hamlit
+```html
+<style>
+  .users_controller .show_action {
+    margin: 10px;
+    padding: 20px; }
+</style>
+
+```
+
+### Faml
+```html
+<style>
+.users_controller .show_action {
+  margin: 10px;
+  padding: 20px; }
+</style>
+
+```
+
+
+# [sass\_spec.rb:19](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/sass_spec.rb#L19)
+## Input
+```haml
+:sass
+  .users_controller
+    .show_action
+      content: "#{'<&>'}"
+
+```
+
+## Output
+### Haml, Hamlit
+```html
+<style>
+  .users_controller .show_action {
+    content: "<&>"; }
+</style>
+
+```
+
+### Faml
+```html
+<style>
+.users_controller .show_action {
+  content: "<&>"; }
+</style>
+
+```
+

data/doc/filters/scss.md

@@ -0,0 +1,68 @@
+# [scss\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/scss_spec.rb#L3)
+## Input
+```haml
+:scss
+  .users_controller {
+    .show_action {
+      margin: 10px;
+      padding: 20px;
+    }
+  }
+
+```
+
+## Output
+### Haml, Hamlit
+```html
+<style>
+  .users_controller .show_action {
+    margin: 10px;
+    padding: 20px; }
+</style>
+
+```
+
+### Faml
+```html
+<style>
+.users_controller .show_action {
+  margin: 10px;
+  padding: 20px; }
+
+</style>
+
+```
+
+
+# [scss\_spec.rb:21](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/scss_spec.rb#L21)
+## Input
+```haml
+:scss
+  .users_controller {
+    .show_action {
+      content: "#{'<&>'}";
+    }
+  }
+
+```
+
+## Output
+### Haml, Hamlit
+```html
+<style>
+  .users_controller .show_action {
+    content: "<&>"; }
+</style>
+
+```
+
+### Faml
+```html
+<style>
+.users_controller .show_action {
+  content: "<&>"; }
+
+</style>
+
+```
+

data/hamlit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_dependency "escape_utils"
-  spec.add_dependency "temple", "~> 0.7.3"
+  spec.add_dependency "temple", "~> 0.7.6"
   spec.add_dependency "thor"
   spec.add_dependency "tilt"
   spec.add_development_dependency "benchmark-ips"

data/lib/hamlit/engine.rb

@@ -20,15 +20,6 @@ module Hamlit
     filter :ControlFlow
     filter :MultiFlattener
     filter :StaticMerger
-    use :Generator, -> { create(options[:generator]) }
-
-    private
-
-    def create(klass)
-      valid_options = options.to_hash.select do |key, value|
-        klass.options.valid_key?(key)
-      end
-      klass.new(valid_options)
-    end
+    use :Generator, -> { options[:generator] }
   end
 end

data/lib/hamlit/parser.rb

@@ -76,12 +76,11 @@ module Hamlit
         return ast if ast
       end
 
-      parse_inner_line(scanner, inline: inline)
+      parse_inner_line(scanner)
     end
 
     # Parse a line and return ast if it is acceptable outside an inline tag
     def parse_outer_line(scanner)
-      return parse_text(scanner)    if scanner.scan(/\\/)
       return parse_text(scanner)    if scanner.match?(/\#{/)
       return parse_text(scanner)    if scanner.match?(/[.#]($|[^a-zA-Z0-9_-])/)
       return parse_doctype(scanner) if scanner.match?(/!!!/)
@@ -89,6 +88,8 @@ module Hamlit
       case scanner.peek(1)
       when '%', '.', '#'
         parse_tag(scanner)
+      when '\\'
+        parse_text(scanner, scan: /\\/)
       when '/'
         parse_comment(scanner)
       when ':'
@@ -97,18 +98,22 @@ module Hamlit
     end
 
     # Parse a line and return ast which is acceptable inside an inline tag
-    def parse_inner_line(scanner, inline: false)
+    def parse_inner_line(scanner)
       return parse_text(scanner, lstrip: true)                if scanner.scan(/==/)
-      return parse_text(scanner, lstrip: true, escape: false) if scanner.scan(/!( |==)/)
-      return parse_script(scanner, force_escape: true)        if scanner.match?(/&=/)
+      return parse_text(scanner, lstrip: true, escape: false) if scanner.scan(/!==/)
+      return parse_text(scanner, lstrip: true, escape: true)  if scanner.scan(/&==/)
       return parse_script(scanner, disable_escape: true)      if scanner.match?(/!=/)
-      return parse_text(scanner, lstrip: true, escape: false) if scanner.scan(/!/)
+      return parse_script(scanner, force_escape: true)        if scanner.match?(/&=/)
 
       case scanner.peek(1)
       when '=', '~'
         parse_script(scanner)
       when '-'
         parse_silent_script(scanner)
+      when '!'
+        parse_text(scanner, lstrip: true, escape: false, scan: /!/)
+      when '&'
+        parse_text(scanner, lstrip: true, escape: true, scan: /&/)
       else
         parse_text(scanner)
       end

data/lib/hamlit/parsers/multiline.rb

@@ -51,7 +51,7 @@ module Hamlit
         lines = lines.map do |line|
           line.strip.gsub(/ *\|\Z/, '')
         end
-        lines.join(' ')
+        lines.map { |l| "#{l} "}.join
       end
     end
   end

data/lib/hamlit/parsers/text.rb

@@ -5,7 +5,8 @@ module Hamlit
     module Text
       include Concerns::Error
 
-      def parse_text(scanner, lstrip: false, escape: true)
+      def parse_text(scanner, lstrip: false, escape: true, scan: nil)
+        scanner.scan(scan) if scan
         text = (scanner.scan(/.+/) || '')
         text = text.lstrip if lstrip
         [:haml, :text, text, escape]

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

data/spec/hamlit/engine/indent_spec.rb

@@ -1,6 +1,6 @@
 describe Hamlit::Engine do
   describe 'tab indent' do
-    it 'accepts tab indentation' do
+    it 'accepts tab indentation', skipdoc: true do
       assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
         %p
         \t%a

data/spec/hamlit/engine/multiline_spec.rb

@@ -1,11 +1,11 @@
 describe Hamlit::Engine do
   describe 'multiline' do
     it 'joins multi-lines ending with pipe' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: [])
+      assert_render(<<-HAML, <<-HTML)
         a |
           b |
       HAML
-        a b
+        a b 
       HTML
     end
 

data/spec/hamlit/engine/new_attribute_spec.rb

@@ -17,7 +17,7 @@ describe Hamlit::Engine do
     end
 
     describe 'html escape' do
-      it 'escapes attribute values on static attributes' do
+      it 'escapes attribute values on static attributes', skipdoc: true do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           %a(title="'")
           %a(title = "'\"")
@@ -29,7 +29,7 @@ describe Hamlit::Engine do
         HTML
       end
 
-      it 'escapes attribute values on dynamic attributes' do
+      it 'escapes attribute values on dynamic attributes', skipdoc: true do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           - title = "'\""
           - href  = '/search?foo=bar&hoge=<fuga>'

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -121,7 +121,7 @@ describe Hamlit::Engine do
         HTML
       end
 
-      it 'joins attribute class and element class' do
+      it 'joins attribute class and element class', skipdoc: true do
         assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
           .foo{ class: ['bar'] }
           .foo{ class: ['bar', nil] }
@@ -198,22 +198,32 @@ describe Hamlit::Engine do
         HTML
       end
 
-      # NOTE: This incompatibility will not be fixed for performance.
       it 'does not delete non-boolean attributes, for optimization' do
-        assert_render(<<-'HAML', <<-HTML, compatible_only: []) # wontfix
+        assert_render(<<-'HAML', <<-HTML, compatible_only: [])
+          / wontfix: Non-boolean attributes are not escaped for optimization.
           - val = false
           %a{ href: val }
           - val = nil
           %a{ href: val }
+
+          / Boolean attributes are escaped correctly.
+          - val = false
+          %a{ disabled: val }
+          - val = nil
+          %a{ disabled: val }
         HAML
+          <!-- wontfix: Non-boolean attributes are not escaped for optimization. -->
           <a href='false'></a>
           <a href=''></a>
+          <!-- Boolean attributes are escaped correctly. -->
+          <a></a>
+          <a></a>
         HTML
       end
     end
 
     describe 'html escape' do
-      it 'escapes attribute values on static attributes' do
+      it 'escapes attribute values on static attributes', skipdoc: true do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           %a{title: "'"}
           %a{title: "'\""}
@@ -225,7 +235,7 @@ describe Hamlit::Engine do
         HTML
       end
 
-      it 'escapes attribute values on dynamic attributes' do
+      it 'escapes attribute values on dynamic attributes', skipdoc: true do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           - title = "'\""
           - href  = '/search?foo=bar&hoge=<fuga>'
@@ -237,7 +247,7 @@ describe Hamlit::Engine do
         HTML
       end
 
-      it 'escapes attribute values on hash attributes' do
+      it 'escapes attribute values on hash attributes', skipdoc: true do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
           - title = { title: "'\"" }
           - href  = { href:  '/search?foo=bar&hoge=<fuga>' }
@@ -260,7 +270,7 @@ describe Hamlit::Engine do
         HTML
       end
 
-      it 'renders true attributes' do
+      it 'renders true attributes', skipdoc: true do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
           %span{ data: { disable: true } } bar
         HAML

data/spec/hamlit/engine/silent_script_spec.rb

@@ -76,7 +76,7 @@ describe Hamlit::Engine do
       HTML
     end
 
-    it 'renders empty elsif statement' do
+    it 'renders empty elsif statement', skipdoc: true do
       assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         %span
           - if false
@@ -87,7 +87,7 @@ describe Hamlit::Engine do
       HTML
     end
 
-    it 'renders empty else statement' do
+    it 'renders empty else statement', skipdoc: true do
       assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         %span
           - if false
@@ -99,7 +99,7 @@ describe Hamlit::Engine do
       HTML
     end
 
-    it 'renders empty when statement' do
+    it 'renders empty when statement', skipdoc: true do
       assert_render(<<-'HAML', <<-HTML, compatible_only: :haml, error_with: :faml)
         %span
           - case
@@ -187,7 +187,7 @@ describe Hamlit::Engine do
       HTML
     end
 
-    it 'joins a next line if a current line ends with ","' do
+    it 'joins a next line if a current line ends with ","', skipdoc: true do
       assert_render("- foo = [',  \n     ']\n= foo", <<-HTML, compatible_only: :haml)
         [&quot;, &quot;]
       HTML

data/spec/hamlit/engine/tag_spec.rb

@@ -186,68 +186,6 @@ describe Hamlit::Engine do
       HTML
     end
 
-    describe 'inline operator' do
-      it 'does not accept backslash operator' do
-        assert_render(<<-'HAML', <<-'HTML')
-          %span\    foo
-        HAML
-          <span>\    foo</span>
-        HTML
-      end
-
-      it 'accepts != operator' do
-        assert_render(<<-'HAML', <<-'HTML')
-          %span!= '<nyaa>'
-        HAML
-          <span><nyaa></span>
-        HTML
-      end
-
-      it 'accepts !== operator' do
-        assert_render(<<-'HAML', <<-'HTML')
-          %span!==#{'<nyaa>'}
-          %span!== #{'<nyaa>'}
-          !==#{'<nyaa>'}
-          !== #{'<nyaa>'}
-        HAML
-          <span><nyaa></span>
-          <span><nyaa></span>
-          <nyaa>
-          <nyaa>
-        HTML
-      end
-
-      it 'accepts &= operator' do
-        assert_render(<<-'HAML', <<-'HTML', escape_html: false)
-          %span&= '<nyaa>'
-        HAML
-          <span>&lt;nyaa&gt;</span>
-        HTML
-      end
-
-      it 'accepts ! operator' do
-        assert_render(<<-'HAML', <<-'HTML', compatible_only: :faml)
-          %span!#{'<nyaa>'}
-          %span! #{'<nyaa>'}
-          !#{'<nyaa>'}
-          ! #{'<nyaa>'}
-        HAML
-          <span><nyaa></span>
-          <span><nyaa></span>
-          <nyaa>
-          <nyaa>
-        HTML
-      end
-
-      it 'accepts ~ operator' do
-        assert_render(<<-HAML, <<-HTML, escape_html: false)
-          %span~ 1
-        HAML
-          <span>1</span>
-        HTML
-      end
-    end
-
     describe 'whitespace removal' do
       it 'removes outer whitespace by >' do
         assert_render(<<-HAML, <<-HTML)

data/spec/hamlit/engine/text_spec.rb

@@ -71,20 +71,102 @@ describe Hamlit::Engine do
       expect(render_string('\       a')).to eq("       a\n")
     end
 
-    it 'renders ! operator' do
-      assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)
-        aaa#{'<a>'}
-        !aaa#{'<a>'}
-        ! aaa#{'<a>'}
-        !  aaa#{'<a>'}
-        !!aa
-      HAML
-        aaa&lt;a&gt;
-        aaa<a>
-        aaa<a>
-        aaa<a>
-        !aa
-      HTML
+    describe 'inline operator' do
+      it 'renders ! operator' do
+        assert_render(<<-'HAML', <<-'HTML')
+          %span!#{'<nyaa>'}
+          %span! #{'<nyaa>'}
+          ! #{'<nyaa>'}
+        HAML
+          <span><nyaa></span>
+          <span><nyaa></span>
+          <nyaa>
+        HTML
+      end
+
+      it 'renders & operator' do
+        assert_render(<<-'HAML', <<-'HTML')
+          %span& #{'<nyaa>'}
+          %span&#{'<nyaa>'}
+          & #{'<nyaa>'}
+        HAML
+          <span>&lt;nyaa&gt;</span>
+          <span>&lt;nyaa&gt;</span>
+          &lt;nyaa&gt;
+        HTML
+      end
+
+      it 'renders !, & operator right before a non-space character' do
+        assert_render(<<-'HAML', <<-'HTML', compatible_only: :faml)
+          &nbsp;
+          \&nbsp;
+          !hello
+          \!hello
+        HAML
+          nbsp;
+          &nbsp;
+          hello
+          !hello
+        HTML
+      end
+
+      it 'does not accept backslash operator' do
+        assert_render(<<-'HAML', <<-'HTML')
+          %span\    foo
+        HAML
+          <span>\    foo</span>
+        HTML
+      end
+
+      it 'renders != operator' do
+        assert_render(<<-'HAML', <<-'HTML')
+          %span!= '<nyaa>'
+        HAML
+          <span><nyaa></span>
+        HTML
+      end
+
+      it 'renders !== operator' do
+        assert_render(<<-'HAML', <<-'HTML')
+          %span!==#{'<nyaa>'}
+          %span!== #{'<nyaa>'}
+          !==#{'<nyaa>'}
+          !== #{'<nyaa>'}
+        HAML
+          <span><nyaa></span>
+          <span><nyaa></span>
+          <nyaa>
+          <nyaa>
+        HTML
+      end
+
+      it 'renders &= operator' do
+        assert_render(<<-'HAML', <<-'HTML', escape_html: false)
+          %span&= '<nyaa>'
+        HAML
+          <span>&lt;nyaa&gt;</span>
+        HTML
+      end
+
+      it 'renders &== operator' do
+        assert_render(<<-'HAML', <<-'HTML')
+          &===
+          &== =
+          &== #{'<p>'}
+        HAML
+          =
+          =
+          &lt;p&gt;
+        HTML
+      end
+
+      it 'renders ~ operator' do
+        assert_render(<<-HAML, <<-HTML, escape_html: false)
+          %span~ 1
+        HAML
+          <span>1</span>
+        HTML
+      end
     end
 
     describe 'string interpolation' do
@@ -100,7 +182,6 @@ describe Hamlit::Engine do
       specify { assert_render('あ#{1}', "あ1\n") }
       specify { assert_render('あ#{"い"}う', "あいう\n") }
       specify { assert_render('a#{"<b>"}c', "a&lt;b&gt;c\n") }
-      specify { assert_render(":plain\n  あ\n  \#{'い'}", "あ\nい\n\n", compatible_only: :haml) }
     end
   end
 end

data/spec/hamlit/filters/plain_spec.rb

@@ -0,0 +1,15 @@
+describe Hamlit::Filters::Plain do
+  describe '#compile' do
+    it 'renders plain filter' do
+      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
+        :plain
+          あ
+          #{'い'}
+      HAML
+        あ
+        い
+
+      HTML
+    end
+  end
+end