xrt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 522fc466d294244892a5bbc592f6eada3fe5b1fb
-  data.tar.gz: bb90d04bbd0e92f87b6ce9285cd2955eed534874
+  metadata.gz: 6e794554d3ea1a41e6b8baf7b319eef351a0e75c
+  data.tar.gz: 6f474d42d839fcabd1d80bedd8e730c9033f4cb2
 SHA512:
-  metadata.gz: 3d3d56352e6f7eae2dc34841c4904d9d9562fef2772cf6cdfef92c41d2780377cd0044d754da1595852fb94113cedb358ed8bb0a046807a62fa1052ff1c871b4
-  data.tar.gz: 6ff6151ddfdc56e96edbd492d860e584c4a03c8baa4acb7d630e1500f3199aa03e80aff932cb0217964be67fa276cc0714880828857afe9c230b58af97ee7493
+  metadata.gz: 6d9c72d02fe07ecaa4175ea58f1f690dc9226824965320e875e31a928a41b54f3c28b745f4a2aff834c5bb2e4e81082a5e6ecfafd420d6759fb1da3ec0ebf46e
+  data.tar.gz: 5da38ce8f05c3f78548d09a8d9221c89ba7b9815e20feb19b5979aed68f212ca5ccceab26ee3d8bc690ed43663a6032648e8588502db9b2804b6981ad20d4dac

data/lib/xrt/parser.rb

@@ -19,31 +19,44 @@ module XRT
     # push contents to (container) node
     # returns parsed container node
     # return when tokenized is empty, or node is closed
-    def parse_contents(tokenized, node)
+    def parse_contents(tokenized, node, in_raw_text = false)
+      if node.kind_of?(XRT::Statement::TagPair) && node.children[0].tag_raw_text_element?
+        parse_raw_text_element(tokenized, node)
+        return
+      end
+
       while tokenized.length > 0
-        statement = XRT::Statement::Factory.new_from_content(tokenized.shift)
+        statement = new_statement(tokenized.shift)
 
-        case statement
-        when XRT::Statement::Tag
-          parse_contents(tokenized, statement)
-          if statement.tag_opening?
-            statement = XRT::Statement::TagPair.new(statement)
+        unless in_raw_text
+          case statement
+          when XRT::Statement::Tag
             parse_contents(tokenized, statement)
-            node << statement
-            next
-          elsif statement.tag_closing?
-            statement = XRT::Statement::TagPairEnd.new(statement)
-            node << statement
-            break
-          else
-            node << statement
-            next
+            if statement.tag_opening?
+              statement = XRT::Statement::TagPair.new(statement)
+              parse_contents(tokenized, statement, in_raw_text)
+              node << statement
+              next
+            elsif statement.tag_closing?
+              statement = XRT::Statement::TagPairEnd.new(statement)
+              node << statement
+              break
+            else
+              node << statement
+              next
+            end
+          end
+        end
+
+        if in_raw_text
+          if statement.kind_of?(XRT::Statement::Tag) || statement.kind_of?(XRT::Statement::TagEnd)
+            statement = XRT::Statement::Text.new(statement.content)
           end
         end
 
         case statement
-        when XRT::Statement::Block
-          parse_contents(tokenized, statement)
+        when XRT::Statement::ControlBlock
+          parse_contents(tokenized, statement, in_raw_text)
           node << statement
         when XRT::Statement::End
           node << statement
@@ -56,6 +69,64 @@ module XRT
       node
     end
 
+    # parse all statements as texts and whitespaces until </script> will appear.
+    def parse_raw_text_element(tokenized, node)
+      syntax = XRT::Syntax.new
+      tag_name = node.children[0].tag_name
+
+      while tokenized.length > 0
+        maybe_close_tag = new_statement(tokenized[0])
+        maybe_closing_content = new_statement(tokenized[1])
+
+        if maybe_close_tag.kind_of?(XRT::Statement::Tag)
+          maybe_close_tag << maybe_closing_content
+          if maybe_close_tag.tag_closing? && maybe_close_tag.tag_name == tag_name
+            close_tag = new_statement(tokenized.shift)
+            parse_contents(tokenized, close_tag)
+            statement = XRT::Statement::TagPairEnd.new(close_tag)
+            node << statement
+            return
+          end
+        end
+
+        content = tokenized.shift
+        block_level = syntax.block_level content
+        if block_level == 1
+          statement = XRT::Statement::ControlBlock.new content
+          parse_contents(tokenized, statement, true)
+          node << statement
+        elsif syntax.block? content
+          node << XRT::Statement::Directive.new(content)
+        elsif syntax.whitespace? content
+          node << XRT::Statement::Whitespace.new(content)
+        else
+          node << XRT::Statement::Text.new(content)
+        end
+      end
+    end
+
+    def new_statement content
+      syntax = XRT::Syntax.new
+
+      block_level = syntax.block_level content
+
+      if block_level == 1
+        XRT::Statement::ControlBlock.new content
+      elsif block_level == -1
+        XRT::Statement::End.new content
+      elsif syntax.block? content
+        XRT::Statement::Directive.new content
+      elsif syntax.tag_start? content
+        XRT::Statement::Tag.new content
+      elsif syntax.tag_end? content
+        XRT::Statement::TagEnd.new content
+      elsif syntax.whitespace? content
+        XRT::Statement::Whitespace.new content
+      else
+        XRT::Statement::Text.new content
+      end
+    end
+
     def tokens
       reading = @source.dup
       result = []

data/lib/xrt/statement.rb

@@ -11,13 +11,17 @@ module XRT
     end
 
     def == other
-      self.class == other.class && self.content == other.content
+      self.class == other.class && self.to_s == other.to_s
     end
 
     def inspect
       "(#{self.class}:#{self.content})"
     end
 
+    def to_s
+      inspect
+    end
+
     def children
       []
     end
@@ -92,30 +96,6 @@ module XRT
   end
 
   class Statement
-    module Factory
-      def self.new_from_content content
-        syntax = XRT::Syntax.new
-
-        block_level = syntax.block_level content
-
-        if block_level == 1
-          XRT::Statement::Block.new content
-        elsif block_level == -1
-          XRT::Statement::End.new content
-        elsif syntax.block? content
-          XRT::Statement::Directive.new content
-        elsif syntax.tag_start? content
-          XRT::Statement::Tag.new content
-        elsif syntax.tag_end? content
-          XRT::Statement::TagEnd.new content
-        elsif syntax.whitespace? content
-          XRT::Statement::Whitespace.new content
-        else
-          XRT::Statement::Text.new content
-        end
-      end
-
-    end
 
     class Document < Statement
       def initialize
@@ -134,10 +114,6 @@ module XRT
         children.map{|c| c.content }.join
       end
 
-      def == other
-        self.content == other.content && self.children.zip(other.children).all{|a, b| p [a, b]; a == b }
-      end
-
       def inspect
         "(#{self.class}:#{self.children})"
       end
@@ -190,6 +166,9 @@ module XRT
       end
     end
 
+    class ControlBlock < Block
+    end
+
     class Tag < Block
       def initialize content
         @children = []
@@ -203,6 +182,12 @@ module XRT
         void_element_names.include?(self.tag_name)
       end
 
+      def tag_raw_text_element?
+        # https://www.w3.org/TR/html5/syntax.html#raw-text-elements
+        raw_element_names = %w( script style )
+        raw_element_names.include?(self.tag_name)
+      end
+
       def tag_name
         return nil if @children.empty?
         matched = @children[1].content.match(%r{\A/?(\w+)})
@@ -211,7 +196,7 @@ module XRT
       end
 
       def tag_opening?
-        !tag_independent? && !tag_closing? && !tag_void_element?
+        !tag_independent? && !tag_closing? && !tag_void_element? && !tag_comment?
       end
 
       def tag_closing?
@@ -221,6 +206,10 @@ module XRT
       def tag_independent?
         @children[-2].content[-1] == '/'
       end
+
+      def tag_comment?
+        @children[1].content[0] == '!'
+      end
     end
 
     class TagPair < Block

data/lib/xrt/version.rb

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

data/test/test-parser.rb

@@ -6,6 +6,18 @@ class TestParser < Test::Unit::TestCase
     @parser = XRT::Parser.new
   end
 
+  def test_new_statement
+    parser = XRT::Parser.new('')
+
+    assert parser.new_statement('hi').kind_of? XRT::Statement::Text
+    assert parser.new_statement(' ').kind_of? XRT::Statement::Whitespace
+    assert parser.new_statement('[% foo %]').kind_of? XRT::Statement::Directive
+    assert parser.new_statement('[% foo IF 1 %]').kind_of? XRT::Statement::Directive
+    assert parser.new_statement('[% IF 1 %]').kind_of? XRT::Statement::ControlBlock
+    assert parser.new_statement('<').kind_of? XRT::Statement::Tag
+    assert parser.new_statement('>').kind_of? XRT::Statement::TagEnd
+  end
+
   def test_document_empty
     parser = XRT::Parser.new('')
     doc = parser.document
@@ -41,9 +53,9 @@ class TestParser < Test::Unit::TestCase
     parser = XRT::Parser.new('[% IF a %]1[% END %]')
     doc = parser.document
     assert doc.kind_of? XRT::Statement::Document
-    if_block = XRT::Statement::Block.new('[% IF a %]')
+    if_block = XRT::Statement::ControlBlock.new('[% IF a %]')
     if_block << XRT::Statement::Text.new('1')
-    if_block << XRT::Statement::Text.new('[% END %]')
+    if_block << XRT::Statement::End.new('[% END %]')
     assert_equal [
       if_block
     ], doc.children
@@ -53,12 +65,12 @@ class TestParser < Test::Unit::TestCase
     parser = XRT::Parser.new('[% IF a %][% IF b %]1[% END %][% END %]')
     doc = parser.document
     assert doc.kind_of? XRT::Statement::Document
-    if_block1 = XRT::Statement::Block.new('[% IF a %]')
-    if_block2 = XRT::Statement::Block.new('[% IF b %]')
+    if_block1 = XRT::Statement::ControlBlock.new('[% IF a %]')
+    if_block2 = XRT::Statement::ControlBlock.new('[% IF b %]')
     if_block2 << XRT::Statement::Text.new('1')
-    if_block2 << XRT::Statement::Text.new('[% END %]')
+    if_block2 << XRT::Statement::End.new('[% END %]')
     if_block1 << if_block2
-    if_block1 << XRT::Statement::Text.new('[% END %]')
+    if_block1 << XRT::Statement::End.new('[% END %]')
     assert_equal [
       if_block1
     ], doc.children
@@ -104,6 +116,85 @@ class TestParser < Test::Unit::TestCase
     ], doc.children
   end
 
+  def test_block_in_raw_text_element
+    parser = XRT::Parser.new('<script>[% IF a %]1[% END %][% b %]</script>')
+    doc = parser.document
+    assert doc.kind_of? XRT::Statement::Document
+
+    tag_start = XRT::Statement::Tag.new '<'
+    tag_start << XRT::Statement::Text.new('script')
+    tag_start << XRT::Statement::TagEnd.new('>')
+
+    tag_close = XRT::Statement::Tag.new '<'
+    tag_close << XRT::Statement::Text.new('/script')
+    tag_close << XRT::Statement::TagEnd.new('>')
+
+    if_block = XRT::Statement::ControlBlock.new('[% IF a %]')
+    if_block << XRT::Statement::Text.new('1')
+    if_block << XRT::Statement::End.new('[% END %]')
+
+    directive = XRT::Statement::Directive.new('[% b %]')
+
+    tag_pair = XRT::Statement::TagPair.new(tag_start)
+    tag_pair << if_block
+    tag_pair << directive
+    tag_pair << XRT::Statement::TagPairEnd.new(tag_close)
+
+    assert_equal [
+      tag_pair,
+    ], doc.children
+  end
+
+  def test_simple_raw_text_element
+    parser = XRT::Parser.new('<script>1<2</script>')
+    doc = parser.document
+    assert doc.kind_of? XRT::Statement::Document
+
+    tag_start = XRT::Statement::Tag.new '<'
+    tag_start << XRT::Statement::Text.new('script')
+    tag_start << XRT::Statement::TagEnd.new('>')
+
+    tag_close = XRT::Statement::Tag.new '<'
+    tag_close << XRT::Statement::Text.new('/script')
+    tag_close << XRT::Statement::TagEnd.new('>')
+
+    tag_pair = XRT::Statement::TagPair.new(tag_start)
+    tag_pair << XRT::Statement::Text.new('1')
+    tag_pair << XRT::Statement::Text.new('<')
+    tag_pair << XRT::Statement::Text.new('2')
+    tag_pair << XRT::Statement::TagPairEnd.new(tag_close)
+
+    assert_equal [
+      tag_pair,
+    ], doc.children
+  end
+
+  def test_raw_text_in_block_in_raw_text_element
+    parser = XRT::Parser.new('<script>[% IF a %]<[% END %]</script>')
+    doc = parser.document
+    assert doc.kind_of? XRT::Statement::Document
+
+    tag_start = XRT::Statement::Tag.new '<'
+    tag_start << XRT::Statement::Text.new('script')
+    tag_start << XRT::Statement::TagEnd.new('>')
+
+    tag_close = XRT::Statement::Tag.new '<'
+    tag_close << XRT::Statement::Text.new('/script')
+    tag_close << XRT::Statement::TagEnd.new('>')
+
+    if_block = XRT::Statement::ControlBlock.new('[% IF a %]')
+    if_block << XRT::Statement::Text.new('<')
+    if_block << XRT::Statement::End.new('[% END %]')
+
+    tag_pair = XRT::Statement::TagPair.new(tag_start)
+    tag_pair << if_block
+    tag_pair << XRT::Statement::TagPairEnd.new(tag_close)
+
+    assert_equal [
+      tag_pair,
+    ], doc.children
+  end
+
   def test_read_directive
     assert_equal '[% %]', @parser.read_directive('[% %]')
     assert_equal '[% [ ] %]', @parser.read_directive('[% [ ] %]')

data/test/test-statement.rb

@@ -1,18 +1,6 @@
 require 'test/unit'
 require 'xrt/statement'
 
-class TestStatementFactory < Test::Unit::TestCase
-  def test_new_from_string
-    assert XRT::Statement::Factory.new_from_content('hi').kind_of? XRT::Statement::Text
-    assert XRT::Statement::Factory.new_from_content(' ').kind_of? XRT::Statement::Whitespace
-    assert XRT::Statement::Factory.new_from_content('[% foo %]').kind_of? XRT::Statement::Directive
-    assert XRT::Statement::Factory.new_from_content('[% foo IF 1 %]').kind_of? XRT::Statement::Directive
-    assert XRT::Statement::Factory.new_from_content('[% IF 1 %]').kind_of? XRT::Statement::Block
-    assert XRT::Statement::Factory.new_from_content('<').kind_of? XRT::Statement::Tag
-    assert XRT::Statement::Factory.new_from_content('>').kind_of? XRT::Statement::TagEnd
-  end
-end
-
 class TestStatement < Test::Unit::TestCase
   def test_text
     text = XRT::Statement::Text.new('hi')
@@ -254,6 +242,17 @@ class TestTag < Test::Unit::TestCase
     assert tag.tag_independent?
   end
 
+  def test_comment
+    tag = XRT::Statement::Tag.new('<')
+    tag << XRT::Statement::Text.new('!--')
+    tag << XRT::Statement::Whitespace.new(' ')
+    tag << XRT::Statement::Text.new('--')
+    tag << XRT::Statement::TagEnd.new('>')
+    assert_false tag.tag_opening?
+    assert_false tag.tag_closing?
+    assert tag.tag_comment?
+  end
+
   def test_tag_name
     [
       'div',
@@ -297,4 +296,20 @@ class TestTag < Test::Unit::TestCase
     }
   end
 
+  def test_raw_text_element?
+    [
+      ['div', false],
+      ['script', true],
+      ['style', true],
+    ].each{|test_case|
+      tag_name, expect = *test_case
+
+      tag = XRT::Statement::Tag.new('<')
+      tag << XRT::Statement::Text.new(tag_name)
+      tag << XRT::Statement::TagEnd.new('>')
+      assert_equal expect, tag.tag_raw_text_element?
+    }
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler