sablon 0.0.19.beta2 → 0.0.19.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d201139ea7689ee5ece96bdb890b1241714863a
-  data.tar.gz: 43073c128829d00d470669b734ecae7430aaaed6
+  metadata.gz: 43e4aa5cc44824e41d65481d0b32a1f97a94ea2c
+  data.tar.gz: 9fb8f9890f54cd1169ade7b178a2f995bc12d37b
 SHA512:
-  metadata.gz: 822d41137b73c13abd5102b757f9de9814c822fcb0cffde2e57b0bfc07a978791a5f6d2119671e479cc7aa44a4cd9a616ac4df8e1a8f6f76c0bd357ee6968bcb
-  data.tar.gz: 48a8398f40eebe6df13967b37a413702bee477d245b9c93a7d4375c4be51c39639d861fc18614453a71d5f8ccc71d081457057bb07a9c3f2d4b9c65cea7edc19
+  metadata.gz: 04ed4067045f1067cf36f98bc9139b869e66179a75f009d774e547df9a138b029ca2d47266e2e5019c70592b1e3821a921e01d93dfc22e74a377fc7f14647c9f
+  data.tar.gz: 40435b0860b374a75e07343793d55d66b6a880b9df3b0951206171cdc961146f79204c5e7fd0988655ad3867a46b26720bfc6874b7cc588ac7852c85ddeeae07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sablon (0.0.19.beta2)
+    sablon (0.0.19.beta3)
       nokogiri (>= 1.6.0)
       redcarpet (>= 3.2)
       rubyzip (>= 1.1)

data/lib/sablon/html/converter.rb

@@ -69,6 +69,7 @@ module Sablon
 
     def processed_ast(input)
       ast = build_ast(input)
+      ast.accept LastNewlineRemoverVisitor.new
       ast
     end
 

data/lib/sablon/html/visitor.rb

@@ -22,5 +22,13 @@ module Sablon
         end
       end
     end
+
+    class LastNewlineRemoverVisitor < Visitor
+      def visit_Paragraph(par)
+        if HTMLConverter::Newline === par.runs.nodes.last
+          par.runs.nodes.pop
+        end
+      end
+    end
   end
 end

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.19.beta2"
+  VERSION = "0.0.19.beta3"
 end

data/test/html/converter_test.rb

@@ -275,6 +275,18 @@ class HTMLConverterASTTest < Sablon::TestCase
     assert_equal ['Paragraph'], ast.map(&:style)
   end
 
+  def test_ignore_last_br_in_div
+    input = '<div>Lorem ipsum dolor sit amet<br /></div>'
+    par = @converter.processed_ast(input).to_a.first
+    assert_equal [Sablon::HTMLConverter::Text], par.runs.nodes.map(&:class)
+  end
+
+  def test_ignore_br_in_blank_div
+    input = '<div><br /></div>'
+    par = @converter.processed_ast(input).to_a.first
+    assert_equal [], par.runs.nodes.map(&:class)
+  end
+
   def test_ul
     input = '<ul><li>Lorem</li><li>ipsum</li></ul>'
     ast = @converter.processed_ast(input).to_a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.19.beta2
+  version: 0.0.19.beta3
 platform: ruby
 authors:
 - Yves Senn