nora_mark 0.2beta16 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d90789f0a20df993346e159dd0b37cdd1f664f9c
-  data.tar.gz: 4c373042623881fcc820041c5454219d12c2f2ca
+SHA256:
+  metadata.gz: a401d3cef71e3eec2bebbfbd6b552a9df37972cb7796949ce76ba3dc1e4fde67
+  data.tar.gz: d6c6e6e6a345c97e73992bd270a8669e34d9fa2654af324b9a214cacedd9d43a
 SHA512:
-  metadata.gz: eb21f8791bccb24784e2761a4aa3bbe92c77723f83643acf5a60a33e84db5715b99b824b0b77e331c91d83600286d7b87198fff6fce101ca1fbe34d01367e0e5
-  data.tar.gz: 8797e08d2c24486f596028f6b65f036c4097f5126ae058b29feae8dc7a859c4267a250ebeab02b6dc86f4930256f41363e620b1d600a02a94cdbb894533e3068
+  metadata.gz: fa6db5a1d5606ce45949603156d380d2182a1671c63ff30116b5295c384d363aa2bde5b55d16b5543bbfbd4d23d175893a3ab5e0a8028246480eb7c71e5a71ea
+  data.tar.gz: 8ee3306e81d0e3ef5f20f2ee06da56e7b748618b3acc51d30c6a096c32a6001f6d4c9e59d26ba86beb23abdd43527a39c63c657d93ec04a03ce7886d78eac98e

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: skoji

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "20:00"
+  open-pull-requests-limit: 10

data/.github/workflows/test.yml

@@ -0,0 +1,19 @@
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [3.0, 3.1]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: setup gems
+      run: bundle install --jobs 4 --retry 3
+    - name: run test
+      run: bundle exec rake spec

data/.gitignore

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

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  Exclude:
+    - 'lib/nora_mark/parser.kpeg.rb'

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
+  - 2.5.7
+  - 2.6.5
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# version 0.3 
+
+* Update dependencies
+* Only support Ruby 3.0
+
 # version 0.2beta8 to 0.2beta12
 
 * Plugin API for generator

data/Gemfile

@@ -3,4 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in nora_mark.gemspec
 gemspec
 
-gem 'coveralls', require: false

data/README.md

@@ -1,7 +1,6 @@
 # NoraMark
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/skoji/noramark?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[<img src="https://secure.travis-ci.org/skoji/noramark.png" />](http://travis-ci.org/skoji/noramark) [![Coverage Status](https://coveralls.io/repos/skoji/noramark/badge.png?branch=master)](https://coveralls.io/r/skoji/noramark?branch=master)
 [![Dependency Status](https://gemnasium.com/skoji/noramark.png)](https://gemnasium.com/skoji/noramark)
 [![Gem Version](https://badge.fury.io/rb/nora_mark.png)](http://badge.fury.io/rb/nora_mark)
 
@@ -13,7 +12,7 @@ In non-beta release version, the syntax will be more stable.
 
 ## Requirements
 
-* Ruby 2.0.0 or greater
+* Ruby 3.0.0 or greater
 
 ## Installation
 

data/Rakefile

@@ -2,11 +2,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-rule(/\.kpeg\.rb/ => proc {|task_name| task_name.sub(/kpeg\.rb$/, 'kpeg')}) do
-  |t|
+rule(/\.kpeg\.rb/ => proc { |task_name| task_name.sub(/kpeg\.rb$/, 'kpeg') }) do |t|
   system "kpeg -f #{t.prerequisites[0]}"
 end
 
 RSpec::Core::RakeTask.new(:spec => ["lib/nora_mark/parser.kpeg.rb"])
-
-

data/lib/nora_mark/document.rb

@@ -1,14 +1,14 @@
 require 'securerandom'
 
 module NoraMark
-  class Document 
+  class Document
     attr_accessor :document_name, :root
-    private_class_method :new 
+    private_class_method :new
 
     def self.generators
       @generators ||= {}
     end
-    
+
     def self.register_generator(generator)
       @generators ||= {}
       generator_name = generator.name
@@ -24,7 +24,7 @@ module NoraMark
       if generator.is_a? Symbol or generator.is_a? String
         generator_name = generator.to_sym
       else
-        generator_name = generator.name        
+        generator_name = generator.name
       end
 
       @generators.delete generator_name
@@ -38,15 +38,15 @@ module NoraMark
       instance = new param
       src = (string_or_io.respond_to?(:read) ? string_or_io.read : string_or_io).encode 'utf-8'
       yield instance if block_given?
-      instance.instance_eval do 
-        @preprocessors.each do
-          |pr|
+      instance.instance_eval do
+        @preprocessors.each do |pr|
           src = pr.call(src)
         end
         parser = Parser.new(src)
         if (!parser.parse)
           raise parser.raise_error
         end
+
         @root = parser.result
         @root.document_name ||= @document_name
         @root.reparent
@@ -58,7 +58,7 @@ module NoraMark
           NoraMark::Extensions.register_generator(frontmatter.yaml['generator'].to_sym)
         end
       end
-      
+
       instance
     end
 
@@ -69,7 +69,7 @@ module NoraMark
     def transformers(generator_name)
       @transformers[generator_name] ||= []
     end
-    
+
     def generate(generator_name)
       if @result[generator_name].nil?
         transformers(generator_name).each { |t| t.transform @root }
@@ -86,16 +86,16 @@ module NoraMark
     def add_transformer(generator: :html, text: nil, &block)
       (@transformers[generator] ||= []) << TransformerFactory.create(text: text, &block)
     end
-    
+
     def initialize(param = {})
       @param = param
       @result = {}
       @preprocessors = [
-                        Proc.new { |text| text.gsub(/\r?\n(\r?\n)+/, "\n\n") },
-                       ]
+        Proc.new { |text| text.gsub(/\r?\n(\r?\n)+/, "\n\n") },
+      ]
       @document_name = param[:document_name] || "noramark_#{SecureRandom.uuid}"
       @render_parameter = {}
-      @transformers = { }
-    end 
+      @transformers = {}
+    end
   end
 end

data/lib/nora_mark/extensions.rb

@@ -1,27 +1,27 @@
 module NoraMark
   class Extensions
     def self.register_generator(generator)
-      if !generator.respond_to? :name
+      if generator.is_a? Symbol  or generator.is_a? String
         generator = load_generator(generator)
       end
       NoraMark::Document.register_generator(generator)
     end
-    
+
     def self.unregister_generator(generator)
       NoraMark::Document.unregister_generator(generator)
     end
-    
+
     def self.const_get_if_available(name)
-      name.split(/::/).inject(Object){|o,c|
+      name.split(/::/).inject(Object) { |o, c|
         o.const_get(c) if !o.nil? and o.const_defined? c
-      }       
+      }
     end
 
-    private    
     def self.load_generator(generator)
       module_name = "NoraMark::#{generator.to_s.capitalize}::Generator"
       generator_module = const_get_if_available(module_name)
       return generator_module unless generator_module.nil?
+
       path = "#{generator.to_s.downcase}.rb"
       current_dir_path = File.expand_path(File.join('.', '.noramark-plugins', path))
       home_dir_path = File.expand_path(File.join(ENV['HOME'], '.noramark-plugins', path))

data/lib/nora_mark/html/abstract_node_writer.rb

@@ -4,6 +4,7 @@ module NoraMark
       def initialize(generator)
         @generator = generator
       end
+
       def write(node)
         node.children.each do |child|
           @generator.to_html child
@@ -11,4 +12,4 @@ module NoraMark
       end
     end
   end
-end  
+end

data/lib/nora_mark/html/context.rb

@@ -9,7 +9,7 @@ module NoraMark
         @title = param[:title] || 'NoraMark generated document'
         @stylesheets = param[:stylesheets] || []
         @enable_pgroup = param[:enable_pgroup] || true
-        self.paragraph_style= param[:paragraph_style]
+        self.paragraph_style = param[:paragraph_style]
         @pages = Pages.new(param[:sequence_format])
         @metas = param[:metas] || []
         @namespaces = {}
@@ -20,13 +20,13 @@ module NoraMark
             if s.is_a? String
               ret << "<link rel=\"stylesheet\" type=\"text/css\" href=\"#{s}\" />\n"
             elsif s.is_a? Array
-              ret << "<link rel=\"stylesheet\" type=\"text/css\" media=\"#{s[1]}\" href=\"#{s[0]}\" />\n"  
+              ret << "<link rel=\"stylesheet\" type=\"text/css\" media=\"#{s[1]}\" href=\"#{s[0]}\" />\n"
             else
               raise "Can't use #{s} as a stylesheet"
             end
           end
           ret << @metas.map do |meta|
-            "<meta " + meta.map do |k,v|
+            "<meta " + meta.map do |k, v|
               "#{k}=\"#{v}\""
             end.join(" ") + " />"
           end.join("\n")
@@ -37,7 +37,7 @@ module NoraMark
       def file_basename=(name)
         @pages.file_basename = name
       end
-      
+
       def chop_last_space
         @pages.last.sub!(/[[:space:]]+\Z/, '')
       end
@@ -45,37 +45,38 @@ module NoraMark
       def paragraph_style=(style)
         return if style.nil?
         raise "paragrapy_style accepts only :default or :use_paragraph_group but is #{style}" if style != :default && style != :use_paragraph_group
+
         @paragraph_style = style
       end
-      
+
       def paragraph_style
         if @paragraph_style
           @paragraph_style
-        elsif @lang.split('-')[0] == 'ja' 
+        elsif @lang.split('-')[0] == 'ja'
           :use_paragraph_group
         else
           :default
         end
       end
+
       def head_inserter(&block)
         head_inserters << block
       end
 
       def start_html(title = nil)
         @title = title if !title.nil?
-        if @pages.size >0 && !@pages.last.frozen?
+        if @pages.size > 0 && !@pages.last.frozen?
           end_html
         end
         page = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
         page << "<html xmlns=\"http://www.w3.org/1999/xhtml\""
-        page << @namespaces.map do |k,v|
+        page << @namespaces.map do |k, v|
           " xmlns:#{k}=\"#{v}\""
         end.join(' ')
         page << " lang=\"#{@lang}\" xml:lang=\"#{@lang}\">\n"
         page << "<head>\n"
         page << "<title>#{@title}</title>\n"
-        @head_inserters.each {
-          |f|
+        @head_inserters.each { |f|
           page << f.call
         }
         page << "</head>\n"
@@ -84,17 +85,18 @@ module NoraMark
 
       def end_html
         return if @pages.size == 0
+
         page = @pages.last
         if !page.frozen?
           page << "</html>\n"
-          page.freeze 
+          page.freeze
         end
         restore_metas
       end
 
       # 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,12 +105,12 @@ 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
+        @lang = @default_param[:lang] || @lang
         @paragraph_style = @default_param[:paragraph_style] || @paragraph_style
-        @namespaces = @default_param[:namespaces]  || @namespaces
-        @metas = @default_param[:metas]  || @metas
+        @namespaces = @default_param[:namespaces] || @namespaces
+        @metas = @default_param[:metas] || @metas
       end
 
       def <<(text)

data/lib/nora_mark/html/default_transformer.rb

@@ -9,7 +9,7 @@ module NoraMark
         rename 'sect', 'section'
         rename 'sp', 'span'
 
-        modify({type: :Root}) do
+        modify({ type: :Root }) do
           if (@options[:render_parameter] ||= {})[:nonpaged]
             first_page = @node.first_child.remove
             @node.children.each do |node|
@@ -28,7 +28,7 @@ module NoraMark
         end
         modify(/\A(l|link)\Z/) do
           @node.name = 'a'
-          (@node.attrs ||= {}).merge!({href: [@node.params[0].text]})
+          (@node.attrs ||= {}).merge!({ href: [@node.params[0].text] })
         end
 
         replace 'noescape' do
@@ -51,21 +51,21 @@ module NoraMark
         modify 'img' do
           @node.body_empty = true
           @node.attrs ||= {}
-          @node.attrs.merge!({src: [@node.params[0].text ]}) if @node.attrs[:src].nil?
-          @node.attrs.merge!({alt: [ escape_html(@node.params[1].text.strip)]}) if (@node.attrs[:alt].nil? && @node.p.size > 1 && @node.params[1].text.size > 0)
+          @node.attrs.merge!({ src: [@node.params[0].text] }) if @node.attrs[:src].nil?
+          @node.attrs.merge!({ alt: [escape_html(@node.params[1].text.strip)] }) if (@node.attrs[:alt].nil? && @node.p.size > 1 && @node.params[1].text.size > 0)
         end
 
         replace 'image' do
           imagenode = inline('img', nil,
                              body_empty: true,
-                             attrs: {src: [ @node.params[0].text.strip],  alt: [ (@node.params[1].text ||'').strip ] })
+                             attrs: { src: [@node.params[0].text.strip], alt: [(@node.params[1].text || '').strip] })
           newnode = block('figure',
-                          class_if_empty:'img-wrap',
+                          class_if_empty: 'img-wrap',
                           ids: @node.ids,
-                          children: [ imagenode],
-                          template: @node) 
+                          children: [imagenode],
+                          template: @node)
           if !@node.children_empty?
-            if @node.n[:caption_before] 
+            if @node.n[:caption_before]
               newnode.prepend_child inline('figcaption', @node.children)
             else
               newnode.append_child inline('figcaption', @node.children)
@@ -74,87 +74,90 @@ module NoraMark
           newnode
         end
 
-        replace({type: :OrderedList}) do
+        replace({ type: :OrderedList }) do
           block('ol', template: @node)
         end
 
-        replace({type: :UnorderedList}) do
+        replace({ type: :UnorderedList }) do
           block('ul', template: @node)
         end
 
-        replace({type: :UlItem}) do
+        replace({ type: :UlItem }) do
           block('li', template: @node)
         end
 
-        replace({type: :OlItem}) do
+        replace({ type: :OlItem }) do
           block('li', template: @node)
         end
 
-        replace({type: :DefinitionList}) do
+        replace({ type: :DefinitionList }) do
           block('dl', template: @node)
         end
 
-        replace({type: :DLItem}) do
+        replace({ type: :DLItem }) do
           [
-           block('dt', @node.p[0], n: {chop_last_space: true}),
-           block('dd', @node.children)
+            block('dt', @node.p[0], n: { chop_last_space: true }),
+            block('dd', @node.children)
           ]
         end
 
-        replace({type: :Breakline}) do
+        replace({ type: :Breakline }) do
           newnode = block('br')
           newnode.body_empty = true
           newnode
         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)
+        replace({ type: :HeadedSection }) do
+          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
+        replace({ type: :CodeInline }) do
           inline('code', @node.content, line_no: @node.line_no, template: @node)
         end
-        
-        replace ({type: :PreformattedBlock}) do
+
+        replace({ type: :PreformattedBlock }) do
           new_node = block('pre')
           if @node.codelanguage
             new_node.attrs = @node.attrs
             new_node.add_attr 'data-code-language' => [@node.codelanguage]
-            new_node.classes =  (@node.classes ||[]) << "code-#{@node.codelanguage}"
+            new_node.classes = (@node.classes || []) << "code-#{@node.codelanguage}"
           end
           if @node.name == 'code'
             code = block('code', text(@node.content.join("\n"), raw_text: true))
-            new_node.children = [ code ]
+            new_node.children = [code]
           else
-            new_node.children = [ text(@node.content.join("\n"), raw_text: true) ]
+            new_node.children = [text(@node.content.join("\n"), raw_text: true)]
           end
-          if (@node.p || []).size> 0
+          if (@node.p || []).size > 0
             method = @node.n[:caption_after] ? :prepend : :append
-            new_node = new_node.wrap block('div', classes: ['pre'], children: [ block('p', children: @node.p.shift, classes: ['caption']) ]), method
+            new_node = new_node.wrap block('div', classes: ['pre'], children: [block('p', children: @node.p.shift, classes: ['caption'])]), method
           end
           new_node
         end
 
         modify 'video' do
           @node.attrs ||= {}
-          @node.attrs.merge!({src: [@node.p.shift.text]})
-          @node.attrs.merge!({poster: [@node.n[:poster]]}) unless @node.n[:poster].nil?
+          @node.attrs.merge!({ src: [@node.p.shift.text] })
+          @node.attrs.merge!({ poster: [@node.n[:poster]] }) unless @node.n[:poster].nil?
 
           options = @node.p.map { |opt| opt.text.strip }
-          ['autoplay', 'controls', 'loop', 'muted'].each do
-            |attr|
-            @node.attrs.merge!({attr.to_sym => true}) if options.member? attr
+          ['autoplay', 'controls', 'loop', 'muted'].each do |attr|
+            @node.attrs.merge!({ attr.to_sym => true }) if options.member? attr
           end
         end
 
         modify 'audio' do
           @node.attrs ||= {}
-          @node.attrs.merge!({src: [@node.p.shift.text]})
-          @node.attrs.merge!({volume: [@node.n[:volume]]}) unless @node.n[:volume].nil?
+          @node.attrs.merge!({ src: [@node.p.shift.text] })
+          @node.attrs.merge!({ volume: [@node.n[:volume]] }) unless @node.n[:volume].nil?
           options = @node.p.map { |opt| opt.text.strip }
-          ['autoplay', 'controls', 'loop', 'muted'].each do
-            |attr|
-            @node.attrs.merge!({attr.to_sym => true}) if options.member? attr
+          ['autoplay', 'controls', 'loop', 'muted'].each do |attr|
+            @node.attrs.merge!({ attr.to_sym => true }) if options.member? attr
           end
         end
       end

data/lib/nora_mark/html/frontmatter_writer.rb

@@ -27,6 +27,7 @@ module NoraMark
           end
         }
       end
+
       def write(node)
         if node.yaml.keys.map(&:to_sym).include? :stylesheets
           @context.stylesheets = []
@@ -34,8 +35,7 @@ module NoraMark
         if node.yaml.keys.map(&:to_sym).include? :meta
           @context.metas = []
         end
-        node.yaml.each {
-          |k,v|
+        node.yaml.each { |k, v|
           writer = @writers[k.to_sym]
           writer.call(v) unless writer.nil?
         }

data/lib/nora_mark/html/generator.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 require 'nora_mark/html/util'
 require 'nora_mark/html/pages'
 require 'nora_mark/html/context'
@@ -6,6 +7,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 +24,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
@@ -33,43 +36,42 @@ module NoraMark
                                          end
                                          node
                                        end);
-        
+
         @writers = {
+          Text => raw_writer,
           Paragraph => paragraph_writer,
           ParagraphGroup => paragraph_writer,
-          Inline =>TagWriter.create(nil, self, trailer: ''),
+          Inline => TagWriter.create(nil, self, trailer: ''),
           Block => TagWriter.create(nil, self),
-          Document =>  abstract_node_writer,
-          Page =>  page_writer,
-          Frontmatter =>  frontmatter_writer,
-          }
+          Document => abstract_node_writer,
+          Page => page_writer,
+          Frontmatter => frontmatter_writer,
+        }
       end
 
-      def collect_id_and_headings 
+      def collect_id_and_headings
         @id_pool = {}
         @headings = []
 
         all_nodes = @parsed_result.all_nodes
-        all_nodes.each do
-          |x|
+        all_nodes.each do |x|
           x.ids ||= []
-          x.ids.each do
-            |id|
+          x.ids.each do |id|
             if !@id_pool[id].nil?
               warn "duplicate id #{id}"
             end
             @id_pool[id] = x
           end
-          @headings << x if (x.kind_of?(Block) && x.name =~ /h[1-6]/) 
+          @headings << x if (x.kind_of?(Block) && x.name =~ /h[1-6]/)
         end
       end
-      def assign_id_to_headings 
+
+      def assign_id_to_headings
         collect_id_and_headings
         count = 1
-        @headings.each do
-          |heading|
-          if heading.ids.size == 0 
-            begin 
+        @headings.each do |heading|
+          if heading.ids.size == 0
+            begin
               id = "heading_index_#{count}"
               count = count + 1
             end while @id_pool[id]
@@ -82,13 +84,12 @@ module NoraMark
         transformer = Html.default_transformer
         transformer.options[:render_parameter] = render_parameter
         @parsed_result = transformer.transform parsed_result
-        assign_id_to_headings 
+        assign_id_to_headings
 
         children = parsed_result.children
         @context.file_basename = parsed_result.document_name
         @context.render_parameter = render_parameter
-        children.each {
-          |node|
+        children.each { |node|
           to_html(node)
         }
         @context.set_toc generate_toc
@@ -96,8 +97,7 @@ module NoraMark
       end
 
       def generate_toc
-        @headings.map do
-          |heading|
+        @headings.map do |heading|
           { page: heading.ancestors(type: :Page)[0].page_no }.merge heading.heading_info
         end
       end