hamlit 1.4.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3045e96b4ecfe58f815e7d1fd326c1794b03c66f
-  data.tar.gz: e5c45da5f9a6a2ccfab6e102c47f1d9927098d65
+  metadata.gz: 9176878aecdc9d91f66537557f147dc8978d5003
+  data.tar.gz: 117ba8f39ed072c6964536add0336be21c44d391
 SHA512:
-  metadata.gz: 1d80b09e16c7707191fede2b060cc6c7a3f1db422ddaad0be03f3e8cbaa9b395ac04f74f4d396a781de11616bad672a61221501cac3f2d184c4be9453e6af89c
-  data.tar.gz: 45e2ee5c7d2f955f15e3093f0f1f87db2783e78b4baf9f1cdedcafb84568e4d5f78c85563461f845f254db80524600f6ceede60a8313d2817af3de248ab2ec79
+  metadata.gz: 172e4743255392ecf60944c2820173cc6fbbb3e1f539f91380a0490fce09bc62d62ad0a239422502190f15ec55e8870200d5b574dbdc92bf0895a87c8f542902
+  data.tar.gz: 5af7251fa167c35448565ff8612f4a5c175ab3b389f72e1f55c75f52d2d2acbb5447288211525f50ff19de470eb9bc80b5525cbd0df3c33dfc7327f54c016759

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.0
+
+- Remake implementation of outer whitespace removal
+
 ## v1.4.7
 
 - Sort static old attributes by name

data/lib/hamlit/concerns/indentable.rb

@@ -23,10 +23,9 @@ module Hamlit
 
       def with_indented(&block)
         @current_indent += 1
-        result = block.call
+        block.call
+      ensure
         @current_indent -= 1
-
-        result
       end
 
       def count_indent(line, strict: false)

data/lib/hamlit/parser.rb

@@ -66,9 +66,8 @@ module Hamlit
 
         @current_lineno += 1
         node = parse_line(current_line)
-        if @outer_removal.include?(@current_indent) && ast.last == [:static, "\n"]
-          ast.delete_at(-1)
-        end
+        remove_last_outer_space!(ast) if outer_remove?
+
         ast << [:newline] if @current_indent > 0
         ast << node
         ast << [:newline] if @current_indent == 0
@@ -119,7 +118,7 @@ module Hamlit
       SKIP_NEWLINE_EXPS.include?(ast.first) ||
         (ast[0..1] == [:haml, :doctype]) ||
         newline_skip_filter?(ast) ||
-        @outer_removal.include?(@current_indent)
+        outer_remove?
     end
 
     def newline_skip_filter?(ast)

data/lib/hamlit/parsers/tag.rb

@@ -39,7 +39,7 @@ module Hamlit
         if inner_removal || Helpers::DEFAULT_PRESERVE_TAGS.include?(tag)
           content[0, 1] = [:haml, :strip]
         end
-        content += with_indented { parse_lines }
+        content += with_tag_nested { parse_lines }
         ast << content
         ast
       end

data/lib/hamlit/parsers/whitespace.rb

@@ -16,10 +16,39 @@ module Hamlit
         inner_removal
       end
 
+      def remove_last_outer_space!(ast)
+        index = find_last_newline_index(ast)
+        return unless index
+
+        ast.delete_at(index)
+      end
+
       private
 
+      # Find [:static, "\n"]'s position ignoring [:code].
+      # If it is not found, return nil.
+      def find_last_newline_index(ast)
+        ast.reverse_each.with_index do |node, index|
+          sexp, *args = node
+          next if sexp == :code
+          return if node != [:static, "\n"]
+
+          return ast.length - index - 1
+        end
+        nil
+      end
+
       def reset_outer_removal
         @outer_removal = Set.new
+        @tag_indent    = 0
+      end
+
+      def with_tag_nested(&block)
+        @tag_indent += 1
+        with_indented { block.call }
+      ensure
+        @outer_removal.delete(@tag_indent)
+        @tag_indent -= 1
       end
 
       def parse_inner_removal(scanner)
@@ -28,11 +57,15 @@ module Hamlit
 
       def parse_outer_removal(scanner)
         if scanner.scan(/>/)
-          @outer_removal.add(@current_indent)
+          @outer_removal.add(@tag_indent)
         else
-          @outer_removal.delete(@current_indent)
+          @outer_removal.delete(@tag_indent)
         end
       end
+
+      def outer_remove?
+        @outer_removal.include?(@tag_indent)
+      end
     end
   end
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.4.7"
+  VERSION = "1.5.0"
 end

data/spec/hamlit/engine/tag_spec.rb

@@ -206,5 +206,22 @@ describe Hamlit::Engine do
         <span>f</span>
       HTML
     end
+
+    it 'removes outer whitespace by > from inside of block' do
+      assert_render(<<-HAML, <<-HTML)
+        %span a
+        - if true
+          %span>
+            b
+        %span
+          c
+      HAML
+        <span>a</span><span>
+        b
+        </span><span>
+        c
+        </span>
+      HTML
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.0
 platform: ruby
 authors:
 - Takashi Kokubun