nora_mark 0.2beta15 → 0.2beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab3cab407b40a37ddb78f770011aabd71768727
-  data.tar.gz: 88374067b24427c73c945f0be3fc5654875779f8
+  metadata.gz: d90789f0a20df993346e159dd0b37cdd1f664f9c
+  data.tar.gz: 4c373042623881fcc820041c5454219d12c2f2ca
 SHA512:
-  metadata.gz: e2d49d88eb73c4d933be68140e0cd6dd0df0336aad343e6cd2dfb32ff5c03e18db38df803c4c4833d5608a57ee891f897c6f41b66997c26253c9a9ce6f4bd25d
-  data.tar.gz: e61233e4d76f037e19e786341f31faefed03a36cc6c0b0b8a8a85529b175ce96fc0028cae3e38517f64f9f32516ad1adaf65ad626451c48b9242e084a057d836
+  metadata.gz: eb21f8791bccb24784e2761a4aa3bbe92c77723f83643acf5a60a33e84db5715b99b824b0b77e331c91d83600286d7b87198fff6fce101ca1fbe34d01367e0e5
+  data.tar.gz: 8797e08d2c24486f596028f6b65f036c4097f5126ae058b29feae8dc7a859c4267a250ebeab02b6dc86f4930256f41363e620b1d600a02a94cdbb894533e3068

data/lib/nora_mark/document.rb

@@ -50,13 +50,7 @@ module NoraMark
         @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
+        @root.assign_pageno
       end
       frontmatter = instance.root.find_node :type => :Frontmatter
       if (frontmatter)

data/lib/nora_mark/html/context.rb

@@ -93,7 +93,7 @@ module NoraMark
       end
 
       # save metadata written with Frontmatter Writer
-      def save_metas
+      def save_default_metas
         @default_param[:styleheets] ||= @stylesheets if !@stylesheets.nil? && @stylesheets.size > 0
         @default_param[:title] ||= @title
         @default_param[:lang] ||= @lang

data/lib/nora_mark/html/generator.rb

@@ -26,10 +26,10 @@ module NoraMark
                                        node_preprocessor: proc do |node|
                                          @context.end_html
                                          if node.first_child.class == Frontmatter
-                                           @context.save_metas
                                            frontmatter = node.first_child
                                            frontmatter_writer.write frontmatter
                                            frontmatter.remove
+                                           @context.save_default_metas
                                          end
                                          node
                                        end);

data/lib/nora_mark/html/pages.rb

@@ -57,6 +57,16 @@ module NoraMark
           end
         end
       end 
+      def write_toc_as_file(directory: nil)
+        return if @toc.nil?
+        dir = directory || Dir.pwd
+        Dir.chdir(dir) do
+          File.open("#{@file_basename}.yaml", 'w+') do
+            |file|
+            file << YAML.dump(@toc)
+          end
+        end
+      end
     end
   end
 end

data/lib/nora_mark/node.rb

@@ -36,8 +36,8 @@ module NoraMark
     def each
       node = self
       while !node.nil?
-        yield node
-        node = node.next
+        node, node_old = node.next, node
+        yield node_old
       end
     end
 
@@ -151,16 +151,31 @@ module NoraMark
       @next = nil
     end
 
-    def remove
+    def _remove_internal
       @parent.first_child = @next  if !@parent.nil? && @parent.first_child == self
       @parent.last_child = @prev  if !@parent.nil? && @parent.last_child == self
       @next.prev = @prev unless @next.nil?
       @prev.next = @next unless @prev.nil?
+    end
+    
+    def remove
+      _remove_internal
       @parent.children_replaced unless @parent.nil?
       unlink
       self
     end
 
+    def remove_following
+      parent = @parent
+      r = self.map do |node|
+        node._remove_internal
+        node.unlink
+        node
+      end
+      parent.children_replaced
+      r
+    end
+
     def after(node)
       node.remove
       node.parent = @parent
@@ -309,6 +324,16 @@ module NoraMark
 
   class Root < Node
     attr_accessor :document_name
+
+    def assign_pageno
+      @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
+    end
   end
 
   class Page < Node

data/lib/nora_mark/rake_task.rb

@@ -3,7 +3,7 @@ require 'rake/tasklib'
 
 module NoraMark
   class RakeTask < ::Rake::TaskLib
-    attr_accessor :lang, :page_number_digits
+    attr_accessor :lang, :page_number_digits, :write_toc_file
     def initialize(lang: 'en')
       @preprocessors = []
       @transformers = []
@@ -21,6 +21,14 @@ module NoraMark
       @transformers << block;
     end
 
+    def html
+      return @nora.html if !@nora.nil?
+    end
+
+    def toc
+      return @nora.html.toc if !@nora.nil? && !@nora.html.nil?
+    end
+
     def define
       desc "rule for *-nora.txt to *-nora_xxx.html. Use *-nora-transform.rb on same directory as transformer"
       rule( /-((nora)|(arti))_[0-9]{#{page_number_digits}}\.xhtml/ =>
@@ -30,8 +38,9 @@ module NoraMark
         |t|
 
         dir =  File.dirname File.expand_path(t.source)
-        transformer_name = File.join dir, File.basename(t.source, '.txt') + '-transform.rb'
-        nora =
+        basename = File.basename(t.source, '.txt')
+        transformer_name = File.join dir, basename + '-transform.rb'
+        @nora =
           NoraMark::Document.parse(
                                    File.open(t.source),
                                    :lang => @lang.to_s,
@@ -50,7 +59,10 @@ module NoraMark
             doc.add_transformer(text: File.open(transformer_name).read)
           end
         end
-        nora.html.write_as_files
+        @nora.html.write_as_files
+        if (@write_toc_file)
+          @nora.html.write_toc_as_file
+        end
       end
       
     end

data/lib/nora_mark/version.rb

@@ -1,3 +1,3 @@
 module NoraMark
-  VERSION = "0.2beta15"
+  VERSION = "0.2beta16"
 end

data/spec/node_spec.rb

@@ -129,6 +129,39 @@ EOF
                ['div.the_class', ['p', '3rd line.']])
     end
 
+    it 'removes node' do
+      noramark = NoraMark::Document.parse(@text)
+      page = noramark.root.children[0]
+      second_div = page.children[1]
+      second_div.remove
+      body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+      expect(body.selector_and_children(remove_id: false))
+        .to eq(["body", ["p", "1st line."], ["p", "5th line."]])
+    end
+
+    it 'removes all nodes after specified node' do
+      noramark = NoraMark::Document.parse(@text)
+      page = noramark.root.children[0]
+      second_div = page.children[1]
+      second_div.remove_following
+      body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+      expect(body.selector_and_children(remove_id: false))
+        .to eq(["body", ["p", "1st line."]])
+    end
+
+    it 'replace with removed nodes' do
+      noramark = NoraMark::Document.parse(@text)
+      page = noramark.root.children[0]
+      first_p = page.children[0]
+      second_div = page.children[1]
+      removed = second_div.remove_following
+      first_p.replace(removed)
+      body = Nokogiri::XML::Document.parse(noramark.html[0]).root.at_xpath('xmlns:body')
+      expect(body.selector_and_children(remove_id: false))
+        .to eq(["body", ["div.the_class", ["p", "3rd line."]], ["p", "5th line."]])
+    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')

data/spec/nora_mark_spec.rb

@@ -1388,6 +1388,7 @@ EOF
         expect(files).to include 'nora-test-file_001.xhtml'
         expect(files).to include 'nora-test-file_002.xhtml'
       end
+
     end
     describe 'parse and create manual' do
       before {
@@ -1421,6 +1422,7 @@ EOF
     end
     describe 'table of contents' do
       before do
+        @basedir = File.join(File.dirname(__FILE__), 'created_files')        
         @text = <<EOF
 ---
 lang: ja
@@ -1436,8 +1438,9 @@ h6: [strong{some column}]
 text
 }
 EOF
-        @noramark = NoraMark::Document.parse(@text, document_name: 'nora')
+        @noramark = NoraMark::Document.parse(@text, document_name: 'nora-with-toc')
       end
+      after { Dir.glob(File.join(@basedir, '*.yaml')) { |file| File.delete file } }
       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')
@@ -1452,12 +1455,27 @@ EOF
         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"})
+          .to eq({link: "nora-with-toc_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"})
+          .to eq({link: "nora-with-toc_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"})
+          .to eq({link: "nora-with-toc_00002.xhtml#heading_index_3", level: 6, text: "some column"})
+      end
+      it 'should generate and write tocs' do
+        @noramark.html.write_toc_as_file(directory: @basedir)
+        expect(File.exist?(File.join(@basedir, 'nora-with-toc.yaml')))
+        File.open(File.join(@basedir, 'nora-with-toc.yaml')) do
+          |file|
+          toc = YAML.load(file.read)
+          expect(toc[0])
+            .to eq({link: "nora-with-toc_00001.xhtml#heading_index_1", level: 1, text: "chapter 1"})
+          expect(toc[1])
+            .to eq({link: "nora-with-toc_00001.xhtml#heading_index_2", level: 2, text: "section 1-1"})
+          expect(toc[2])
+            .to eq({link: "nora-with-toc_00002.xhtml#heading_index_3", level: 6, text: "some column"})
+        end
       end
+
     end
     it 'should raise error' do
       text = "d {\n block is\nd {\n nested but\nd {\n not terminated }"

data/spec/transformer_spec.rb

@@ -18,9 +18,15 @@ d.class-1 {
   text is here
 }
 
+#(split-me) section 2
+
+  next text.
+
+# section 3
 EOF
     @parsed = NoraMark::Document.parse(@text)
   end
+
   it 'can access frontmatter' do
     @parsed.add_transformer(generator: :html) do
       modify 'd' do
@@ -34,4 +40,100 @@ EOF
               ['div.custom1', ['div.pgroup', ['p', 'text is here']]]]
              )
   end
+  it 'can split page' do
+    @parsed.add_transformer(generator: :html) do
+      modify type: :Root do
+        def split page
+          splitted = page.children.inject([]) do |result, node|
+            if node.params && node.params.select { |param| param.text == 'split-me' }.size > 0
+              rest = node.remove_following
+              as_page = rest.shift
+              result << NoraMark::Page.new([as_page], as_page.line_no)
+              result = result + split(NoraMark::Page.new(rest, rest[0].line_no)) if rest.size > 0
+            end
+            result
+          end
+          splitted.unshift page
+        end
+        @node.children.each do |page|
+          splitted = split page
+          if (splitted.size > 1)
+            page = splitted.shift
+            splitted.inject(page) do |page_before, page_after|
+              page_before.after(page_after)
+              page_after
+            end
+            @node.assign_pageno
+          end
+        end
+      end
+    end
+    converted = @parsed.html
+    expect(converted.size).to eq(3)
+    body = Nokogiri::XML::Document.parse(@parsed.html[0]).root.at_xpath('xmlns:body')
+    expect(body.element_children[0].selector_and_children())
+      .to eq(
+            ['section', ['h1', 'section 1'], 
+             ['div.class-1', ['div.pgroup', ['p', 'text is here']]]]
+          )
+
+    body = Nokogiri::XML::Document.parse(@parsed.html[1]).root.at_xpath('xmlns:body')
+    expect(body.element_children[0].selector_and_children())
+      .to eq(
+            ["section", ["h1", "section 2"], 
+             ["div.pgroup", ["p", "next text."]]]
+          )
+  end
+
+  it 'can add frontmatter' do
+    @parsed.add_transformer(generator: :html) do
+      modify type: :Root do
+        def split page
+          splitted = page.children.inject([]) do |result, node|
+            if node.params && node.params.select { |param| param.text == 'split-me' }.size > 0
+              rest = node.remove_following
+              as_page = rest.shift
+              new_frontmatter = NoraMark::Frontmatter.new(['stylesheets: new_stylesheet.css'], as_page.line_no)
+
+              result << NoraMark::Page.new([new_frontmatter, as_page], as_page.line_no)
+              result = result + split(NoraMark::Page.new(rest, rest[0].line_no)) if rest.size > 0
+            end
+            result
+          end
+          splitted.unshift page
+        end
+
+        @node.children.each do |page|
+          splitted = split page
+          if (splitted.size > 1)
+            page = splitted.shift
+            splitted.inject(page) do |page_before, page_after|
+              page_before.after(page_after)
+              page_after
+            end
+            @node.assign_pageno
+          end
+        end
+        
+      end
+    end
+    html = @parsed.html
+    body1 = Nokogiri::XML::Document.parse(html[0]).root.at_xpath('xmlns:body')
+    expect(body1.element_children[0].selector_and_children())
+      .to eq(
+            ['section', ['h1', 'section 1'], 
+             ['div.class-1', ['div.pgroup', ['p', 'text is here']]]]
+          )
+    head2 = Nokogiri::XML::Document.parse(html[1]).root.at_xpath('xmlns:head')
+    expect(head2.element_children[1].a).to eq ["link[rel='stylesheet'][type='text/css'][href='new_stylesheet.css']", '']
+
+    body2 = Nokogiri::XML::Document.parse(@parsed.html[1]).root.at_xpath('xmlns:body')
+    expect(body2.element_children[0].selector_and_children())
+      .to eq(
+            ["section", ["h1", "section 2"], 
+             ["div.pgroup", ["p", "next text."]]]
+          )
+    
+    
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora_mark
 version: !ruby/object:Gem::Version
-  version: 0.2beta15
+  version: 0.2beta16
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg