better_html 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8589c65746614e3e1b7f76afaae127cb4f0bb186
-  data.tar.gz: b4fb1616fc7d4cbc0c5dcb96bd0106a895c98b4c
+  metadata.gz: 9c51581d5c834e5560f9ba999ec11a4902f57cb7
+  data.tar.gz: cdb3a16f6c3cbfe74e7fc70d7685e63d2c00099b
 SHA512:
-  metadata.gz: '08611d36aaa2ebbc847d5250635b66d5a3fb2b3ac93ef3e89bb0410f4f6554d033f2023d6d65f47892d6192f07eee7dc87a1eeaec26acc2b8e26ffb502649d58'
-  data.tar.gz: 72c4cb2c216c10e9dae458eac55788beb292f4ffda6c1de42bd5e2bedceb71fadf585050be349123e6e57fdec9c3cb90ceb09132018845b40ca3776b5cfd4b00
+  metadata.gz: ccdcf32b31d7aec4852181f6b0ccdaaad3b14fddcf0b4a08bf5b50ac298ac1bf9ff3ea26880835961c0cf571de5aeaab05613bee842322c31f51da703c1abf2c
+  data.tar.gz: b9e2780e3b16b06bdbd124c2b1d0026656ae68a9d9665121d62fc9ed614091e649037e263eccb7f3593123ee07bb1bd052ceb8c8ba75fe1822661a11fefc7fcc

data/Rakefile

@@ -15,8 +15,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
-
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|

data/lib/better_html/node_iterator/html_erb.rb

@@ -1,25 +1,27 @@
-require 'erubis/engine/eruby'
+require 'erubi'
 require 'html_tokenizer'
 require_relative 'token'
 require_relative 'location'
 
 module BetterHtml
   class NodeIterator
-    class HtmlErb < ::Erubis::Eruby
+    class HtmlErb < ::Erubi::Engine
       attr_reader :tokens
       attr_reader :parser
 
+      REGEXP_WITHOUT_TRIM = /<%(={1,2}|-|\#|%)?(.*?)(?:[-=])?()?%>([ \t]*\r?\n)?/m
+
       def initialize(document)
         @parser = HtmlTokenizer::Parser.new
         @tokens = []
-        super
+        super(document, regexp: REGEXP_WITHOUT_TRIM, trim: false)
       end
 
-      def add_text(src, text)
+      def add_text(text)
         @parser.parse(text) { |*args| add_tokens(*args) }
       end
 
-      def add_stmt(src, code)
+      def add_code(code)
         text = "<%#{code}%>"
         start = @parser.document_length
         stop = start + text.size
@@ -32,25 +34,12 @@ module BetterHtml
         @parser.append_placeholder(text)
       end
 
-      def add_expr_literal(src, code)
-        text = "<%=#{code}%>"
-        start = @parser.document_length
-        stop = start + text.size
-        @tokens << Token.new(
-          type: :expr_literal,
-          code: code,
-          text: text,
-          location: Location.new(start, stop, @parser.line_number, @parser.column_number)
-        )
-        @parser.append_placeholder(text)
-      end
-
-      def add_expr_escaped(src, code)
-        text = "<%==#{code}%>"
+      def add_expression(indicator, code)
+        text = "<%#{indicator}#{code}%>"
         start = @parser.document_length
         stop = start + text.size
         @tokens << Token.new(
-          type: :expr_escaped,
+          type: indicator == '=' ? :expr_literal : :expr_escaped,
           code: code,
           text: text,
           location: Location.new(start, stop, @parser.line_number, @parser.column_number)

data/lib/better_html/node_iterator/javascript_erb.rb

@@ -1,38 +1,32 @@
-require 'erubis/engine/eruby'
+require 'erubi'
 require_relative 'token'
 require_relative 'location'
 
 module BetterHtml
   class NodeIterator
-    class JavascriptErb < ::Erubis::Eruby
+    class JavascriptErb < ::Erubi::Engine
       attr_reader :tokens
 
       def initialize(document)
         @document = ""
         @tokens = []
-        super
+        super(document, regexp: HtmlErb::REGEXP_WITHOUT_TRIM, trim: false)
       end
 
-      def add_text(src, text)
+      def add_text(text)
         add_token(:text, text)
         append(text)
       end
 
-      def add_stmt(src, code)
+      def add_code(code)
         text = "<%#{code}%>"
         add_token(:stmt, text, code)
         append(text)
       end
 
-      def add_expr_literal(src, code)
-        text = "<%=#{code}%>"
-        add_token(:expr_literal, text, code)
-        append(text)
-      end
-
-      def add_expr_escaped(src, code)
-        text = "<%==#{code}%>"
-        add_token(:expr_escaped, text, code)
+      def add_expression(indicator, code)
+        text = "<%#{indicator}#{code}%>"
+        add_token(indicator == '=' ? :expr_literal : :expr_escaped, text, code)
         append(text)
       end
 

data/lib/better_html/version.rb

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

data/test/better_html/node_iterator/html_erb_test.rb

@@ -0,0 +1,99 @@
+require 'test_helper'
+
+module BetterHtml
+  class NodeIterator
+    class HtmlErbTest < ActiveSupport::TestCase
+      test "text" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("just some text")
+        assert_equal 1, scanner.tokens.size
+        token = scanner.tokens[0]
+        assert_attributes ({ type: :text, text: 'just some text', code: nil }), token
+        assert_attributes ({ start: 0, stop: 14, line: 1, column: 0 }), token.location
+      end
+
+      test "statement" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("<% statement %>")
+        assert_equal 1, scanner.tokens.size
+        token = scanner.tokens[0]
+        assert_attributes ({ type: :stmt, text: '<% statement %>', code: ' statement ' }), token
+        assert_attributes ({ start: 0, stop: 15, line: 1, column: 0 }), token.location
+      end
+
+      test "expression literal" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("<%= literal %>")
+        assert_equal 1, scanner.tokens.size
+        token = scanner.tokens[0]
+        assert_attributes ({ type: :expr_literal, text: '<%= literal %>', code: ' literal ' }), token
+        assert_attributes ({ start: 0, stop: 14, line: 1, column: 0 }), token.location
+      end
+
+      test "expression escaped" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("<%== escaped %>")
+        assert_equal 1, scanner.tokens.size
+        token = scanner.tokens[0]
+        assert_attributes ({ type: :expr_escaped, text: '<%== escaped %>', code: ' escaped ' }), token
+        assert_attributes ({ start: 0, stop: 15, line: 1, column: 0 }), token.location
+      end
+
+      test "line number for multi-line statements" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("before <% multi\nline %> after")
+        assert_equal 3, scanner.tokens.size
+
+        assert_attributes ({ type: :text, text: 'before ' }), scanner.tokens[0]
+        assert_attributes ({ line: 1 }), scanner.tokens[0].location
+
+        assert_attributes ({ type: :stmt, text: "<% multi\nline %>" }), scanner.tokens[1]
+        assert_attributes ({ line: 1 }), scanner.tokens[1].location
+
+        assert_attributes ({ type: :text, text: " after" }), scanner.tokens[2]
+        assert_attributes ({ line: 2 }), scanner.tokens[2].location
+      end
+
+      test "multi-line statements with trim" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("before\n<% multi\nline -%>\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: "<% multi\nline %>" }), scanner.tokens[1]
+        assert_attributes ({ line: 2 }), scanner.tokens[1].location
+
+        assert_attributes ({ type: :text, text: "\n" }), scanner.tokens[2]
+        assert_attributes ({ line: 3 }), scanner.tokens[2].location
+
+        assert_attributes ({ type: :text, text: "after" }), scanner.tokens[3]
+        assert_attributes ({ line: 4 }), scanner.tokens[3].location
+      end
+
+      test "multi-line expression with trim" do
+        scanner = BetterHtml::NodeIterator::HtmlErb.new("before\n<%= multi\nline -%>\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: :expr_literal, text: "<%= multi\nline %>" }), scanner.tokens[1]
+        assert_attributes ({ line: 2 }), scanner.tokens[1].location
+
+        assert_attributes ({ type: :text, text: "\n" }), scanner.tokens[2]
+        assert_attributes ({ line: 3 }), scanner.tokens[2].location
+
+        assert_attributes ({ type: :text, text: "after" }), scanner.tokens[3]
+        assert_attributes ({ line: 4 }), scanner.tokens[3].location
+      end
+
+      private
+
+      def assert_attributes(attributes, token)
+        attributes.each do |key, value|
+          if value.nil?
+            assert_nil token.send(key)
+          else
+            assert_equal value, token.send(key)
+          end
+        end
+      end
+    end
+  end
+end

data/test/better_html/test_helper/safe_erb_tester_test.rb

@@ -254,7 +254,7 @@ module BetterHtml
         EOF
 
         assert_equal 1, errors.size
-        assert_equal "<%             if foo? \n%>", errors.first.token.text
+        assert_equal "<% if foo? %>", errors.first.token.text
         assert_equal "erb statement not allowed here; did you mean '<%=' ?", errors.first.message
       end
 
@@ -266,7 +266,7 @@ module BetterHtml
         JS
 
         assert_equal 1, errors.size
-        assert_equal "<%           if foo \n%>", errors.first.token.text
+        assert_equal "<% if foo %>", errors.first.token.text
         assert_equal "erb statement not allowed here; did you mean '<%=' ?", errors.first.message
       end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/tasks/better_html_tasks.rake
 - test/better_html/better_erb/implementation_test.rb
 - test/better_html/helpers_test.rb
+- test/better_html/node_iterator/html_erb_test.rb
 - test/better_html/node_iterator/html_lodash_test.rb
 - test/better_html/node_iterator_test.rb
 - test/better_html/test_helper/ruby_expr_test.rb
@@ -212,6 +213,7 @@ test_files:
 - test/better_html/helpers_test.rb
 - test/better_html/node_iterator_test.rb
 - test/better_html/node_iterator/html_lodash_test.rb
+- test/better_html/node_iterator/html_erb_test.rb
 - test/better_html/better_erb/implementation_test.rb
 - test/better_html/test_helper/safe_erb_tester_test.rb
 - test/better_html/test_helper/safe_lodash_tester_test.rb