hamlit 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79bcf89bde702278c1bdad3ee833aec2e94eb58a
-  data.tar.gz: d58885a682edc39e69a4027c4e0834f5d679a9e2
+  metadata.gz: 0b37fdbe2260e2bb676c56133ab5c61fb5064900
+  data.tar.gz: ae2188f3122c3a02bff15888f0d9891368bd388b
 SHA512:
-  metadata.gz: 44fd92f92e8752ed72e56e0d46a5eae2ee69aa12175476f7fa39c8423c86a730522a471b9d9664d2f2ec43cf59108951c284209cae49b24255a134ed9962d7ba
-  data.tar.gz: 6f20ddab502046ca46ab6fe61d8c04a8655f72ed917e1e51470ed2e26715491269100ba3c3125482a2215800ac919325e2c96c38cc50dba32e7d52e524c4a0f5
+  metadata.gz: 5ae27755753ed242c704eac31eb066f702f2383b12851fda96accbcc2a20b3887a0c12f87a73fe45154f152e744f8248137dd8930ab2b78db660347544dea17e
+  data.tar.gz: 00af5e2645cf488be39c75708d70e2f14fb23c6f6778b38d74ce82a4d4931e2e010506b53868a260f80ab91a57ec36a36a3a3d28f3439f3b07b6c508d74eae09

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.3
+
+- Support !, !=, !==, &= and ~ as inline operators
+
 ## v1.5.2
 
 - Disable html escaping in CSS and JavaScript filter

data/lib/hamlit/concerns/indentable.rb

@@ -48,8 +48,23 @@ module Hamlit
         count_indent(line) == @current_indent
       end
 
+      # Validate current line's indentation
+      def validate_indentation!(ast)
+        width = next_width
+        return false if width == @current_indent * 2
+
+        if width != Hamlit::EOF && (width > @current_indent * 2 || width.odd?)
+          ast << [:newline]
+          ast << syntax_error(
+            "inconsistent indentation: #{2 * @current_indent} spaces used for indentation, "\
+            "but the rest of the document was indented using #{width} spaces"
+          )
+        end
+        true
+      end
+
       # Validate the template is using consitent indentation, 2 spaces or a tab.
-      def validate_indentation!(template)
+      def validate_indentation_consistency!(template)
         last_indent = ''
 
         indents = template.scan(/^[ \t]+/)
@@ -82,6 +97,10 @@ module Hamlit
         end
         lines.join
       end
+
+      def has_block?
+        next_indent > @current_indent
+      end
     end
   end
 end

data/lib/hamlit/concerns/line_reader.rb

@@ -20,6 +20,7 @@ module Hamlit
       end
 
       def empty_line?(line)
+        line = line.rest if line.respond_to?(:rest)
         line =~ /\A *\Z/
       end
 

data/lib/hamlit/parser.rb

@@ -39,7 +39,7 @@ module Hamlit
 
     # Reset the parser state.
     def reset(template)
-      validate_indentation!(template)
+      validate_indentation_consistency!(template)
       template = replace_hard_tabs(template)
       template = preprocess_multilines(template)
 
@@ -52,17 +52,7 @@ module Hamlit
     def parse_lines
       ast = []
       loop do
-        width = next_width
-        if width != @current_indent * 2
-          if width != Hamlit::EOF && (width > @current_indent * 2 || width.odd?)
-            ast << [:newline]
-            ast << syntax_error(
-              "inconsistent indentation: #{2 * @current_indent} spaces used for indentation, "\
-              "but the rest of the document was indented using #{width} spaces"
-            )
-          end
-          break
-        end
+        break if validate_indentation!(ast)
 
         @current_lineno += 1
         node = parse_line(current_line)
@@ -77,38 +67,50 @@ module Hamlit
     end
 
     # Parse current line and return AST.
-    def parse_line(line)
+    def parse_line(line, inline: false)
       return [:multi] if empty_line?(line)
 
-      scanner = StringScanner.new(line)
+      scanner = wrap_scanner(line)
       scanner.scan(/ +/)
-      if scanner.scan(/\\/) || scanner.match?(/\#{/)
-        return parse_text(scanner)
-      elsif scanner.match?(/&=/)
-        return parse_script(scanner, force_escape: true)
-      elsif scanner.match?(/!!!/)
-        return parse_doctype(scanner)
-      elsif scanner.scan(/!( |==)/)
-        return parse_text(scanner, lstrip: true, escape: false)
-      elsif scanner.match?(/!=/)
-        return parse_script(scanner, disable_escape: true)
-      elsif scanner.scan(/==/)
-        return parse_text(scanner, lstrip: true)
-      elsif scanner.match?(/[.#](\Z|[^a-zA-Z0-9_-])/)
-        return parse_text(scanner)
+
+      unless inline
+        ast = parse_outer_line(scanner)
+        return ast if ast
       end
 
+      parse_inner_line(scanner, inline: inline)
+    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?(/!!!/)
+
       case scanner.peek(1)
       when '%', '.', '#'
         parse_tag(scanner)
-      when '=', '~'
-        parse_script(scanner)
-      when '-'
-        parse_silent_script(scanner)
       when '/'
         parse_comment(scanner)
       when ':'
         parse_filter(scanner)
+      end
+    end
+
+    # Parse a line and return ast which is acceptable inside an inline tag
+    def parse_inner_line(scanner, inline: false)
+      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_script(scanner, disable_escape: true)      if scanner.match?(/!=/)
+      return parse_text(scanner, lstrip: true, escape: false) if inline && scanner.scan(/!/)
+
+      case scanner.peek(1)
+      when '=', '~'
+        parse_script(scanner)
+      when '-'
+        parse_silent_script(scanner)
       else
         parse_text(scanner)
       end
@@ -124,5 +126,10 @@ module Hamlit
     def newline_skip_filter?(ast)
       ast[0..1] == [:haml, :filter] && SKIP_NEWLINE_FILTERS.include?(ast[2])
     end
+
+    def wrap_scanner(str)
+      return str if str.is_a?(StringScanner)
+      StringScanner.new(str)
+    end
   end
 end

data/lib/hamlit/parsers/script.rb

@@ -104,10 +104,6 @@ module Hamlit
         nil
       end
 
-      def has_block?
-        next_indent == @current_indent + 1
-      end
-
       def statement_continuing?
         same_indent?(next_line) && internal_statement?(next_line, silent_script: true)
       end

data/lib/hamlit/parsers/tag.rb

@@ -20,19 +20,12 @@ module Hamlit
         attrs += parse_tag_id_and_class(scanner)
         attrs += parse_attributes(scanner)
 
-        inner_removal = parse_whitespace_removal(scanner)
         ast = [:html, :tag, tag, attrs]
+        inner_removal = parse_whitespace_removal(scanner)
 
-        if scanner.match?(/=/)
-          ast << parse_script(scanner)
-          return ast
-        elsif scanner.scan(/\//)
-          return ast
-        elsif scanner.rest.match(/[^ ]/)
-          ast << parse_text(scanner, lstrip: true)
-          return ast
-        elsif next_indent <= @current_indent
-          return ast << [:multi]
+        unless has_block?
+          return ast if scanner.scan(/\//)
+          return ast << parse_line(scanner, inline: true)
         end
 
         content = [:multi, [:static, "\n"]]

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/spec/hamlit/engine/tag_spec.rb

@@ -186,6 +186,68 @@ 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')
+          %span!#{'<nyaa>'}
+          %span! #{'<nyaa>'}
+          !#{'<nyaa>'}
+          ! #{'<nyaa>'}
+        HAML
+          <span><nyaa></span>
+          <span><nyaa></span>
+          !&lt;nyaa&gt;
+          <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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -571,4 +571,3 @@ test_files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
-has_rdoc: