merge PR #63

resolves #55 sort attribute entries in document header

lib/kramdown-asciidoc/converter.rb

@@ -187,16 +187,17 @@ def convert_heading el, opts
         style << %(.#{role.tr ' ', '.'})
       end
       attrs.unshift style.join unless style.empty?
-      lines = []
-      lines << %([#{attrs.join ','}]) unless attrs.empty?
-      # NOTE kramdown removes newlines from heading
-      lines << %(#{'=' * level} #{compose_text el, strip: true})
+      attrlist = %([#{attrs.join ','}]) unless attrs.empty?
+      # NOTE kramdown has already removed newlines
+      title = compose_text el, strip: true
       if level == 1 && writer.empty? && @current_heading_level != 1
-        writer.header.push(*lines)
+        writer.add_prologue_line attrlist if attrlist
+        writer.doctitle = title
         nil
       else
         @attributes['doctype'] = 'book' if level == 1
-        writer.add_lines lines
+        writer.add_line attrlist if attrlist
+        writer.add_line %(#{'=' * level} #{title})
       end
       @current_heading_level = level unless discrete
       nil
@@ -298,7 +299,7 @@ def convert_img el, opts
           style << %(.#{role.tr ' ', '.'})
         end
         attrs.unshift style.join unless style.empty?
-        block_attributes_line = %([#{attrs.join ','}]) unless attrs.empty?
+        attrlist = %([#{attrs.join ','}]) unless attrs.empty?
         block = true
       end
       macro_attrs = [nil]
@@ -325,7 +326,7 @@ def convert_img el, opts
       writer = opts[:writer]
       if block
         writer.start_block
-        writer.add_line block_attributes_line if block_attributes_line
+        writer.add_line attrlist if attrlist
         writer.add_line %(image::#{src}[#{macro_attrs.join ','}])
       else
         writer.append %(image:#{src}[#{macro_attrs.join ','}])
@@ -652,7 +653,7 @@ def extract_prologue el, opts
         (prologue_el = el.dup).children = children.take_while {|child| child.type == :xml_comment || child.type == :blank }
         (el = el.dup).children = children.drop prologue_el.children.size
         traverse prologue_el, (opts.merge writer: (prologue_writer = Writer.new))
-        opts[:writer].header.push(*prologue_writer.body)
+        opts[:writer].add_prologue_lines prologue_writer.body
       end
       el
     end

lib/kramdown-asciidoc/writer.rb

@@ -2,41 +2,30 @@ module Kramdown; module AsciiDoc
   class Writer
     LF = ?\n
 
-    attr_reader :header
+    attr_accessor :doctitle
     attr_reader :body
 
     def initialize
-      @header = []
+      @prologue = []
+      @doctitle = nil
+      @attributes = {}
       @body = []
       @nesting_stack = []
       @block_delimiter = nil
       @block_separator = ['']
       @list_level = { list: 0, dlist: 0 }
     end
 
-    def doctitle
-      if (doctitle_line = @header.find {|l| l.start_with? '= ' })
-        doctitle_line.slice 2, doctitle_line.length
-      end
-    end
-
-    def doctitle= new_doctitle
-      if (doctitle_idx = @header.index {|l| l.start_with? '= ' })
-        @header[doctitle_idx] = %(= #{new_doctitle})
-      else
-        @header.unshift %(= #{new_doctitle})
-      end
-      nil
+    def add_attributes new_attributes
+      @attributes.update new_attributes
     end
 
-    def add_attributes attributes
-      attributes.each {|k, v| add_attribute k, v }
-      nil
+    def add_prologue_line line
+      @prologue << line
     end
 
-    def add_attribute name, value
-      @header << %(:#{name}:#{value.empty? ? '' : ' ' + value.to_s})
-      nil
+    def add_prologue_lines lines
+      @prologue.push(*lines)
     end
 
     def start_block
@@ -125,7 +114,12 @@ def empty?
     end
 
     def to_s
-      (@header.empty? ? @body : (@header + (@body.empty? ? [] : [''] + @body))).join LF
+      header = @prologue.dup
+      header << %(= #{@doctitle}) if @doctitle
+      @attributes.sort.each do |name, val|
+        header << (val.empty? ? %(:#{name}:) : %(:#{name}: #{val}))
+      end unless @attributes.empty?
+      (header.empty? ? @body : (header + (@body.empty? ? [] : [''] + @body))).join LF
     end
   end
 end; end

spec/scenarios/attributes/sorting.adoc

@@ -0,0 +1,6 @@
+= Document Title
+:bar: bar
+:experimental:
+:foo: foo
+
+menu:Terminal[Quit]

spec/scenarios/attributes/sorting.md

@@ -0,0 +1,3 @@
+# Document Title
+
+**Terminal > Quit**

spec/scenarios/attributes/sorting.opts

@@ -0,0 +1,3 @@
+:attributes:
+  foo: 'foo'
+  bar: 'bar'

spec/scenarios/heading/lazy_ids/auto-ids.adoc

@@ -1,6 +1,6 @@
 = Document Title
-:idseparator: -
 :idprefix:
+:idseparator: -
 
 == A Section