xrt 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe8c82b81533d58ad55d63fc95dedddbfff782a
-  data.tar.gz: 437782711e48511fe351953897985544b3b0309f
+  metadata.gz: 60911a855be15e5cc634ea8efaf464ff478ba591
+  data.tar.gz: e57a1f273278eb63443708444b3f239902d124d6
 SHA512:
-  metadata.gz: ea18450231e65f911b90975f96612e83b256811f09afe44dd6a19674a4d65abc3918168851c44cba4deb48ded8379cecb6c9b1fb8bf48d9027e1131e44a3cab7
-  data.tar.gz: dd845b2ccd015828d7aaa15934f1079ec6bd6b885a4cc0ccdbde8fd18f637e83944e998ee079a5ca371ca18f3fec0ff4933b33acc87757a6311ca9ccb0913ec8
+  metadata.gz: 47470f9a585967c8410c0062a49f8caf7981bf89f5ceb12d3580e7953957a9f86656805f49b28bdc23d8501998e2d37219c3d5b3b444b25e98f1cff325396d8e
+  data.tar.gz: 99fd86545e72f3d627566cc211d4a83fe6ce58341ecc4c74c92983395d26b30996ace9dfd3ad77e28b9a8eb1d8854f85e80f164d889dab7eba76c1951d14d1ef

data/lib/xrt/cli.rb

@@ -9,6 +9,9 @@ module XRT
       when 'dump'
         success = XRT::Command::Dump.new.execute(args)
         exit success ? 0 : 1
+      when 'dump_blocks'
+        XRT::Command::DumpBlocks.new.execute(args)
+        exit 0
       when 'extract'
         success = XRT::Command::Extract.new.execute(*args)
         exit success ? 0 : 1

data/lib/xrt/command/dump_blocks.rb

@@ -0,0 +1,22 @@
+require 'xrt/depth_checker'
+
+module XRT
+  module Command
+    class DumpBlocks
+      def execute(files)
+        files.each{|file|
+          puts dump_file file
+        }
+      end
+
+      def dump_file file
+        blocks = find_blocks file
+        puts blocks.join("\n=====\n")
+      end
+
+      def find_blocks(file)
+        XRT::Parser.new(open(file).read).document.find_blocks_with_directive.map{|s| s.auto_indent }
+      end
+    end
+  end
+end

data/lib/xrt/command/extract.rb

@@ -22,6 +22,7 @@ module XRT
         found_blocks = from_doc.find_block_texts.select{|block|
           block.content.index(target_block) == 0
         }
+        found_blocks = resolve_inclusions(found_blocks)
 
         if found_blocks.length == 0
           raise "target_block not found"
@@ -46,6 +47,17 @@ module XRT
 
         transaction
       end
+
+      # input: [<h1>a</h1>, <h1>]
+      # output: [<h1>a</h1>]
+      def resolve_inclusions(items)
+        items.combination(2){|parent, child|
+          if parent.include? child
+            items.delete(child)
+          end
+        }
+        items
+      end
     end
   end
 end

data/lib/xrt/commands.rb

@@ -1,4 +1,5 @@
 require 'xrt/depth_checker'
 require 'xrt/command/dump'
+require 'xrt/command/dump_blocks'
 require 'xrt/command/extract'
 require 'xrt/command/lcs'

data/lib/xrt/parser.rb

@@ -15,9 +15,32 @@ module XRT
       doc
     end
 
+    # read tokens from tokenized tokens
+    # push contents to (container) node
+    # returns parsed container node
+    # return when tokenized is empty, or node is closed
     def parse_contents(tokenized, node)
       while tokenized.length > 0
         statement = XRT::Statement::Factory.new_from_content(tokenized.shift)
+
+        case statement
+        when XRT::Statement::Tag
+          parse_contents(tokenized, statement)
+          if statement.tag_opening?
+            statement = XRT::Statement::TagPair.new(statement)
+            parse_contents(tokenized, statement)
+            node << statement
+            next
+          elsif statement.tag_closing?
+            statement = XRT::Statement::TagPairEnd.new(statement)
+            node << statement
+            break
+          else
+            node << statement
+            next
+          end
+        end
+
         case statement
         when XRT::Statement::Block
           parse_contents(tokenized, statement)

data/lib/xrt/statement.rb

@@ -22,6 +22,14 @@ module XRT
       []
     end
 
+    def include? statement
+      children.each{|child|
+        return true if child.equal? statement
+        return true if child.include?(statement)
+      }
+      return false
+    end
+
     def replace_child(new_child, old_child)
       children.each_with_index{|child, index|
         if child.equal? old_child
@@ -165,7 +173,7 @@ module XRT
       end
 
       def << statement
-        raise 'trying to push_child to closed block' if closed?
+        raise "trying to push_child to closed block: #{self.inspect} << #{statement.inspect}" if closed?
         @children << statement
       end
 
@@ -188,6 +196,44 @@ module XRT
         tag_start = XRT::Statement::TagStart.new content
         self << tag_start
       end
+
+      def tag_void_element?
+        # https://www.w3.org/TR/html5/syntax.html#void-elements
+        void_element_names = %w( area base br col embed hr img input keygen link meta param source track wbr )
+        void_element_names.include?(self.tag_name)
+      end
+
+      def tag_name
+        @children[1].content.match(%r{\A/?(\S+)})[1].downcase
+      end
+
+      def tag_opening?
+        !tag_independent? && !tag_closing? && !tag_void_element?
+      end
+
+      def tag_closing?
+        @children[1].content[0] == '/'
+      end
+
+      def tag_independent?
+        @children[-2].content[-1] == '/'
+      end
+    end
+
+    class TagPair < Block
+      def initialize tag
+        @children = [ tag ]
+      end
+    end
+
+    class TagPairEnd < End
+      def content
+        @content.content
+      end
+
+      def inspect
+      "(#{self.class}:#{@content.inspect})"
+      end
     end
   end
 end

data/lib/xrt/version.rb

@@ -1,3 +1,3 @@
 module Xrt
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/test-command-extract.rb

@@ -32,7 +32,7 @@ class TestCommandExtract < Test::Unit::TestCase
     }
   end
 
-  def _todo_est_extract_text
+  def test_extract_text
     Dir.mktmpdir{|dir|
       templates_dir = Pathname(dir).join('templates')
       templates_dir.mkdir

data/test/test-parser.rb

@@ -65,14 +65,42 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_document_tag
-    parser = XRT::Parser.new('<div>')
+    parser = XRT::Parser.new('<div>a</div>')
     doc = parser.document
     assert doc.kind_of? XRT::Statement::Document
+
+    tag_start = XRT::Statement::Tag.new '<'
+    tag_start << XRT::Statement::Text.new('div')
+    tag_start << XRT::Statement::TagEnd.new('>')
+
+    text = XRT::Statement::Text.new('a')
+
+    tag_close = XRT::Statement::Tag.new '<'
+    tag_close << XRT::Statement::Text.new('/div')
+    tag_close << XRT::Statement::TagEnd.new('>')
+
+    tag_pair = XRT::Statement::TagPair.new(tag_start)
+    tag_pair << text
+    tag_pair << XRT::Statement::TagPairEnd.new(tag_close)
+    assert_equal [
+      tag_pair,
+    ], doc.children
+  end
+
+  def test_void_element
+    parser = XRT::Parser.new('<img>a')
+    doc = parser.document
+    assert doc.kind_of? XRT::Statement::Document
+
     tag = XRT::Statement::Tag.new '<'
-    tag << XRT::Statement::Text.new('div')
+    tag << XRT::Statement::Text.new('img')
     tag << XRT::Statement::TagEnd.new('>')
+
+    text = XRT::Statement::Text.new('a')
+
     assert_equal [
-      tag
+      tag,
+      text
     ], doc.children
   end
 

data/test/test-statement.rb

@@ -125,6 +125,23 @@ HTML
     assert_equal '2', document.content, 'replaced'
   end
 
+  def test_include?
+    document = XRT::Statement::Document.new
+    block = XRT::Statement::Block.new('[% IF 1 %]')
+    s1 = XRT::Statement::Text.new('1')
+    s2 = XRT::Statement::Text.new('2')
+    s3 = XRT::Statement::Text.new('3')
+    block << s1
+    document << block
+    document << s2
+
+    assert document.include? s1
+    assert document.include? s2
+    assert_false document.include? s3
+    assert block.include? s1
+    assert_false block.include? s2
+  end
+
   def test_replace_child_for_descendant
     document = XRT::Statement::Document.new
     if_block = XRT::Statement::Block.new('[% IF a %]')
@@ -210,3 +227,61 @@ class TestBlock < Test::Unit::TestCase
     assert_equal block.content, %q{[% IF 1 %]ok[% END %]}
   end
 end
+
+class TestTag < Test::Unit::TestCase
+  def test_opening_tag
+    tag = XRT::Statement::Tag.new('<')
+    tag << XRT::Statement::Text.new('div')
+    tag << XRT::Statement::TagEnd.new('>')
+    assert tag.tag_opening?
+    assert_false tag.tag_closing?
+  end
+
+  def test_closing_tag
+    tag = XRT::Statement::Tag.new('<')
+    tag << XRT::Statement::Text.new('/div')
+    tag << XRT::Statement::TagEnd.new('>')
+    assert_false tag.tag_opening?
+    assert tag.tag_closing?
+  end
+
+  def test_independent_tag
+    tag = XRT::Statement::Tag.new('<')
+    tag << XRT::Statement::Text.new('div/')
+    tag << XRT::Statement::TagEnd.new('>')
+    assert_false tag.tag_opening?
+    assert_false tag.tag_closing?
+    assert tag.tag_independent?
+  end
+
+  def test_tag_name
+    [
+      'div',
+      'DIV',
+      '/div',
+      'div class="title"',
+    ].each{|test_case|
+      tag = XRT::Statement::Tag.new('<')
+      tag << XRT::Statement::Text.new(test_case)
+      tag << XRT::Statement::TagEnd.new('>')
+      assert_equal 'div', tag.tag_name
+    }
+  end
+
+  def test_void_element?
+    [
+      ['div', false],
+      ['img', 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_void_element?
+
+      assert_equal !expect, tag.tag_opening?, 'void element is not open'
+    }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - lib/xrt.rb
 - lib/xrt/cli.rb
 - lib/xrt/command/dump.rb
+- lib/xrt/command/dump_blocks.rb
 - lib/xrt/command/extract.rb
 - lib/xrt/command/lcs.rb
 - lib/xrt/commands.rb