sectionx 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ba024193f2b8e20e98abdbc95a62066b7225a9
-  data.tar.gz: 3657688b3c3ad30593a5f140b53d7eee9c353ca5
+  metadata.gz: 2b74f9782ec66a578c1079d6e38a7778497f36ab
+  data.tar.gz: ef6e1fd7e0ce3f84f4a0285316fd407ed7e08cde
 SHA512:
-  metadata.gz: 5b5cbc940c639cc7a79829d811f0cc2eb9660923e314e45c0c939332387aff154bcf71e16e8a8f780fdffac6e468224be852e16bc03191a83d8421615f95423e
-  data.tar.gz: dcb5ea50fa71f42603c7c94759e40be38be0d22daed0cd845765b9bb3d907abcdd6e6a9266fe6549cfd49de8d51087dd6c82aa347eef361796fac05d8c10e1d3
+  metadata.gz: d19aae42e9a1e1052434594a2f10755444dbebf2e5222a62d56b9575d00645d56f7d935eb906270d8a04cd62b28c2b45e3676dca890e201ea8476158cdaf04d7
+  data.tar.gz: 01527d3916d68d4a2a7329892e11ed1e9911942e4490b8209792084d69ee44213a502e9a248ebd16cf928c52ea3f7c7da7529673f82938a28081f8079d0f650a

data/lib/sectionx.rb

@@ -37,47 +37,29 @@ class SectionX
     nested = indent_heading("# summary\n%s\n# begin\n%s" % [summary,\
                                                                 body.strip])
     a = LineTree.new(nested).to_a
-
-    raw_summary = a.shift.flatten(1)
-    raw_summary.shift
+    puts 'a' + a.inspect
+    raw_summary = a.shift
+    raw_summary.shift # removes the redundant summary label
     
-    summary = raw_summary.inject({}) do |r,raw_x|
-      label, value = raw_x.split(/\s*:\s*/,2)
-      r.merge(label.downcase.gsub(/\s+/,'_').to_sym => value)
-    end
     
-
-    section1 = a.shift.flatten(1)
-    section1.shift
+    section1 = a.shift # get the 1st section
+    section1[0] = nil  # nilify the section heading 'begin'
 
     xml = RexleBuilder.new
 
     a2 = xml.send(id) do 
+      
       xml.summary do
-        summary.each {|label, value| xml.send(label, escape(value)) }
+        build_rows xml, raw_summary
         xml.recordx_type 'sectionx'
       end
+      
       xml.sections do
-        xml.section do
-          xml.summary do 
-            section1.each do |raw_x|
-              label, value = raw_x.split(/\s*:\s*/,2)
-              xml.send(label.downcase.gsub(/\s+/,'_'), escape(value))
-            end
-          end
-          xml.sections
-        end
-        a.each do |section_name, raw_rows|
-          xml.section({title: section_name}) do
-            xml.summary do
-              raw_rows.each do |raw_x|
-                label, value = raw_x.split(/\s*:\s*/,2)
-                xml.send(label.downcase.gsub(/\s+/,'_'), escape(value))
-              end
-            end
-            xml.sections
-          end
-        end 
+
+        build_section xml, section1
+
+        a.each {|raw_rows| build_section xml, raw_rows }
+
       end
     end
 
@@ -110,7 +92,39 @@ class SectionX
   end    
 
   private
+  
+  def build_rows(xml, raw_rows)
+    
+    raw_rows.each do |raw_x|
+      label, value = raw_x[0].split(/\s*:\s*/,2)
+      xml.send(label.downcase.gsub(/\s+/,'_'), escape(value))
+    end    
+  end
+  
+  def build_section(xml, raw_rows)
+    
+    section_name  = raw_rows.shift    
 
+    attr = section_name ? {title: section_name} : {}
+    
+    xml.section(attr) do
+      
+      rows, sections = raw_rows.partition {|x| x.length == 1}
+      build_summary xml, rows
+      
+      xml.sections do
+        sections.each {|section| build_section xml, section }
+      end
+    end
+
+  end  
+
+  def build_summary(xml, raw_rows)
+
+    xml.summary { build_rows xml, raw_rows }
+
+  end  
+  
   def escape(v)
     v.gsub('&','&amp;').gsub('<','&lt;').gsub('>','&gt;')
   end
@@ -119,15 +133,17 @@ class SectionX
 
     a = s.split(/(?=^\s*#{heading}\s*\w)/).map do |x|
 
-      heading_title = x[/^\s*#{heading}\s*(.*)/,1]
+      heading_title = x[/^\s*#{heading}\s*.*/]
 
       if heading_title then
 
         lines = x.lines
-        body = lines[1..-1].map{|y| y.prepend '  '}.join
+        body = lines[1..-1]\
+                      .map{|y| y.strip.length > 0 ? y.prepend('  ') : y }.join
         r = indent_heading(body, heading + '#')
 
-        heading_title + "\n" + r
+        heading_title.sub(/#+\s*/,'') + "\n" + r
+
       else
         x
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sectionx
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fF3d7swBn//lagO6DAUK+663TP5+b44Iqo8hPzD1c9+c5WJjVDaCskt69Ue5+dlb
   VamQ/GtAeu1Iyg==
   -----END CERTIFICATE-----
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -42,7 +42,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.16
 description: 
 email: james@r0bertson.co.uk
 executables: []