better_html 0.0.12 → 1.0.0

data/test/better_html/tokenizer/html_lodash_test.rb

@@ -0,0 +1,98 @@
+require 'test_helper'
+require 'better_html/tokenizer/html_lodash'
+
+module BetterHtml
+  module Tokenizer
+    class HtmlLodashTest < ActiveSupport::TestCase
+      test "matches text" do
+        scanner = HtmlLodash.new("just some text")
+        assert_equal 1, scanner.tokens.size
+
+        assert_attributes ({ type: :text, loc: { start: 0, stop: 13, source: "just some text" } }), scanner.tokens[0]
+      end
+
+      test "matches strings to be escaped" do
+        scanner = HtmlLodash.new("[%= foo %]")
+        assert_equal 4, scanner.tokens.size
+
+        assert_attributes ({ type: :lodash_begin, loc: { start: 0, stop: 1, source: "[%" } }), scanner.tokens[0]
+        assert_attributes ({ type: :indicator, loc: { start: 2, stop: 2, source: "=" } }), scanner.tokens[1]
+        assert_attributes ({ type: :code, loc: { start: 3, stop: 7, source: " foo " } }), scanner.tokens[2]
+        assert_attributes ({ type: :lodash_end, loc: { start: 8, stop: 9, source: "%]" } }), scanner.tokens[3]
+      end
+
+      test "matches interpolate" do
+        scanner = HtmlLodash.new("[%! foo %]")
+        assert_equal 4, scanner.tokens.size
+
+        assert_attributes ({ type: :lodash_begin, loc: { start: 0, stop: 1, source: "[%" } }), scanner.tokens[0]
+        assert_attributes ({ type: :indicator, loc: { start: 2, stop: 2, source: "!" } }), scanner.tokens[1]
+        assert_attributes ({ type: :code, loc: { start: 3, stop: 7, source: " foo " } }), scanner.tokens[2]
+        assert_attributes ({ type: :lodash_end, loc: { start: 8, stop: 9, source: "%]" } }), scanner.tokens[3]
+      end
+
+      test "matches statement" do
+        scanner = HtmlLodash.new("[% foo %]")
+        assert_equal 3, scanner.tokens.size
+
+        assert_attributes ({ type: :lodash_begin, loc: { start: 0, stop: 1, source: "[%" } }), scanner.tokens[0]
+        assert_attributes ({ type: :code, loc: { start: 2, stop: 6, source: " foo " } }), scanner.tokens[1]
+        assert_attributes ({ type: :lodash_end, loc: { start: 7, stop: 8, source: "%]" } }), scanner.tokens[2]
+      end
+
+      test "matches text before and after" do
+        scanner = HtmlLodash.new("before\n[%= foo %]\nafter")
+        assert_equal 6, scanner.tokens.size
+
+        assert_attributes ({ type: :text, loc: { start: 0, stop: 6, source: "before\n" } }), scanner.tokens[0]
+        assert_attributes ({ type: :lodash_begin, loc: { start: 7, stop: 8, source: "[%" } }), scanner.tokens[1]
+        assert_attributes ({ type: :indicator, loc: { start: 9, stop: 9, source: "=" } }), scanner.tokens[2]
+        assert_attributes ({ type: :code, loc: { start: 10, stop: 14, source: " foo " } }), scanner.tokens[3]
+        assert_attributes ({ type: :lodash_end, loc: { start: 15, stop: 16, source: "%]" } }), scanner.tokens[4]
+        assert_attributes ({ type: :text, loc: { start: 17, stop: 22, source: "\nafter" } }), scanner.tokens[5]
+      end
+
+      test "matches multiple" do
+        scanner = HtmlLodash.new("[% if() { %][%= foo %][% } %]")
+        assert_equal 10, scanner.tokens.size
+
+        assert_attributes ({ type: :lodash_begin, loc: { source: "[%" } }), scanner.tokens[0]
+        assert_attributes ({ type: :code, loc: { source: " if() { " } }), scanner.tokens[1]
+        assert_attributes ({ type: :lodash_end, loc: { source: "%]" } }), scanner.tokens[2]
+
+        assert_attributes ({ type: :lodash_begin, loc: { source: "[%" } }), scanner.tokens[3]
+        assert_attributes ({ type: :indicator, loc: { source: "=" } }), scanner.tokens[4]
+        assert_attributes ({ type: :code, loc: { source: " foo " } }), scanner.tokens[5]
+        assert_attributes ({ type: :lodash_end, loc: { source: "%]" } }), scanner.tokens[6]
+
+        assert_attributes ({ type: :lodash_begin, loc: { source: "[%" } }), scanner.tokens[7]
+        assert_attributes ({ type: :code, loc: { source: " } " } }), scanner.tokens[8]
+        assert_attributes ({ type: :lodash_end, loc: { source: "%]" } }), scanner.tokens[9]
+      end
+
+      test "parses out html correctly" do
+        scanner = HtmlLodash.new('<div class="[%= foo %]">')
+        assert_equal 12, scanner.tokens.size
+        assert_equal [:tag_start, :tag_name, :whitespace, :attribute_name,
+          :equal, :attribute_quoted_value_start,
+          :lodash_begin, :indicator, :code, :lodash_end,
+          :attribute_quoted_value_end, :tag_end], scanner.tokens.map(&:type)
+        assert_equal ["<", "div", " ", "class", "=", "\"", "[%", "=", " foo ", "%]", "\"", ">"], scanner.tokens.map(&:loc).map(&:source)
+      end
+
+      private
+
+      def assert_attributes(attributes, token)
+        attributes.each do |key, value|
+          if value.nil?
+            assert_nil token.send(key)
+          elsif value.is_a?(Hash)
+            assert_attributes(value, token.send(key))
+          else
+            assert_equal value, token.send(key)
+          end
+        end
+      end
+    end
+  end
+end

data/test/better_html/tokenizer/location_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+require 'better_html/tokenizer/location'
+
+module BetterHtml
+  module Tokenizer
+    class LocationTest < ActiveSupport::TestCase
+      test "location start out of bounds" do
+        e = assert_raises(ArgumentError) do
+          Location.new("foo", 5, 6)
+        end
+        assert_equal "start location 5 is out of range for document of size 3", e.message
+      end
+
+      test "location stop out of bounds" do
+        e = assert_raises(ArgumentError) do
+          Location.new("foo", 2, 6)
+        end
+        assert_equal "stop location 6 is out of range for document of size 3", e.message
+      end
+
+      test "location stop < start" do
+        e = assert_raises(ArgumentError) do
+          Location.new("aaaaaa", 5, 2)
+        end
+        assert_equal "end of range must be greater than start of range (2 < 5)", e.message
+      end
+
+      test "location without line and column" do
+        loc = Location.new("foo\nbar\nbaz", 9, 9)
+
+        assert_equal "a", loc.source
+        assert_equal 3, loc.line
+        assert_equal 1, loc.column
+      end
+
+      test "line_source_with_underline" do
+        loc = Location.new("ui_helper(foo)", 10, 12)
+
+        assert_equal "foo", loc.source
+        assert_equal <<~EOL.strip, loc.line_source_with_underline
+          ui_helper(foo)
+                    ^^^
+        EOL
+      end
+
+      test "line_source_with_underline removes empty spaces" do
+        loc = Location.new("   \t   ui_helper(foo)", 17, 19)
+
+        assert_equal "foo", loc.source
+        assert_equal <<~EOL.strip, loc.line_source_with_underline
+          ui_helper(foo)
+                    ^^^
+        EOL
+      end
+    end
+  end
+end

data/test/better_html/tokenizer/token_array_test.rb

@@ -0,0 +1,144 @@
+require 'test_helper'
+require 'better_html/tokenizer/token'
+require 'better_html/tokenizer/location'
+require 'better_html/tokenizer/token_array'
+
+module BetterHtml
+  module Tokenizer
+    class TokenArrayTest < ActiveSupport::TestCase
+      setup do
+        @document = "<x>"
+        @tokens = [
+          Token.new(type: :lquote, loc: Location.new(@document, 0, 0)),
+          Token.new(type: :name, loc: Location.new(@document, 1, 1)),
+          Token.new(type: :rquote, loc: Location.new(@document, 2, 2)),
+        ]
+        @array = TokenArray.new(@tokens)
+      end
+
+      test "size" do
+        assert_equal 3, @array.size
+      end
+
+      test "size for empty array" do
+        @array = TokenArray.new([])
+        assert_equal 0, @array.size
+      end
+
+      test "shift returns element from beginning of array" do
+        assert_equal @tokens.first, @array.shift
+      end
+
+      test "shift decreases the size by 1" do
+        assert_difference(-> { @array.size }, -1) do
+          @array.shift
+        end
+      end
+
+      test "after shift, current element is changed" do
+        assert_equal @tokens.first, @array.current
+        assert_equal @tokens.first, @array.shift
+        assert_equal @tokens.second, @array.current
+      end
+
+      test "pop returns element from the end of array" do
+        assert_equal @tokens.last, @array.pop
+      end
+
+      test "pop decreases the size by 1" do
+        assert_difference(-> { @array.size }, -1) do
+          @array.pop
+        end
+      end
+
+      test "after pop, last element is changed" do
+        assert_equal @tokens.last, @array.last
+        assert_equal @tokens.last, @array.pop
+        assert_equal @tokens.second, @array.last
+      end
+
+      test "current returns element from beginning of array" do
+        assert_equal @tokens.first, @array.current
+      end
+
+      test "current does not change size" do
+        assert_no_difference(-> { @array.size }) do
+          @array.current
+        end
+      end
+
+      test "last returns element from the end of array" do
+        assert_equal @tokens.last, @array.last
+      end
+
+      test "last does not change size" do
+        assert_no_difference(-> { @array.size }) do
+          @array.last
+        end
+      end
+
+      test "empty?" do
+        refute_predicate @array, :empty?
+        3.times { @array.shift }
+        assert_predicate @array, :empty?
+      end
+
+      test "any?" do
+        assert_predicate @array, :any?
+        3.times { @array.shift }
+        refute_predicate @array, :any?
+      end
+
+      test "current is nil when array is empty" do
+        @array = TokenArray.new([])
+        assert_nil @array.current
+      end
+
+      test "last is nil when array is empty" do
+        @array = TokenArray.new([])
+        assert_nil @array.last
+      end
+
+      test "shift raises for empty array" do
+        @array = TokenArray.new([])
+        e = assert_raises(RuntimeError) do
+          @array.shift
+        end
+        assert_equal 'no tokens left to shift', e.message
+      end
+
+      test "pop raises for empty array" do
+        @array = TokenArray.new([])
+        e = assert_raises(RuntimeError) do
+          @array.pop
+        end
+        assert_equal 'no tokens left to pop', e.message
+      end
+
+      test "trim takes elements from the beginning of array" do
+        assert_difference(-> { @array.size }, -1) do
+          @array.trim(:lquote)
+        end
+
+        assert_equal @tokens.second, @array.current
+      end
+
+      test "trim takes elements from the end of array" do
+        assert_difference(-> { @array.size }, -1) do
+          @array.trim(:rquote)
+        end
+
+        assert_equal @tokens.second, @array.last
+      end
+
+      test "trim does not change array when element types are not at front nor back of array" do
+        assert_no_difference(-> { @array.size }) do
+          @array.trim(:name)
+        end
+
+        assert_equal @tokens.first, @array.current
+        assert_equal @tokens.last, @array.last
+      end
+    end
+  end
+end

data/test/better_html/tokenizer/token_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+require 'better_html/tokenizer/location'
+require 'better_html/tokenizer/token'
+
+module BetterHtml
+  module Tokenizer
+    class TokenTest < ActiveSupport::TestCase
+      test "token inspect" do
+        loc = Location.new("foo", 0, 2)
+        token = Token.new(type: :foo, loc: loc)
+        assert_equal "t(:foo, \"foo\")", token.inspect
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 1.0.0
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +98,16 @@ dependencies:
   name: html_tokenizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/better_html.rb
+- lib/better_html/ast/iterator.rb
+- lib/better_html/ast/node.rb
 - lib/better_html/better_erb.rb
 - lib/better_html/better_erb/erubi_implementation.rb
 - lib/better_html/better_erb/erubis_implementation.rb
@@ -128,37 +144,35 @@ files:
 - lib/better_html/errors.rb
 - lib/better_html/helpers.rb
 - lib/better_html/html_attributes.rb
-- lib/better_html/node_iterator.rb
-- lib/better_html/node_iterator/attribute.rb
-- lib/better_html/node_iterator/base.rb
-- lib/better_html/node_iterator/cdata.rb
-- lib/better_html/node_iterator/comment.rb
-- lib/better_html/node_iterator/content_node.rb
-- lib/better_html/node_iterator/element.rb
-- lib/better_html/node_iterator/html_erb.rb
-- lib/better_html/node_iterator/html_lodash.rb
-- lib/better_html/node_iterator/javascript_erb.rb
-- lib/better_html/node_iterator/location.rb
-- lib/better_html/node_iterator/text.rb
-- lib/better_html/node_iterator/token.rb
+- lib/better_html/parser.rb
 - lib/better_html/railtie.rb
 - lib/better_html/test_helper/ruby_expr.rb
 - lib/better_html/test_helper/safe_erb_tester.rb
 - lib/better_html/test_helper/safe_lodash_tester.rb
 - lib/better_html/test_helper/safety_error.rb
-- lib/better_html/tree.rb
+- lib/better_html/tokenizer/base_erb.rb
+- lib/better_html/tokenizer/html_erb.rb
+- lib/better_html/tokenizer/html_lodash.rb
+- lib/better_html/tokenizer/javascript_erb.rb
+- lib/better_html/tokenizer/location.rb
+- lib/better_html/tokenizer/token.rb
+- lib/better_html/tokenizer/token_array.rb
+- lib/better_html/tree/attribute.rb
+- lib/better_html/tree/attributes_list.rb
+- lib/better_html/tree/tag.rb
 - lib/better_html/version.rb
 - 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/location_test.rb
-- test/better_html/node_iterator_test.rb
+- test/better_html/parser_test.rb
 - test/better_html/test_helper/ruby_expr_test.rb
 - test/better_html/test_helper/safe_erb_tester_test.rb
 - test/better_html/test_helper/safe_lodash_tester_test.rb
-- test/better_html/tree_test.rb
+- test/better_html/tokenizer/html_erb_test.rb
+- test/better_html/tokenizer/html_lodash_test.rb
+- test/better_html/tokenizer/location_test.rb
+- test/better_html/tokenizer/token_array_test.rb
+- test/better_html/tokenizer/token_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -255,12 +269,13 @@ test_files:
 - test/dummy/Rakefile
 - test/test_helper.rb
 - test/better_html/helpers_test.rb
-- test/better_html/node_iterator_test.rb
-- test/better_html/node_iterator/location_test.rb
-- test/better_html/node_iterator/html_lodash_test.rb
-- test/better_html/node_iterator/html_erb_test.rb
+- test/better_html/parser_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
 - test/better_html/test_helper/ruby_expr_test.rb
-- test/better_html/tree_test.rb
+- test/better_html/tokenizer/location_test.rb
+- test/better_html/tokenizer/html_lodash_test.rb
+- test/better_html/tokenizer/html_erb_test.rb
+- test/better_html/tokenizer/token_array_test.rb
+- test/better_html/tokenizer/token_test.rb