nora_mark 0.2beta19 → 0.3

data/lib/nora_mark/html/pages.rb

@@ -4,7 +4,7 @@ module NoraMark
     class Pages
       attr_reader :created_files
       attr_accessor :file_basename
-      def initialize(sequence_format='%05d')
+      def initialize(sequence_format = '%05d')
         @sequence_format = sequence_format || '%05d'
         @result = []
       end
@@ -16,10 +16,10 @@ module NoraMark
       def size
         @result.size
       end
-      
+
       def <<(page)
         seq = @result.size + 1
-        @result << { content: page, filename: filename_for_page(seq)}
+        @result << { content: page, filename: filename_for_page(seq) }
       end
 
       def [](num)
@@ -32,37 +32,37 @@ module NoraMark
       end
 
       def filename_for_page n
-        "#{@file_basename}_#{@sequence_format%(n)}.xhtml"
+        "#{@file_basename}_#{@sequence_format % (n)}.xhtml"
       end
 
       def set_toc toc_data
         @toc = toc_data.map do |toc_line|
           fi = toc_line[:id] ? "##{toc_line[:id]}" : ''
-          {link: "#{filename_for_page(toc_line[:page])}#{fi}", level: toc_line[:level], text: toc_line[:text]}
+          { link: "#{filename_for_page(toc_line[:page])}#{fi}", level: toc_line[:level], text: toc_line[:text] }
         end
       end
+
       def toc
         @toc
       end
-      
+
       def write_as_files(directory: nil)
         dir = directory || Dir.pwd
         Dir.chdir(dir) do
-          @result.each do
-            |page|
-            File.open(page[:filename], 'w+') do
-              |file|
+          @result.each do |page|
+            File.open(page[:filename], 'w+') do |file|
               file << page[:content]
             end
           end
         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.open("#{@file_basename}.yaml", 'w+') do |file|
             file << YAML.dump(@toc)
           end
         end
@@ -70,4 +70,3 @@ module NoraMark
     end
   end
 end
-

data/lib/nora_mark/html/paragraph_writer.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 module NoraMark
   module Html
     class ParagraphWriter
@@ -7,33 +8,31 @@ module NoraMark
         @context = generator.context
         @writer_set = { use_paragraph_group: {
           Paragraph =>
-          TagWriter.create('p', @generator, chop_last_space: true, 
-                           node_preprocessor: proc do |node|
-                             first = node.children[0]
-                             if first.kind_of? Text
-                               first.content.sub!(/^[[:space:]]+/, '')
-                               add_class(node, 'noindent') if first.content =~/^(「|『|（)/  # TODO: should be plaggable
-                             end
-                             node
-                           end
-                           ),
+          TagWriter.create('p', @generator, chop_last_space: true,
+                                            node_preprocessor: proc do |node|
+                                                                 first = node.children[0]
+                                                                 if first.kind_of? Text
+                                                                   first.content.sub!(/^[[:space:]]+/, '')
+                                                                   add_class(node, 'noindent') if first.content =~ /^(「|『|（)/ # TODO: should be plaggable
+                                                                 end
+                                                                 node
+                                                               end),
           ParagraphGroup =>
           TagWriter.create("div", @generator,
                            node_preprocessor: proc do |node|
                              add_class node, 'pgroup'
                              node.no_tag = true unless @context.enable_pgroup
                              node
-                           end
-                           )
-          },
-          default: {
-            Paragraph =>
-          TagWriter.create(nil, @generator, chop_last_space: true,
-                           node_preprocessor: proc do |node|
-                             node.no_tag = true
-                             node
-                           end),
-            ParagraphGroup =>
+                           end)
+        },
+                        default: {
+                          Paragraph =>
+                        TagWriter.create(nil, @generator, chop_last_space: true,
+                                                          node_preprocessor: proc do |node|
+                                                                               node.no_tag = true
+                                                                               node
+                                                                             end),
+                          ParagraphGroup =>
           TagWriter.create("p", @generator,
                            node_preprocessor: proc do |node|
                              node.children = node.children.inject([]) do |memo, n|
@@ -41,13 +40,12 @@ module NoraMark
                                memo << n
                              end
                              node
-                           end
-                           )
-          }
-        }
+                           end)
+                        } }
       end
+
       def write(node)
-        writer_set = @writer_set[@context.paragraph_style] 
+        writer_set = @writer_set[@context.paragraph_style]
         writer_set = @writer_set[:default] if writer_set.nil?
         writer_set[node.class].write(node)
       end

data/lib/nora_mark/html/raw_text_block_writer.rb

@@ -4,9 +4,10 @@ module NoraMark
       def initialize(generator)
         @generator = generator
       end
+
       def write(node)
         @generator.to_html node.text
       end
     end
   end
-end  
+end

data/lib/nora_mark/html/tag_writer.rb

@@ -9,7 +9,7 @@ module NoraMark
         instance = TagWriter.new(tag_name, generator, chop_last_space: chop_last_space)
         instance.node_preprocessors << node_preprocessor unless node_preprocessor.nil?
         instance.write_body_preprocessors << write_body_preprocessor unless write_body_preprocessor.nil?
-        instance.trailer = trailer 
+        instance.trailer = trailer
         yield instance if block_given?
         instance
       end
@@ -26,8 +26,8 @@ module NoraMark
 
       def attr_string(attrs)
         return '' if attrs.nil?
-        attrs.map do
-          |name, vals|
+
+        attrs.map do |name, vals|
           if vals.nil?
             ''
           elsif !vals.is_a? Array
@@ -35,17 +35,17 @@ module NoraMark
           elsif vals.size == 0
             ''
           else
-            " #{name}='#{escape_html(vals.join(' '))}'"            
+            " #{name}='#{escape_html(vals.join(' '))}'"
           end
         end.join('')
       end
 
       def class_string(cls_array)
-        attr_string({class: cls_array})
+        attr_string({ class: cls_array })
       end
 
       def ids_string(ids_array)
-        attr_string({id: ids_array})
+        attr_string({ id: ids_array })
       end
 
       def add_class(node, cls)
@@ -54,12 +54,13 @@ module NoraMark
 
       def tag_start(node)
         return if node.no_tag
+
         ids = node.ids || []
         classes = node.classes || []
         attr = node.attrs || {}
-        node.n.each { |k,v|
+        node.n.each { |k, v|
           if k.to_s.start_with? 'data-'
-            attr.merge!({ k => [ v ] })
+            attr.merge!({ k => [v] })
           end
         }
         tag_name = @tag_name || node.name
@@ -74,9 +75,10 @@ module NoraMark
       def output(string)
         @context << string
       end
-      
+
       def tag_end(node)
         return if node.no_tag
+
         tag_name = @tag_name || node.name
         @context << "</#{tag_name}>#{@trailer}"
       end
@@ -91,8 +93,7 @@ module NoraMark
       end
 
       def write_body(node)
-        @write_body_preprocessors.each {
-          |x|
+        @write_body_preprocessors.each { |x|
           return if instance_exec(node, &x) == :done
         }
         write_children node
@@ -109,10 +110,10 @@ module NoraMark
 
       def write_nodeset(nodeset)
         return if nodeset.nil? || nodeset.size == 0
+
         nodeset.each { |x| @generator.to_html x }
-        @generator.context.chop_last_space if (@param[:chop_last_space]) 
+        @generator.context.chop_last_space if (@param[:chop_last_space])
       end
-      
     end
   end
 end

data/lib/nora_mark/html/util.rb

@@ -2,11 +2,11 @@ module NoraMark
   module Html
     module Util
       def escape_html(string)
-        string.to_s.gsub("&", "&").
-          gsub("<", "&lt;").
-          gsub(">", "&gt;").
-          gsub('"', "&quot;").
-          gsub("'", "&#39;")
+        string.to_s.gsub("&", "&amp;")
+              .gsub("<", "&lt;")
+              .gsub(">", "&gt;")
+              .gsub('"', "&quot;")
+              .gsub("'", "&#39;")
       end
     end
   end

data/lib/nora_mark/node.rb

@@ -9,7 +9,7 @@ module NoraMark
     def raw_text?
       @raw_text
     end
-    
+
     def named_params=(named_params)
       @named_params = named_params
     end
@@ -21,7 +21,7 @@ module NoraMark
     def params=(params)
       @params = params.map { |param| NodeSet.new param }
     end
-    
+
     def params
       @params
     end
@@ -32,7 +32,7 @@ module NoraMark
     def add_attr attr
       (@attrs ||= {}).merge! attr
     end
-    
+
     def each
       node = self
       while !node.nil?
@@ -46,22 +46,21 @@ module NoraMark
     end
 
     def _match?(raw_selector)
-      raw_selector.inject(true) {
-        |result, s|
+      raw_selector.inject(true) { |result, s|
         result && s.call(self)
       }
     end
 
-    def modify_selector(k,v)
+    def modify_selector(k, v)
       case k
       when :type
-        proc { | node | node.kind_of? NoraMark.const_get(v) }
+        proc { |node| node.kind_of? NoraMark.const_get(v) }
       when :name
-        proc { | node | node.name ==  v }
+        proc { |node| node.name ==  v }
       when :id
-        proc { | node | (node.ids || []).contain? v }
+        proc { |node| (node.ids || []).contain? v }
       when :class
-        proc { | node | (node.class || []).contain? v }
+        proc { |node| (node.class || []).contain? v }
       when :proc
         v
       else
@@ -75,9 +74,9 @@ module NoraMark
       when String
         selector = { name: original_selector }
       when Regexp
-        selector = { proc: proc { |node| original_selector =~ node.name }}
+        selector = { proc: proc { |node| original_selector =~ node.name } }
       end
-      selector.map { |k,v| modify_selector(k,v) }
+      selector.map { |k, v| modify_selector(k, v) }
     end
 
     def ancestors(selector = {})
@@ -97,14 +96,12 @@ module NoraMark
 
     def reparent
       @params ||= []
-      @params = @params.map do
-        |node_array|
-        node_array.inject(nil) do
-          |prev, child_node|
+      @params = @params.map do |node_array|
+        node_array.inject(nil) do |prev, child_node|
           child_node.prev = prev
           prev.next = child_node if !prev.nil?
           child_node.parent = self
-          child_node.reparent 
+          child_node.reparent
           child_node
         end
         NodeSet.new node_array
@@ -119,7 +116,7 @@ module NoraMark
         child_node.prev = prev
         prev.next = child_node if !prev.nil?
         child_node.parent = self
-        child_node.reparent 
+        child_node.reparent
         child_node
       end
       @raw_content = nil
@@ -133,6 +130,7 @@ module NoraMark
 
     def children
       return [] if @first_child.nil?
+
       @children ||= rebuild_children
     end
 
@@ -152,12 +150,12 @@ module NoraMark
     end
 
     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
+      @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?
@@ -203,15 +201,15 @@ module NoraMark
       node.reparent
       @parent.children_replaced unless @parent.nil?
     end
-    
+
     def replace(node)
       node = [node] if !node.is_a? Array
-      
+
       first_node = node.shift
       rest_nodes = node
 
       first_node.parent = @parent
-      if !@parent.nil? 
+      if !@parent.nil?
         @parent.first_child = first_node if (@parent.first_child == self)
         @parent.last_child = first_node if (@parent.last_child == self)
       end
@@ -225,8 +223,7 @@ module NoraMark
       first_node.reparent
       first_node.parent.children_replaced unless first_node.parent.nil?
       unlink
-      rest_nodes.inject(first_node) do
-        |prev, rest_node|
+      rest_nodes.inject(first_node) do |prev, rest_node|
         prev.after rest_node
         rest_node
       end
@@ -246,7 +243,7 @@ module NoraMark
       node.remove
       node.reparent
       if self.children.size == 0
-        @raw_content = [ node ]
+        @raw_content = [node]
         reparent
       else
         @first_child.prev = node
@@ -256,15 +253,15 @@ module NoraMark
         children_replaced
       end
     end
-    
+
     def append_child(node)
       node.remove
       node.reparent
       if self.children.size == 0
-        @raw_content = [ node ]
+        @raw_content = [node]
         reparent
       else
-        @last_child.next = node 
+        @last_child.next = node
         node.prev = @last_child
         node.parent = self
         @last_child = node
@@ -275,18 +272,15 @@ module NoraMark
     def all_nodes
       r = []
       if !@params.nil?
-        @params.each do
-          |node_array|
-          r = node_array[0].inject([]) do
-            |result, node|
+        @params.each do |node_array|
+          r = node_array[0].inject([]) do |result, node|
             result << node
             result + node.all_nodes
           end
         end
       end
       if !@first_child.nil?
-        r = @first_child.inject(r) do
-          |result, node|
+        r = @first_child.inject(r) do |result, node|
           result << node
           result + node.all_nodes
         end
@@ -301,12 +295,13 @@ module NoraMark
     def _find_node raw_selector
       return self if _match? raw_selector
       return nil unless @first_child
+
       return (@first_child.find { |n| n._match? raw_selector } ||
-              @first_child.inject(nil) do
-                |r, n| r or n._find_node raw_selector
+              @first_child.inject(nil) do |r, n|
+                r or n._find_node raw_selector
               end)
     end
-    
+
     def clone
       @raw_content = nil
       all_nodes.each { |node| node.instance_eval { @raw_content = nil } }
@@ -314,12 +309,10 @@ module NoraMark
     end
 
     def text
-      children.inject("") do
-        |result, node|
+      children.inject("") do |result, node|
         result << node.text
       end
     end
-
   end
 
   class Root < Node
@@ -342,8 +335,7 @@ module NoraMark
 
   class DLItem < Node
     def text
-      @params[0].inject('') do
-        |result, node|
+      @params[0].inject('') do |result, node|
         result << node.text
       end << super
     end
@@ -353,7 +345,8 @@ module NoraMark
     def heading_info
       @name =~ /h([1-6])/
       return {} if $1.nil?
-      {level:  $1.to_i, id: @ids[0], text: text }
+
+      { level: $1.to_i, id: @ids[0], text: text }
     end
   end
 
@@ -362,23 +355,20 @@ module NoraMark
 
     def reparent
       super
-      @heading.inject(nil) do
-        |prev, child_node|
+      @heading.inject(nil) do |prev, child_node|
         child_node.prev = prev
         prev.next = child_node if !prev.nil?
         child_node.parent = self
-        child_node.reparent 
+        child_node.reparent
         child_node
       end
     end
 
     def text
-      @heading[0].inject('') do
-        |result, node|
+      @heading[0].inject('') do |result, node|
         result << node.text
       end << super
     end
-
   end
   class Text < Node
     attr_accessor :noescape
@@ -395,7 +385,7 @@ module NoraMark
     def raw_text
       true
     end
-    
+
     def raw_text?
       true
     end
@@ -409,7 +399,7 @@ module NoraMark
     def raw_text
       true
     end
-    
+
     def raw_text?
       true
     end
@@ -418,7 +408,7 @@ module NoraMark
       @content.join "\n"
     end
   end
-  
+
   class Frontmatter < Node
     def reparent
       # do nothing
@@ -433,4 +423,4 @@ module NoraMark
       @yaml
     end
   end
-end  
+end

data/lib/nora_mark/node_set.rb

@@ -31,7 +31,7 @@ module NoraMark
     end
 
     def text
-      @list.inject('') {|r,n| r << n.text }
+      @list.inject('') { |r, n| r << n.text }
     end
   end
 end

data/lib/nora_mark/node_util.rb

@@ -4,14 +4,14 @@ module NoraMark
       children_arg = children || children_
       if !children_arg.nil?
         children_arg = children_arg.to_ary if children_arg.kind_of? NodeSet
-        children_arg = [ children_arg ] if !children_arg.kind_of? Array
+        children_arg = [children_arg] if !children_arg.kind_of? Array
         children_arg = children_arg.map { |node| (node.is_a? String) ? Text.new(node, 0) : node }
       end
       if !template.nil?
         node = klass.new(name, template.ids, template.classes, template.params, template.n, template.children, template.line_no)
-        node.ids = (node.ids ||[] + ids) if ids.size > 0
+        node.ids = (node.ids || [] + ids) if ids.size > 0
         node.classes = (node.classes || [])
-        node.classes = node.classes +  classes
+        node.classes = node.classes + classes
         if node.classes.size == 0 && class_if_empty
           node.classes << class_if_empty
         end
@@ -33,12 +33,12 @@ module NoraMark
       node
     end
 
-    def block(*args)
-      _node(Block, *args)
+    def block(*args, **kwargs)
+      _node(Block, *args, **kwargs)
     end
 
-    def inline(*args)
-      _node(Inline, *args)
+    def inline(*args, **kwargs)
+      _node(Inline, *args, **kwargs)
     end
 
     def text value, raw_text: nil
@@ -46,6 +46,5 @@ module NoraMark
       text.raw_text = raw_text
       text
     end
-
   end
 end