nora_mark 0.2beta16 → 0.2beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d90789f0a20df993346e159dd0b37cdd1f664f9c
-  data.tar.gz: 4c373042623881fcc820041c5454219d12c2f2ca
+  metadata.gz: 1bab7f5959bf222485ec011a400b45a59ecf32b9
+  data.tar.gz: 82db31a87f16a58e7ec20cbad96a2af68debc16a
 SHA512:
-  metadata.gz: eb21f8791bccb24784e2761a4aa3bbe92c77723f83643acf5a60a33e84db5715b99b824b0b77e331c91d83600286d7b87198fff6fce101ca1fbe34d01367e0e5
-  data.tar.gz: 8797e08d2c24486f596028f6b65f036c4097f5126ae058b29feae8dc7a859c4267a250ebeab02b6dc86f4930256f41363e620b1d600a02a94cdbb894533e3068
+  metadata.gz: 3d38219f488f9317ee28bdf8379f0c2e58581888491ab4d442d306d73ef94b785ade9a3a8ad890790d4c47d849ae05eed3c83a33ff47ce2156edc411fe6a4535
+  data.tar.gz: d4bffde774cb6a1c4369306428a0465954fe5216680d0b4bc6558647a9de6fdd95f359b7248d22e06c64c1c4cac82baf8bf5b94a7b9bed4ef8ce095468d504eb

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+o

data/lib/nora_mark/html/context.rb

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

data/lib/nora_mark/html/default_transformer.rb

@@ -108,7 +108,12 @@ module NoraMark
         end
 
         replace({type: :HeadedSection}) do
-          block('section', [ block("h#{@node.level}", @node.heading, ids: @node.n[:heading_id], n: {chop_last_space: true}) ] + @node.children, template: @node)
+          if @node.named_params[:without_header]
+            content = @node.children
+          else
+            content = [ block("h#{@node.level}", @node.heading, ids: @node.n[:heading_id], n: {chop_last_space: true}) ] + @node.children
+          end
+          block('section', content, template: @node)
         end
 
         replace ({type: :CodeInline}) do

data/lib/nora_mark/html/generator.rb

@@ -6,6 +6,7 @@ require 'nora_mark/html/tag_writer'
 require 'nora_mark/html/frontmatter_writer'
 require 'nora_mark/html/paragraph_writer'
 require 'nora_mark/html/abstract_node_writer'
+require 'nora_mark/html/raw_text_block_writer'
 require 'nora_mark/html/default_transformer'
 
 module NoraMark
@@ -22,6 +23,7 @@ module NoraMark
         frontmatter_writer = FrontmatterWriter.new self
         paragraph_writer = ParagraphWriter.new self
         abstract_node_writer = AbstractNodeWriter.new self
+        raw_writer = RawTextBlockWriter.new self
         page_writer = TagWriter.create('body', self,
                                        node_preprocessor: proc do |node|
                                          @context.end_html
@@ -35,6 +37,7 @@ module NoraMark
                                        end);
         
         @writers = {
+          Text => raw_writer,
           Paragraph => paragraph_writer,
           ParagraphGroup => paragraph_writer,
           Inline =>TagWriter.create(nil, self, trailer: ''),

data/lib/nora_mark/html/raw_text_block_writer.rb

@@ -0,0 +1,12 @@
+module NoraMark
+  module Html
+    class RawTextBlockWriter
+      def initialize(generator)
+        @generator = generator
+      end
+      def write(node)
+        @generator.to_html node.text
+      end
+    end
+  end
+end  

data/lib/nora_mark/node.rb

@@ -172,7 +172,7 @@ module NoraMark
         node.unlink
         node
       end
-      parent.children_replaced
+      parent.children_replaced if parent
       r
     end
 

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, :write_toc_file
+    attr_accessor :lang, :page_number_digits, :title, :stylesheets, :write_toc_file
     def initialize(lang: 'en')
       @preprocessors = []
       @transformers = []
@@ -40,12 +40,16 @@ module NoraMark
         dir =  File.dirname File.expand_path(t.source)
         basename = File.basename(t.source, '.txt')
         transformer_name = File.join dir, basename + '-transform.rb'
+        parameters = {
+          :lang => @lang.to_s,
+          :sequence_format => "%0#{page_number_digits}d",
+          :document_name=>t.name.sub(/_[0-9]{#{page_number_digits}}\.xhtml/, '')
+        }
+        parameters[:stylesheets] = @stylesheets unless @stylesheets.nil?
+        parameters[:title] = @title unless @title.nil?
         @nora =
           NoraMark::Document.parse(
-                                   File.open(t.source),
-                                   :lang => @lang.to_s,
-                                   :sequence_format => "%0#{page_number_digits}d",
-                                   :document_name=>t.name.sub(/_[0-9]{#{page_number_digits}}\.xhtml/, '')) do
+                                   File.open(t.source), parameters) do
           |doc|
           @preprocessors.each do
             |prepro|

data/lib/nora_mark/version.rb

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

data/spec/nora_mark_spec.rb

@@ -1203,7 +1203,29 @@ EOF
         expect(body.element_children[2].selector_and_children)
           .to eq(["div.pgroup", ["p", "normal line again."]])
       end
-
+      it 'convert noescape block' do
+        text = <<EOF
+normal line.
+noescape {
+<table>
+<tr><td>you can write anything here.</td></tr>
+</table>
+}
+normal line again.
+EOF
+        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.pgroup", ["p", "normal line."]])
+        expect(body.element_children[1].selector_and_children)
+          .to eq(
+                ["table",
+                 ["tr",
+                  ["td", 'you can write anything here.']]])
+        expect(body.element_children[2].selector_and_children)
+          .to eq(["div.pgroup", ["p", "normal line again."]])
+      end
     end
 
     describe 'markdown style' do
@@ -1221,6 +1243,21 @@ EOF
                    ['p', 'これは、セクションの中です。']]]
                  )
       end
+
+      it 'should convert markdown style heading : without header' do
+        text = "#[without_header: true]: タイトル です。\r\n\r\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',
+                  ['div.pgroup', 
+                   ['p', 'これは、セクションの中です。']]]
+                 )
+      end
+      
       it 'should convert markdown style heading with empty body' do
         text = "# タイトルです。\n* 中身です。\n\n## 次のタイトルです。これから書きます。\n\n## ここもこれから。"
         noramark = NoraMark::Document.parse(text, lang: 'ja', title: 'the title')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nora_mark
 version: !ruby/object:Gem::Version
-  version: 0.2beta16
+  version: 0.2beta18
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg
@@ -126,6 +126,7 @@ files:
 - lib/nora_mark/html/generator.rb
 - lib/nora_mark/html/pages.rb
 - lib/nora_mark/html/paragraph_writer.rb
+- lib/nora_mark/html/raw_text_block_writer.rb
 - lib/nora_mark/html/tag_writer.rb
 - lib/nora_mark/html/util.rb
 - lib/nora_mark/node.rb