sectionx 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86aee6fa7596e7802019252d40920e6929fa4392
-  data.tar.gz: 2409e37c1fd6bc756c6680239d7aacc139c07128
+  metadata.gz: 18ba024193f2b8e20e98abdbc95a62066b7225a9
+  data.tar.gz: 3657688b3c3ad30593a5f140b53d7eee9c353ca5
 SHA512:
-  metadata.gz: 0cd016c86aa9fd9ce8a5f7d4c911eb2c030c6df7493cbff3f2ddc8ff94ea0bcda7a1e0a8a2bbe7df4094859732a708838ae9496a8c51e0abb819764a124acf4a
-  data.tar.gz: b1de0c2038dd999c274a92ca62f9716f67858909a025faa320f7c12b54269891d6d2df53827c560e87ce792dbd0c7635db1c993ea2b25aef97a6fa65625067f2
+  metadata.gz: 5b5cbc940c639cc7a79829d811f0cc2eb9660923e314e45c0c939332387aff154bcf71e16e8a8f780fdffac6e468224be852e16bc03191a83d8421615f95423e
+  data.tar.gz: dcb5ea50fa71f42603c7c94759e40be38be0d22daed0cd845765b9bb3d907abcdd6e6a9266fe6549cfd49de8d51087dd6c82aa347eef361796fac05d8c10e1d3

data/lib/sectionx.rb

@@ -12,10 +12,16 @@ class SectionX
 
   attr_reader :summary, :sections
   
-  def initialize(e=nil)
+  def initialize(x=nil)
     
-    if e then
-      @summary, @sections = parse_root_node e
+    @doc = if x.is_a? String then
+      buffer, _ = RXFHelper.read x
+      Rexle.new buffer
+    elsif x.is_a? Rexle::Element then x      
+    end
+    
+    if @doc then
+      @summary, @sections = parse_root_node @doc.root
     end
   end
 
@@ -48,7 +54,7 @@ class SectionX
 
     a2 = xml.send(id) do 
       xml.summary do
-        summary.each {|label, value| xml.send(label, value) }
+        summary.each {|label, value| xml.send(label, escape(value)) }
         xml.recordx_type 'sectionx'
       end
       xml.sections do
@@ -56,7 +62,7 @@ class SectionX
           xml.summary do 
             section1.each do |raw_x|
               label, value = raw_x.split(/\s*:\s*/,2)
-              xml.send(label.downcase.gsub(/\s+/,'_'), value)
+              xml.send(label.downcase.gsub(/\s+/,'_'), escape(value))
             end
           end
           xml.sections
@@ -66,7 +72,7 @@ class SectionX
             xml.summary do
               raw_rows.each do |raw_x|
                 label, value = raw_x.split(/\s*:\s*/,2)
-                xml.send(label.downcase.gsub(/\s+/,'_'), value)
+                xml.send(label.downcase.gsub(/\s+/,'_'), escape(value))
               end
             end
             xml.sections
@@ -75,26 +81,9 @@ class SectionX
       end
     end
 
-    @doc = doc = Rexle.new a2
-  
-    @summary, @sections = parse_root_node(doc.root)
-    
-    summary_methods = (summary.keys - self.public_methods)
+    @doc = Rexle.new a2
+    @summary, @sections = parse_root_node(@doc.root)    
     
-    summary_methods.each do |x|
-      
-      instance_eval "
-      
-        def #{x.to_sym}()
-          @summary[:#{x}]
-        end
-      
-        def #{x.to_s}=(v)
-          @summary[:#{x}] = v
-          @doc.root.element('summary/#{x.to_s}').text = v
-        end
-        "      
-    end    
     self
   end
   
@@ -122,7 +111,10 @@ class SectionX
 
   private
 
-
+  def escape(v)
+    v.gsub('&','&amp;').gsub('<','&lt;').gsub('>','&gt;')
+  end
+  
   def indent_heading(s, heading='#')
 
     a = s.split(/(?=^\s*#{heading}\s*\w)/).map do |x|
@@ -148,6 +140,22 @@ class SectionX
   def parse_root_node(e)
     
     summary = RecordX.new e.xpath('summary/*')
+    summary_methods = (summary.keys - self.public_methods)
+    
+    summary_methods.each do |x|
+      
+      instance_eval "
+      
+        def #{x.to_sym}()
+          @summary[:#{x}]
+        end
+      
+        def #{x.to_s}=(v)
+          @summary[:#{x}] = v
+          @doc.root.element('summary/#{x.to_s}').text = v
+        end
+        "      
+    end        
     
     sections =  e.xpath('sections/section').map do |section|
       SectionX.new section

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sectionx
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson