nora_mark 0.2beta6 → 0.2beta7

data/lib/nora_mark/transformer.rb

@@ -0,0 +1,43 @@
+module NoraMark
+  class Transformer
+    def initialize(rules, options)
+      @rules = rules
+      @options = options
+    end
+    def transform(node)
+      node.all_nodes.each do 
+        |node|
+        if match_rule = @rules.find { |rule| node.match?(rule[0]) }
+          selector, action, p = match_rule
+          NodeBuilder.new(node, @options).send(action, &p)
+        end 
+      end 
+    end
+  end
+  
+  class TransformerFactory
+    attr_accessor :rules, :options
+    
+    def self.create(text: nil, &block)
+      instance = new
+      instance.instance_eval do
+        @rules = []
+        @options = {}
+        if text
+          instance_eval text
+        else
+          instance_eval &block
+        end
+        Transformer.new(@rules, @options)
+      end
+    end 
+    
+    def transform_options options
+      (@options ||= {}).merge options 
+    end
+    
+    def for_node(selector, action = :replace, &block)
+      @rules << [ selector, action, block ]
+    end 
+  end
+end

data/lib/nora_mark/version.rb

@@ -1,3 +1,3 @@
 module NoraMark
-  VERSION = "0.2beta6"
+  VERSION = "0.2beta7"
 end

data/lib/nora_mark.rb

@@ -1,12 +1,16 @@
 require "nora_mark/version"
 require 'nora_mark/html/generator'
-require 'nora_mark/node'
 require 'nora_mark/parser'
+require 'nora_mark/node_util'
+require 'nora_mark/node'
+require 'nora_mark/node_set'
+require 'nora_mark/transformer'
+require 'nora_mark/node_builder'
 require 'securerandom'
 
 module NoraMark
-  class Document < Node
-    attr_accessor :document_name
+  class Document 
+    attr_accessor :document_name, :root
     private_class_method :new 
 
     def self.parse(string_or_io, param = {})
@@ -18,11 +22,20 @@ module NoraMark
           |pr|
           src = pr.call(src)
         end
-        @parser = Parser.new(src)
-        if (!@parser.parse)
-          raise @parser.raise_error
+        parser = Parser.new(src)
+        if (!parser.parse)
+          raise parser.raise_error
+        end
+        @root = parser.result
+        @root.document_name ||= @document_name
+        @root.reparent
+        @root.first_child.inject(1) do |page_no, node|
+          if node.kind_of? Page
+            node.page_no = page_no
+            page_no = page_no + 1
+          end
+          page_no
         end
-        @content = @parser.result
       end
       instance
     end
@@ -33,7 +46,8 @@ module NoraMark
 
     def html
       if @html.nil?
-        @html = @html_generator.convert(self, @render_parameter)
+        @transformers[:html].each { |t| t.transform @root }
+        @html = Html::Generator.new(@param).convert(@root.clone, @render_parameter)
       end
       @html
     end
@@ -42,16 +56,19 @@ module NoraMark
       @render_parameter.merge! param
       self
     end
+
+    def add_transformer(generator: :html, text: nil, &block)
+      (@transformers[generator] ||= []) << TransformerFactory.create(text: text, &block)
+    end
     
     def initialize(param = {})
+      @param = param
       @preprocessors = [
                         Proc.new { |text| text.gsub(/\r?\n(\r?\n)+/, "\n\n") },
                        ]
-      @html_generator = Html::Generator.new(param)
       @document_name = param[:document_name] || "noramark_#{SecureRandom.uuid}"
       @render_parameter = {}
+      @transformers = { html: []}
     end 
-
-
   end
 end

data/spec/nokogiri_test_helper.rb

@@ -1,9 +1,9 @@
 module Nokogiri
   module XML
     class Element
-      def selector
+      def selector remove_id: true
         sel = name
-        if !self['id'].nil?
+        if !remove_id && !self['id'].nil? 
           sel = sel + '#' + self['id'].split(' ').join('#')
         end
         if !self['class'].nil?
@@ -15,8 +15,8 @@ module Nokogiri
         }
         sel
       end
-      def selector_and_text
-        [selector, text]
+      def selector_and_text remove_id: true
+        [selector(remove_id: remove_id), text]
       end
       alias a selector_and_text
       def child_loop
@@ -25,17 +25,17 @@ module Nokogiri
       def child_a(index)
         element_children[index].selector_and_text
       end 
-      def selector_and_children
-        [selector] + children.select{|c| c.elem? || c.text.strip.size > 0}.map{|c| 
+      def selector_and_children remove_id: true
+        [selector(remove_id: remove_id)] + children.select{|c| c.elem? || c.text.strip.size > 0}.map{|c| 
           if !c.elem? 
             c.text
           elsif c.element_children.size == 0
-            c.selector_and_text
+            c.selector_and_text remove_id: remove_id
           else
-            c.selector_and_children
+            c.selector_and_children remove_id: remove_id
           end 
         }
       end
     end
   end
-end
+end

data/spec/nora_mark_spec.rb

@@ -77,7 +77,7 @@ describe NoraMark do
 
 
     it 'should convert simple paragraph in english mode specified in frontmatter' do
-      text = "---\nlang: en\ntitle: the title\n---\nparagraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
+      text = "---\nlang: en\ntitle: the title\n---\n\n\n\nparagraph begins.\n2nd line.\n 3rd line.\n\n\n next paragraph."
       noramark = NoraMark::Document.parse(text)
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
@@ -195,8 +195,26 @@ describe NoraMark do
       )
     end
 
+    it 'should handle divs with empty lines' do
+      text = "\n\n\nd('wo-pgroup') {\n\n\n1st line. \n\n\n}\n\n\nd {\n 2nd div.\n}"
+      noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
+      converted = noramark.html
+      body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
+      expect(body.element_children[0].selector_and_children).to eq(
+        ['div',
+           ['p', '1st line.']
+        ])
+      expect(body.element_children[1].selector_and_children).to eq(
+        ['div',
+          ['div.pgroup',
+           ['p', '2nd div.']]
+        ]
+
+      )
+    end
+
     it 'should nest div without pgroup and with pgroup' do
-      text = "d(wo-pgroup) {\nd {\nnested.\n} \n}\nd {\nin pgroup\n}"
+      text = "d(wo-pgroup) {\nd {\nnested.\n} \n}\n\nd {\nin pgroup\n}"
       noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
@@ -232,9 +250,9 @@ describe NoraMark do
       noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
-      expect(body.element_children[0].selector_and_children).to eq(
+      expect(body.element_children[0].selector_and_children(remove_id: false)).to eq(
         ['div#thecontents.preface-one',
-         ['h1', 'title.']
+         ['h1#heading_index_1', 'title.']
         ]
       )
     end
@@ -370,7 +388,7 @@ describe NoraMark do
     end
 
     it 'should handle block image with before caption' do
-      text = "this is normal line.\nimage(./image1.jpg, alt text, caption_before: true): caption text"
+      text = "this is normal line.\nimage(./image1.jpg, alt text)[caption_before: true]: caption text"
       noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
       converted = noramark.html
       body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
@@ -891,16 +909,18 @@ EOF
       )
       end
       it 'should convert markdown style heading with empty body' do
-        text = "=: タイトルです。\n==: 次のタイトルです。これから書きます。"
+        text = "=: タイトルです。\n*:中身です。\n\n==: 次のタイトルです。これから書きます。\n\n==:ここもこれから。"
         noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')
         converted = noramark.html
         body = Nokogiri::XML::Document.parse(converted[0]).root.at_xpath('xmlns:body')
-        expect(body.element_children.size).to eq 1
         expect(body.element_children[0].selector_and_children).to eq(
         ['section',
          ['h1', 'タイトルです。'],
+         ['ul', ['li', '中身です。']],
          ['section',
-          ['h2', '次のタイトルです。これから書きます。']]])
+          ['h2', '次のタイトルです。これから書きます。']],
+         ['section',
+          ['h2', 'ここもこれから。']]])
       end
       it 'should markdown style heading interrupted by other headed section' do
         text = "=: タイトルです。\r\nこれは、セクションの中です。\n =: また次のセクションです。\n次のセクションの中です。"
@@ -1025,13 +1045,220 @@ EOF
             to_validate << nokogiri_doc.to_s
           end
         end
-
         @stdout = capture(:stdout) do 
           puts %x(java -jar #{jar} -c #{schema} #{file_to_validate})
         end
         expect(@stdout.strip).to eq ""
       end
     end
+    describe 'node manipulation' do
+      before do
+        @text = <<EOF
+1st line.
+d.the_class {
+3rd line.
+}
+5th line.
+EOF
+      end
+      it 'should access line number' do
+        noramark = NoraMark::Document.parse(@text)
+        page = noramark.root.children[0]
+        expect(page.children.size).to eq 3
+        expect(page.line_no).to eq 1
+        expect(page.children[0].line_no).to eq 1
+        expect(page.children[1].line_no).to eq 2
+        expect(page.children[2].children[0].line_no).to eq 5
+      end
+
+      it 'replace existing node' do
+        noramark = NoraMark::Document.parse(@text)
+        page = noramark.root.children[0]
+        first_pgroup = page.children[0]
+        line_no = first_pgroup.line_no
+        new_node = NoraMark::ParagraphGroup.new(['the_id'], ['the_class'], [], {}, [ NoraMark::Text.new("replaced.", line_no)],  line_no)
+        first_pgroup.replace(new_node)
+        body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children[0].selector_and_children(remove_id: false)).to eq(
+          ['p#the_id.the_class', 'replaced.'])
+      end
+
+      it 'modify existing node by DSL' do
+        text = "1st line.\nfoobar(title)[level: 3] {\n in the section.\n}\n=: section 2."
+        noramark = NoraMark::Document.parse(text, lang: 'ja')
+
+        noramark.add_transformer(generator: :html) do
+          for_node 'foobar', :modify do
+            @node.name = 'section'
+            @node.prepend_child block("h#{@node.named_parameters[:level]}", @node.parameters[0])
+          end
+        end
+        body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children[0].selector_and_children()).to eq(
+          ['div.pgroup', [ 'p', '1st line.' ]])
+        expect(body.element_children[1].selector_and_children()).to eq(
+          ['section', [ 'h3', 'title' ], ['div.pgroup',  ['p', 'in the section.']]])
+        expect(body.element_children[2].selector_and_children()).to eq(
+          ['section', [ 'h1','section 2.' ]])
+      end
+      it 'replace existing node by DSL' do
+        text = "1st line.\nfoobar(title)[level: 3] {\n in the section.\n}\n=: section 2."
+        noramark = NoraMark::Document.parse(text, lang: 'ja')
+
+        noramark.add_transformer(generator: :html) do
+          for_node 'foobar', :replace do
+            block('section',
+                   [
+                    block( "h#{@node.named_parameters[:level]}", @node.parameters[0]),
+                   ] + @node.children)
+          end
+        end
+        body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children[0].selector_and_children()).to eq(
+          ['div.pgroup', [ 'p', '1st line.' ]])
+        expect(body.element_children[1].selector_and_children()).to eq(
+          ['section', [ 'h3', 'title' ], ['div.pgroup',  ['p', 'in the section.']]])
+        expect(body.element_children[2].selector_and_children()).to eq(
+          ['section', [ 'h1','section 2.' ]])
+      end
+      it 'generate complex-style headed section' do
+        text = <<EOF
+---
+lang: ja
+---
+
+=: 見出し
+sub: 副見出し
+
+パラグラフ。
+パラグラフ。
+
+EOF
+        noramark = NoraMark::Document.parse(text)
+        noramark.add_transformer(generator: :html) do
+          for_node({:type => :HeadedSection}, :replace) do
+            header = block('header',
+                           block('div',
+                                 block("h#{@node.level}", @node.heading),
+                                 classes: ['hgroup'])) 
+            if (fc = @node.first_child).name == 'sub'
+              fc.name = 'p'
+              fc.classes = ['subh']
+              header.first_child.append_child fc 
+            end
+            body = block('div', @node.children, classes:['section-body'])
+            block('section', [ header, body ], template: @node)
+          end
+        end
+        body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children[0].selector_and_children()).to eq(
+               ['section', [ 'header', ['div.hgroup', ['h1', '見出し'], ['p.subh', '副見出し']]],
+                ['div.section-body',
+                 ['div.pgroup', ['p', 'パラグラフ。'], ['p', 'パラグラフ。']]]])
+      end
+      it 'converts my markup' do
+        text = "speak(Alice): Alice is speaking.\nspeak(Bob): and this is Bob."
+        noramark = NoraMark::Document.parse(text)
+        noramark.add_transformer(generator: :html) do
+          for_node("speak", :modify) do
+            @node.name = 'p'
+            @node.prepend_child inline('span', @node.parameters[0], classes: ['speaker'])
+          end
+        end
+        body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+        expect(body.element_children[0].selector_and_children()).to eq(
+                 ['p', ['span.speaker', 'Alice'], 'Alice is speaking.'])
+        expect(body.element_children[1].selector_and_children()).to eq(
+                 ['p', ['span.speaker', 'Bob'], 'and this is Bob.'])
+
+      end
+      
+
+      it 'should reparent tree' do
+        text = <<EOF
+1st line.
+d {
+in the div
+}
+*: ul item
+text [s{with inline}] within
+EOF
+        root = NoraMark::Document.parse(text).root
+
+        expect(root.parent).to be nil
+        expect(root.prev).to be nil
+        expect(root.next).to be nil
+        expect(root.content).to be nil
+
+        expect(root.children.size).to eq 1
+        page = root.first_child
+        expect(root.children[0]).to eq page
+        expect(root.last_child).to eq page
+        expect(page.parent).to eq root
+        expect(page.prev).to be nil
+        expect(page.next).to be nil
+
+        first_pgroup = page.first_child
+        expect(first_pgroup.class).to be NoraMark::ParagraphGroup
+        expect(first_pgroup.parent).to eq page
+        expect(first_pgroup.children.size).to eq 1
+        expect(first_pgroup.prev).to be nil
+
+        paragraph = first_pgroup.first_child
+        expect(paragraph.class).to be NoraMark::Paragraph
+        expect(paragraph.parent).to be first_pgroup
+        expect(paragraph.prev).to be nil
+        expect(paragraph.next).to be nil
+        expect(paragraph.children.size).to eq 1
+        text = paragraph.first_child
+        expect(text.class).to be NoraMark::Text
+        expect(text.content).to eq '1st line.'
+        expect(text.children.size).to eq 0
+        expect(text.prev).to be nil
+        expect(text.next).to be nil
+        expect(text.parent).to eq paragraph
+
+        second_div = first_pgroup.next
+        expect(second_div.class).to be NoraMark::Block
+      end
+    end
+    describe 'table of contents' do
+      before do
+        @text = <<EOF
+---
+lang: ja
+title: title
+---
+=: [strong{chapter 1}]
+text
+==: section 1-1
+text
+newpage:
+section {
+h6: [strong{some column}]
+text
+}
+EOF
+        @noramark = NoraMark::Document.parse(@text, document_name: 'nora')
+      end
+      it 'should assign ids to headers' do
+        body = Nokogiri::XML::Document.parse(@noramark.html[0]).root.at_xpath('xmlns:body')
+        h1 = body.at_xpath('//xmlns:h1')
+        expect(h1.selector remove_id: false).to eq "h1#heading_index_1"
+        h2 = body.at_xpath('//xmlns:h2')
+        expect(h2.selector remove_id: false).to eq "h2#heading_index_2"
+        body = Nokogiri::XML::Document.parse(@noramark.html[1]).root.at_xpath('xmlns:body')
+        h6 = body.at_xpath('//xmlns:h6')
+        expect(h6.selector remove_id: false).to eq "h6#heading_index_3"
+      end
+      it 'should generate tocs' do
+        toc = @noramark.html.toc
+        expect(toc.size).to eq 3
+        expect(toc[0]).to eq({link: "nora_00001.xhtml#heading_index_1", level: 1, text: "chapter 1"})
+        expect(toc[1]).to eq({link: "nora_00001.xhtml#heading_index_2", level: 2, text: "section 1-1"})
+        expect(toc[2]).to eq({link: "nora_00002.xhtml#heading_index_3", level: 6, text: "some column"})
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora_mark
 version: !ruby/object:Gem::Version
-  version: 0.2beta6
+  version: 0.2beta7
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg
@@ -82,6 +82,7 @@ files:
 - README.md
 - Rakefile
 - bin/nora2html
+- example/nora-simple-ja.css
 - example/nora-simple.css
 - example/noramark-reference-ja.nora
 - example/noramark-reference-ja_00001.xhtml
@@ -96,9 +97,13 @@ files:
 - lib/nora_mark/html/util.rb
 - lib/nora_mark/html/writer_selector.rb
 - lib/nora_mark/node.rb
+- lib/nora_mark/node_builder.rb
+- lib/nora_mark/node_set.rb
+- lib/nora_mark/node_util.rb
 - lib/nora_mark/parser.kpeg
 - lib/nora_mark/parser.kpeg.rb
 - lib/nora_mark/parser.rb
+- lib/nora_mark/transformer.rb
 - lib/nora_mark/version.rb
 - nora_mark.gemspec
 - spec/created_files/.gitignore