nora_mark 0.2beta7 → 0.2beta8

data/lib/nora_mark/html/paragraph_writer.rb

@@ -36,9 +36,9 @@ module NoraMark
             ParagraphGroup =>
           TagWriter.create("p", @generator,
                            node_preprocessor: proc do |node|
-                             node.children = node.children.inject([]) do |memo, node|
-                               memo << Breakline.new(memo.last.line_no) if !memo.last.nil? && memo.last.kind_of?(Paragraph) && node.kind_of?(Paragraph)
-                               memo << node
+                             node.children = node.children.inject([]) do |memo, n|
+                               memo << inline('br', body_empty: true, line_no: memo.last.line_no) if !memo.last.nil? && memo.last.kind_of?(Paragraph) && n.kind_of?(Paragraph)
+                               memo << n
                              end
                              node
                            end
@@ -48,7 +48,7 @@ module NoraMark
       end
       def write(node)
         writer_set = @writer_set[@context.paragraph_style] 
-        writer_set = @writer_set['default'] if writer_set.nil?
+        writer_set = @writer_set[:default] if writer_set.nil?
         writer_set[node.class].write(node)
       end
     end

data/lib/nora_mark/html/tag_writer.rb

@@ -2,6 +2,7 @@ module NoraMark
   module Html
     class TagWriter
       include Util
+      include NodeUtil
       attr_accessor :trailer, :node_preprocessors, :write_body_preprocessors
 
       def self.create(tag_name, generator, node_preprocessor: nil, write_body_preprocessor: nil, trailer: "\n", chop_last_space: false)
@@ -27,7 +28,11 @@ module NoraMark
         return '' if attrs.nil?
         attrs.map do
           |name, vals|
-          if vals.nil? || vals.size == 0
+          if vals.nil?
+            ''
+          elsif !vals.is_a? Array
+            " #{name}='#{name}'"
+          elsif vals.size == 0
             ''
           else
             " #{name}='#{vals.join(' ')}'"            
@@ -47,10 +52,6 @@ module NoraMark
         (node.classes ||= []) << cls
       end
 
-      def add_class_if_empty(node, cls)
-        add_class(node, cls) if node.classes.nil? || node.classes.size == 0 
-      end
-
       def tag_start(node)
         return if node.no_tag
         ids = node.ids || []
@@ -77,7 +78,7 @@ module NoraMark
 
       def write(node)
         @node_preprocessors.each { |x| node = instance_exec node.dup, &x }
-        @context.enable_pgroup, saved_ep = !((node.parameters || []).include?('wo-pgroup') || !@context.enable_pgroup), @context.enable_pgroup
+        @context.enable_pgroup, saved_ep = !(node.params.map(&:text).include?('wo-pgroup') || !@context.enable_pgroup), @context.enable_pgroup
         tag_start node
         write_body node unless node.body_empty
         tag_end node unless node.body_empty
@@ -90,10 +91,15 @@ module NoraMark
           return if instance_exec(node, &x) == :done
         }
         write_children node
+        @generator.context.chop_last_space if node.n[:chop_last_space]
       end
 
       def write_children(node)
-        write_nodeset(node.children)
+        if node.raw_text?
+          output escape_html(node.content.join "\n")
+        else
+          write_nodeset(node.children)
+        end
       end
 
       def write_nodeset(nodeset)
@@ -102,9 +108,6 @@ module NoraMark
         @generator.context.chop_last_space if (@param[:chop_last_space]) 
       end
       
-      def children_not_empty(node)
-        !node.children.nil? && node.children.size > 0 && node.children.reject { |x| x.nil? }.size > 0
-      end
     end
   end
 end

data/lib/nora_mark/node.rb

@@ -3,25 +3,36 @@ require 'yaml'
 module NoraMark
   class Node
     include Enumerable
-    attr_accessor :content, :ids, :classes, :no_tag, :attrs, :name, :body_empty, :line_no
+    attr_accessor :raw_content, :content, :ids, :classes, :no_tag, :attrs, :name, :body_empty, :line_no, :raw_text
     attr_accessor :parent, :first_child, :last_child, :prev, :next, :holders
 
-    def named_parameters=(named_parameters)
-      @named_parameters = named_parameters
+    def raw_text?
+      @raw_text
+    end
+    
+    def named_params=(named_params)
+      @named_params = named_params
     end
 
-    def named_parameters
-      @named_parameters ||= {}
+    def named_params
+      @named_params ||= {}
     end
 
-    def parameters=(parameters)
-      @parameters = parameters
+    def params=(params)
+      @params = params.map { |param| NodeSet.new param }
     end
     
-    def parameters
-      @parameters ||= []
+    def params
+      @params
     end
 
+    alias p params
+    alias n named_params
+
+    def add_attr attr
+      (@attrs ||= {}).merge! attr
+    end
+    
     def each
       node = self
       while !node.nil?
@@ -31,10 +42,13 @@ module NoraMark
     end
 
     def match?(selector)
-      selector = build_selector(selector)
-      selector.inject(true) {
-        |result, selector|
-        result && selector.call(self)
+      _match? build_selector(selector)
+    end
+
+    def _match?(raw_selector)
+      raw_selector.inject(true) {
+        |result, s|
+        result && s.call(self)
       }
     end
 
@@ -56,52 +70,80 @@ module NoraMark
     end
 
     def build_selector(selector)
-      if selector.is_a? String
-        selector = { name: selector }
+      original_selector = selector
+      case selector
+      when String
+        selector = { name: original_selector }
+      when Regexp
+        selector = { proc: proc { |node| original_selector =~ node.name }}
       end
       selector.map { |k,v| modify_selector(k,v) }
     end
 
     def ancestors(selector = {})
       result = []
+      raw_selector = build_selector selector
       node = parent
       while !node.nil?
-        result << node if node.match?(selector)
+        result << node if node._match? raw_selector
         node = node.parent
       end
       result
     end
 
+    def children_empty?
+      children.nil? || children.size == 0 || children.reject { |x| x.nil? }.size == 0
+    end
+
     def reparent
-      return if @content.nil?
+      @params ||= []
+      @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
+        end
+        NodeSet.new node_array
+      end
 
-      @content.each {|node| node.remove }
+      return if @raw_content.nil? || raw_text
 
-      @first_child = @content.first
-      @last_child = @content.last
-      @content.inject(nil) do |prev, child_node|
+      @raw_content.each { |node| node.remove }
+      @first_child = @raw_content.first
+      @last_child = @raw_content.last
+      @raw_content.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
       end
-      @content = nil
+      @raw_content = nil
       @children = nil
+      rebuild_children
+    end
+
+    def rebuild_children
+      @children = @first_child.nil? ? [] : NodeSet.new(@first_child.collect { |node| node })
+      @children
     end
 
     def children
       return [] if @first_child.nil?
-      return @children ||= NodeSet.new(@first_child.collect { |node| node })
+      @children ||= rebuild_children
     end
 
     def children=(x)
-      @content = x.to_ary
+      @raw_content = x.to_ary
       reparent
     end
 
     def children_replaced
-      @children = nil
+      rebuild_children
     end
 
     def unlink
@@ -117,30 +159,80 @@ module NoraMark
       @prev.next = @next unless @prev.nil?
       @parent.children_replaced unless @parent.nil?
       unlink
+      self
     end
-    
-    def replace(node)
-      node.parent = @parent
-      @parent.first_child = node if (@parent.first_child == self)
-      @parent.last_child = node if (@parent.last_child == self)
 
-      node.prev = @prev
+    def after(node)
+      node.remove
+      node.parent = @parent
+      node.prev = self
       node.next = @next
-
-      @prev.next = node unless @prev.nil?
       @next.prev = node unless @next.nil?
+      @next = node
+      if !@parent.nil? && @parent.last_child == self
+        @parent.last_child = node
+      end
+      node.reparent
+      @parent.children_replaced unless @parent.nil?
+    end
 
+    def before(node)
+      node.remove
+      node.parent = @parent
+      node.next = self
+      node.prev = @prev
+      @prev.next = node unless @prev.nil?
+      @prev = node
+      if !@parent.nil? && @parent.first_child == self
+        @parent.first_child = node
+      end
       node.reparent
-      node.parent.children_replaced
+      @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? 
+        @parent.first_child = first_node if (@parent.first_child == self)
+        @parent.last_child = first_node if (@parent.last_child == self)
+      end
+
+      first_node.prev = @prev
+      first_node.next = @next
+
+      @prev.next = first_node unless @prev.nil?
+      @next.prev = first_node unless @next.nil?
 
+      first_node.reparent
+      first_node.parent.children_replaced unless first_node.parent.nil?
       unlink
+      rest_nodes.inject(first_node) do
+        |prev, rest_node|
+        prev.after rest_node
+        rest_node
+      end
+    end
+
+    def wrap(node, method = :prepend)
+      replace(node)
+      if (method == :prepend)
+        node.prepend_child(self)
+      else
+        node.append_child(self)
+      end
+      node
     end
 
     def prepend_child(node)
       node.remove
       node.reparent
       if self.children.size == 0
-        @content = [ node ]
+        @raw_content = [ node ]
         reparent
       else
         @first_child.prev = node
@@ -155,7 +247,7 @@ module NoraMark
       node.remove
       node.reparent
       if self.children.size == 0
-        @content = [ node ]
+        @raw_content = [ node ]
         reparent
       else
         @last_child.next = node 
@@ -167,26 +259,53 @@ module NoraMark
     end
 
     def all_nodes
-      return [] if @first_child.nil?
-      @first_child.inject([]) do
-        |result, node|
-        result << node
-        result + node.all_nodes
+      r = []
+      if !@params.nil?
+        @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|
+          result << node
+          result + node.all_nodes
+        end
+      end
+      r
+    end
+
+    def find_node selector
+      _find_node(build_selector selector)
+    end
+
+    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
+              end)
     end
     
     def clone
-      @content = nil
-      all_nodes.each { |node| @content = nil }
+      @raw_content = nil
+      all_nodes.each { |node| node.instance_eval { @raw_content = nil } }
       Marshal.restore Marshal.dump self
     end
 
-    def get_text
+    def text
       children.inject("") do
         |result, node|
-        result << node.get_text
+        result << node.text
       end
     end
+
   end
 
   class Root < Node
@@ -198,21 +317,10 @@ module NoraMark
   end
 
   class DLItem < Node
-    def reparent
-      super
-      @parameters[0].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
-      end
-    end
-    def get_text
-      @parameters[0].inject('') do
+    def text
+      @params[0].inject('') do
         |result, node|
-        result << node.get_text
+        result << node.text
       end << super
     end
   end
@@ -221,14 +329,12 @@ module NoraMark
     def heading_info
       @name =~ /h([1-6])/
       return {} if $1.nil?
-      {level:  $1.to_i, id: @ids[0], text: get_text }
+      {level:  $1.to_i, id: @ids[0], text: text }
     end
   end
 
   class HeadedSection < Node
-    def heading_info
-      {level: @level, id: (named_parameters[:heading_id] || [])[0], text: @heading.map(&:get_text).join('')}
-    end
+    attr_accessor :level
 
     def reparent
       super
@@ -242,40 +348,58 @@ module NoraMark
       end
     end
 
-    def get_text
+    def text
       @heading[0].inject('') do
         |result, node|
-        result << node.get_text
+        result << node.text
       end << super
     end
 
   end
   class Text < Node
     def reparent
-      # do nothing.
+      # do nothing
     end
 
-    def get_text
+    def text
       @content
     end
   end
 
+  class CodeInline < Node
+    def raw_text
+      true
+    end
+    
+    def raw_text?
+      true
+    end
+
+    def text
+      @content
+    end
+  end
 
   class PreformattedBlock < Node
-    def reparent
-      # do nothing.
+    def raw_text
+      true
+    end
+    
+    def raw_text?
+      true
     end
-    def get_text
+
+    def text
       @content.join "\n"
     end
   end
   
   class Frontmatter < Node
     def reparent
-      # do nothing.
+      # do nothing
     end
 
-    def get_text
+    def text
       @content.join "\n"
     end