better_html 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c51581d5c834e5560f9ba999ec11a4902f57cb7
-  data.tar.gz: cdb3a16f6c3cbfe74e7fc70d7685e63d2c00099b
+  metadata.gz: 3a3a50dbfab3ea7cc2e0f83c166345072bb1fa1f
+  data.tar.gz: 1fb0f5196c7069c9ad05af5b13b9993c744d2fbf
 SHA512:
-  metadata.gz: ccdcf32b31d7aec4852181f6b0ccdaaad3b14fddcf0b4a08bf5b50ac298ac1bf9ff3ea26880835961c0cf571de5aeaab05613bee842322c31f51da703c1abf2c
-  data.tar.gz: b9e2780e3b16b06bdbd124c2b1d0026656ae68a9d9665121d62fc9ed614091e649037e263eccb7f3593123ee07bb1bd052ceb8c8ba75fe1822661a11fefc7fcc
+  metadata.gz: 7de6bd1ecece7d662029e21911a89e54cb0534f07648638ee0e97ef45c1ededddc09256662a49c7b47bc71a21afaca7ccb35b9eebf77ae9fa87fadb99e9d3a61
+  data.tar.gz: d6214164d502b2e00f0b95f3659756f30b49d12e845d825d7946aa1f38c447a3246c8ea09152963c00d13822bf290daa343db45fba806fa7a42448334233896f

data/lib/better_html/node_iterator/html_erb.rb

@@ -9,7 +9,7 @@ module BetterHtml
       attr_reader :tokens
       attr_reader :parser
 
-      REGEXP_WITHOUT_TRIM = /<%(={1,2}|-|\#|%)?(.*?)(?:[-=])?()?%>([ \t]*\r?\n)?/m
+      REGEXP_WITHOUT_TRIM = /<%(={1,2}|-|%)?(.*?)(?:[-=])?()?%>([ \t]*\r?\n)?/m
 
       def initialize(document)
         @parser = HtmlTokenizer::Parser.new

data/lib/better_html/version.rb

@@ -1,3 +1,3 @@
 module BetterHtml
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/better_html/node_iterator/html_erb_test.rb

@@ -83,6 +83,23 @@ module BetterHtml
         assert_attributes ({ line: 4 }), scanner.tokens[3].location
       end
 
+      test "line counts with comments" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("before\n<%# BO$$ Mode %>\nafter")
+        assert_equal 4, scanner.tokens.size
+
+        assert_attributes ({ type: :text, text: "before\n" }), scanner.tokens[0]
+        assert_attributes ({ line: 1 }), scanner.tokens[0].location
+
+        assert_attributes ({ type: :stmt, text: "<%# BO$$ Mode %>" }), scanner.tokens[1]
+        assert_attributes ({ line: 2 }), scanner.tokens[1].location
+
+        assert_attributes ({ type: :text, text: "\n" }), scanner.tokens[2]
+        assert_attributes ({ line: 2 }), scanner.tokens[2].location
+
+        assert_attributes ({ type: :text, text: "after" }), scanner.tokens[3]
+        assert_attributes ({ line: 3 }), scanner.tokens[3].location
+      end
+
       private
 
       def assert_attributes(attributes, token)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Francois Chagnon