xrt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebf55387c6ecfe4b9df158408b759f0b1ee8106
-  data.tar.gz: 82976c5d15a8b57a072272f727a913e60c1c3737
+  metadata.gz: bd3b9dd012073b47b0a1bf0109540273f16d8f5d
+  data.tar.gz: caf93a2e9702add56ff30b94f8165acf399c0741
 SHA512:
-  metadata.gz: 1af7ab32ea83cdc03d6af6da7b10099efb26bdb7ecb1621477981e41b6de063b7795429eb845d15f9c6cc6313a292f908bba6014438560dc809b03e637eef0ab
-  data.tar.gz: 89609aba1c70bb9856b0c8ed65de38b9724c275e889acbd076275c6998dea00bfa11a689944a5f89d090e95beb853acdd6f10c532312d8beda8ed81ab8b45220
+  metadata.gz: 3b6276557387abf00c81765fdf85ccb81b7dfa983af136306190a9a603f6141845702e2f21ae3851b3628919466c692fe0be5dcf44fe751c9e4c483a3ced9862
+  data.tar.gz: 18a297a71be188b03114e32e8e4f74e1ed3ad846e198758657b45cbf7b18e45c108a5661be83d2d922b7484262cdc06e02cc4d8d9eee26214ea38ba9497dc1ba

data/lib/xrt/command/extract.rb

@@ -19,7 +19,7 @@ module XRT
         parser = XRT::Parser.new(from_source)
         from_doc = parser.document
 
-        found_blocks = from_doc.find_blocks.select{|block|
+        found_blocks = from_doc.find_block_texts.select{|block|
           block.content.index(target_block) == 0
         }
 

data/lib/xrt/parser.rb

@@ -27,6 +27,8 @@ module XRT
           break
         when XRT::Statement::Text
           node << statement
+        when XRT::Statement::Whitespace
+          node << statement
         when XRT::Statement::Directive
           node << statement
         end
@@ -40,16 +42,31 @@ module XRT
       result = []
 
       while reading.length > 0
-        got = read_directive(reading) || read_text(reading)
-        unless got
+        if got = read_directive(reading)
+          result << got
+        elsif got = read_text(reading)
+          result.concat(split_whitespace(got))
+        else
           raise "failed to parse #{@source}"
         end
-        result << got
       end
 
       result
     end
 
+    def split_whitespace(text)
+      prefix, suffix=nil
+      text.sub!(/\A(\s+)/) {|matched|
+        prefix = matched
+        ''
+      }
+      text.sub!(/(\s+)\Z/) {|matched|
+        suffix = matched
+        ''
+      }
+      [prefix, text, suffix].compact.delete_if{|s| s.empty?}
+    end
+
     def read_directive source
       return nil unless source[0...2] == '[%'
 

data/lib/xrt/statement.rb

@@ -55,6 +55,12 @@ module XRT
       }.concat(children.map{|child| child.find_blocks }.flatten)
     end
 
+    def find_block_texts
+      children.select{|child|
+        child.kind_of?(XRT::Statement::Block) || child.kind_of?(XRT::Statement::Text)
+      }.concat(children.map{|child| child.find_block_texts }.flatten)
+    end
+
     def auto_indent
       lines = content.split(/\n/)[1..-1]
       whitespaces = lines.map{|line| line.scan(/^\s+/).first }.compact
@@ -76,6 +82,8 @@ module XRT
           XRT::Statement::End.new content
         elsif syntax.block? content
           XRT::Statement::Directive.new content
+        elsif syntax.whitespace? content
+          XRT::Statement::Whitespace.new content
         else
           XRT::Statement::Text.new content
         end
@@ -112,6 +120,9 @@ module XRT
     class Text < Statement
     end
 
+    class Whitespace < Statement
+    end
+
     class Directive < Statement
     end
 

data/lib/xrt/syntax.rb

@@ -1,5 +1,9 @@
 module XRT
   class Syntax
+    def whitespace? statement
+      statement.match(/\A\s*\Z/)
+    end
+
     def block? statement
       statement =~ /\A\[%.+%\]\Z/m
     end

data/lib/xrt/version.rb

@@ -1,3 +1,3 @@
 module Xrt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test-command-dump.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'tmpdir'
 require 'xrt/command/dump'
 
-class TestParser < Test::Unit::TestCase
+class TestCommandDump < Test::Unit::TestCase
   def test_annotate
     Dir.mktmpdir{|dir|
       Pathname(dir).join('if1.pm').open('w'){ |f| f.write %q{[% IF 1 %]nested[% END %]} }

data/test/test-command-extract.rb

@@ -31,4 +31,39 @@ class TestCommandExtract < Test::Unit::TestCase
       }, transaction.files)
     }
   end
+
+  def test_extract_text
+    Dir.mktmpdir{|dir|
+      templates_dir = Pathname(dir).join('templates')
+      templates_dir.mkdir
+      templates_dir.join('a.html').open('w'){ |f| f.write <<'HTML' }
+<html>
+  [% a %]
+  <h1>
+    hi
+  </h1>
+  [% b %]
+</html>
+HTML
+
+      command = XRT::Command::Extract.new
+      transaction = command.as_transaction(templates_dir.join('a.html').to_s, %q{<h1>}, templates_dir.to_s, '_h1.tt')
+      assert_equal({
+        templates_dir.join('a.html').to_s => <<'HTML',
+<html>
+  [% a %]
+  [% INCLUDE "_h1.tt" %]
+  [% b %]
+</html>
+HTML
+
+        templates_dir.join('_h1.tt').to_s => <<'HTML',
+<h1>
+  hi
+</h1>
+HTML
+
+      }, transaction.files)
+    }
+  end
 end

data/test/test-parser.rb

@@ -24,6 +24,19 @@ class TestParser < Test::Unit::TestCase
     ], doc.children
   end
 
+  def test_document_text_and_whitespace_directive
+    parser = XRT::Parser.new("1 [% 2 %]\n3")
+    doc = parser.document
+    assert doc.kind_of? XRT::Statement::Document
+    assert_equal [
+      XRT::Statement::Text.new('1'),
+      XRT::Statement::Whitespace.new(' '),
+      XRT::Statement::Directive.new('[% 2 %]'),
+      XRT::Statement::Whitespace.new("\n"),
+      XRT::Statement::Text.new('3'),
+    ], doc.children
+  end
+
   def test_document_block
     parser = XRT::Parser.new('[% IF a %]1[% END %]')
     doc = parser.document
@@ -58,16 +71,28 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_read_text
+    assert_equal '', @parser.read_text('')
     assert_equal 'hi', @parser.read_text('hi')
     assert_equal 'hi[', @parser.read_text('hi[')
     assert_equal 'hi', @parser.read_text('hi[%')
     assert_nil @parser.read_text('[% %]')
   end
 
+  def test_split_whitespace
+    assert_equal([], @parser.split_whitespace(""))
+    assert_equal([" "], @parser.split_whitespace(" "))
+    assert_equal(["\n"], @parser.split_whitespace("\n"))
+    assert_equal(["hi"], @parser.split_whitespace("hi"))
+    assert_equal(["hi there"], @parser.split_whitespace("hi there"))
+    assert_equal([" ", "hi", " "], @parser.split_whitespace(" hi "))
+    assert_equal([" \n", "hi", "\n "], @parser.split_whitespace(" \nhi\n "))
+    assert_equal(["\n", "xxx", "\n"], @parser.split_whitespace("\nxxx\n"))
+  end
+
   def test_tokens
     test_cases = [
       ['<html>', ['<html>']],
-      ['a [% b %] c', ['a ', '[% b %]', ' c']],
+      ['a [% b %] c', ['a', ' ', '[% b %]', ' ', 'c']],
       ['[% a %] [% b %] [% c %]', ['[% a %]', ' ', '[% b %]', ' ', '[% c %]']],
       ['[% FOR k IN [1, 2, 3] %]', ['[% FOR k IN [1, 2, 3] %]']],
       [

data/test/test-statement.rb

@@ -4,6 +4,7 @@ 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('[% IF 1 %]').kind_of? XRT::Statement::Block
     assert XRT::Statement::Factory.new_from_content('[% foo IF 1 %]').kind_of? XRT::Statement::Directive

data/test/test-syntax.rb

@@ -10,6 +10,13 @@ class TestSyntax < Test::Unit::TestCase
     assert_equal 'foo', @syntax.remove_comment('foo # bar')
   end
 
+  def test_whitespace?
+    assert @syntax.whitespace? ''
+    assert @syntax.whitespace? ' '
+    assert @syntax.whitespace? " \n"
+    assert_nil @syntax.whitespace? 'a'
+  end
+
   def test_beginning_block?
     assert @syntax.beginning_block? '[% IF 1 %]'
     assert @syntax.beginning_block? '[% if 1 %]'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler