sectionx 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7653882e849311ffb0491a9b8f8b183428f5ffa2b356cf9efeea2eee4541876e
-  data.tar.gz: 97481ce099e24757a05f80f684d34d19adc287373da41d49b2cd75bced8dca9d
+  metadata.gz: 63fe8525916ada9ed53f9f26fe0e52d418014fa9e353ecb5f5a3ea5be2cb077f
+  data.tar.gz: 51708043ba4e4b0b9c2be4deefbc8fc79d57625c1bd310ecb4c6816898ff3005
 SHA512:
-  metadata.gz: 7fa52302ae34c4d7f2a638458873a03629d8b4ac03740cd444d2e87ab7b9844a4b8cdff48f33a187a20534a47cb7477574e7017a81ad300374d450f2499c8a02
-  data.tar.gz: 199787ec39b9851282428cef0485aafd1c0b10e289a59c8d1f03fd41dcc322928e39f78b6b472be1cc3e2c4feffeaad2b27ccf90a213c8f2480bd6ce18175932
+  metadata.gz: 44f2151ab264e996bdfd0ce3d35bbe6d28749cc93243970f4a0b42a06db14510557fe89332ef89b909bae81f556b38afe00bce0b360cdb33dff6fa44ac263057
+  data.tar.gz: f9e33725a6e19ef3aee3e2855a812e17b12e53cc844bf250604551f0f25c38356ce9614216fdcafc4961bde8eff33edb7434abef1b01066d9feb304dced7ddea

data/lib/sectionx.rb

@@ -8,14 +8,28 @@ require 'rxfhelper'
 require 'recordx'
 
 
+module RegGem
+
+  def self.register()
+'
+hkey_gems
+  doctype
+    sectionx
+      require sectionx
+      class SectionX
+      media_type sectionx
+'      
+  end
+end
+
 class SectionX
   using ColouredText
 
   attr_reader :attributes, :summary, :sections
   
-  def initialize(x=nil, debug: false)
+  def initialize(x=nil, nested: false, debug: false)
     
-    @debug = debug
+    @nested, @debug = nested, debug
     puts ('initialize() x: ' + x.inspect).debug if @debug
     
     @doc = if x.is_a? String then
@@ -25,6 +39,7 @@ class SectionX
     end
     
     if @doc then
+      puts ('@doc.root: ' + @doc.root.xml.inspect).debug if @debug
       @attributes, @summary, @sections = parse_root_node @doc.root
     end
   end
@@ -157,6 +172,7 @@ class SectionX
   def build_section(xml, raw_rows)
     
     puts ('raw_rows : ' + raw_rows.inspect).debug if @debug
+    
     raw_section_name  = raw_rows.shift    
     puts ('section_name : ' + raw_section_name.inspect).debug if @debug
     
@@ -170,10 +186,33 @@ class SectionX
     xml.section(attr) do
       
       rows, sections = raw_rows.partition {|x| x.length == 1}
-      build_summary xml, rows
+      puts ('rows: ' + rows.inspect).debug if @debug
       
-      xml.sections do
-        sections.each {|section| build_section xml, section }
+      a = rows.flatten.map {|x|  x[/[^:]+/].lstrip}
+      index = a[1..-1].index(a.first)
+      puts ('index: ' + index.inspect).debug if @debug
+
+      if index then
+
+        xml.sections do
+          a2 = rows.each_slice(index+1).to_a
+          a2.each do |section|
+            puts ('section_: ' + section.inspect) if @debug
+            section.insert 0, nil
+            build_section xml, section
+          end
+        end
+        
+      
+      else
+        build_summary xml, rows
+        
+        # are these rowx sections or regular sections?
+        puts ('sections: ' + sections.inspect).debug if @debug
+        
+        xml.sections do
+          sections.each {|section| build_section xml, section }
+        end
       end
     end
 
@@ -231,6 +270,8 @@ class SectionX
   
   def parse_root_node(e)
 
+    puts ('e: ' + e.xml.inspect).debug if @debug
+    
     attributes = e.attributes
     summary = RecordX.new e.xpath('summary/*'), self, debug: @debug
    
@@ -238,19 +279,25 @@ class SectionX
 
     return [attributes, summary, {}] if a.empty?
     
+    
+    if @nested and a[0].attributes.empty? then
+      sections = a.map {|x| SectionX.new(x, debug: @debug)}
+      return [attributes, summary, sections]
+    end
+        
     sections = {}
     
     if a[0] and a[0].attributes.empty? then
       section1 = a.shift
-      sections = {'' => SectionX.new(section1, debug: true)}
+      sections = {'' => SectionX.new(section1, debug: @debug)}
     end
     
     sections =  a.inject(sections) do |r, section|
       
       h = section.attributes
-      name = (h[:id] || h[:title].gsub(/\s+/,'_')).downcase.to_sym
+      name = (h[:id] || h[:title] || '').gsub(/\s+/,'_').downcase.to_sym
       
-      obj_section = SectionX.new(section, debug: @debug)
+      obj_section = SectionX.new(section, debug: @debug, nested: true)
       define_singleton_method(name) { obj_section }
       r.merge(name => obj_section)
     end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sectionx
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lPw+nNEEQBBBOO6255zdlyzYtxsHXnEKJYvUjl4/Z/YIa2Y+VgLolw8kPC0Z0Ztw
   TLvN099jf8wfGlEJ/VkEKkXV
   -----END CERTIFICATE-----
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -46,7 +46,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
@@ -83,20 +83,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: recordx
   requirement: !ruby/object:Gem::Requirement