dynarex 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa8b7da4e8d5cd1b23e6bce5d1d852b4abe26fed
-  data.tar.gz: b1b2b7004882805809d372c78b610cce6cc5ce13
+  metadata.gz: 1b84b89265aa1ec7adf68b5a5b044a6ce0e13d1d
+  data.tar.gz: aba66ad0418ac4ee49243a4adaf466c2da0b2021
 SHA512:
-  metadata.gz: 957ba23b15ccef7e0c08bc78c7dfb2f22e769c8250c0b0b665ba1ee7c256e881f1f6774fa76be6d67f23380a0ec830a8f40829f8a7beb78811750c6875aa908e
-  data.tar.gz: a538cfac322d0bb91e679e2b2023d189ecb5d04e363e73f91a7735e24b444fbb0a84d385913fc3084587a3186cb08ca81ce759768ccad58df9197ea289388998
+  metadata.gz: 02c7dc48abe83da86fd2a17ca13870ca4792a599347952c8852e0bcc2c179d722c9da823a03fc38c76e445f2019ebd86a13e4be2fa9184840f99e0c662e51f1d
+  data.tar.gz: 1453ab33d8666f11167f63b6c8e6dfb7dfc4d0019daa63be36404b5cfb2977e27aafc37ee4178ca17c2865aa4bedf2073f20a8d6aee0a42ee516694ac4e7a5bc

data/lib/dynarex.rb

@@ -4,8 +4,8 @@
 
 require 'open-uri'
 require 'dynarex-import'
-require 'line-tree'
-require 'rexle'
+#require 'line-tree'
+#require 'rexle'
 require 'rexle-builder'
 require 'rexslt'
 require 'dynarex-xslt'
@@ -39,6 +39,7 @@ class Dynarex
 
   def initialize(rawx=nil, opt={})
     
+    #@log = Logger.new('/home/james/mm.log')
     @opt = {username: nil, password: nil}.merge opt
     @delimiter = ''
 
@@ -286,12 +287,14 @@ EOF
 #Parses 1 or more lines of text to create or update existing records.
 
   def parse(x=nil)
-    
+    #log = Logger.new('/home/james/mm.log')
+    #log.debug('dynarex: inside parse()')
     raw_buffer, type = RXFHelper.read(x)
 
     if raw_buffer.is_a? String then
       buffer = raw_buffer.clone
       buffer = yield if block_given?          
+      #log.debug('dynarex: before string_parse()')
       string_parse buffer
     else
       foreign_import x
@@ -446,13 +449,17 @@ EOF
       end # end of if @records
     end
 
+    #@log.debug('dynarex: a = ' + a.inspect)
     doc = Rexle.new(a)
     
+    #@log.debug('dynarex: doc.inspect : ' + doc.inspect)
+    #@log.debug('dynarex: doc ' + doc.xml[0..149].inspect)
     if @xslt then
       doc.instructions = [['xml-stylesheet', 
         "title='XSL_formatting' type='text/xsl' href='#{@xslt}'"]]
     end
 
+    #log.debug('dynarex: state: ' + state.inspect)
     return doc if state != :internal
     @doc = doc
   end
@@ -628,7 +635,7 @@ EOF
   alias refresh_doc display_xml
 
   def string_parse(buffer)
-
+    #@log.debug '+string_parse'
     buffer.gsub!("\r",'')
     buffer.gsub!(/\n-{4,}\n/,"\n\n")
     buffer.gsub!(/---\n/m, "--- ")
@@ -637,30 +644,37 @@ EOF
     buffer.gsub!(/<./) {|x| x[1] != '?' ? x.sub(/</,'&lt;') : x }
 
     @raw_header = buffer[/<\?dynarex[^>]+>/]
-
+    #log = Logger.new('/home/james/mm.log')
+    #log.debug('dynarex: before if buffer()')
+    #@log.debug 'before buffer match'
+    
     if buffer[/<\?/] then
-
+      #@log.debug 'inside buffer'
       raw_stylesheet = buffer.slice!(/<\?xml-stylesheet[^>]+>/)
       @xslt = raw_stylesheet[/href=["']([^"']+)/,1] if raw_stylesheet
       @raw_header = buffer.slice!(/<\?dynarex[^>]+>/) + "\n"
-
+      
+      #@log.debug 'before header'
       header = @raw_header[/<?dynarex (.*)?>/,1]
 
       r1 = /([\w\-]+\s*\=\s*'[^']*)'/
       r2 = /([\w\-]+\s*\=\s*"[^"]*)"/
 
       r = header.scan(/#{r1}|#{r2}/).map(&:compact).flatten      
+      #@log.debug 'before each'
       r.each do |x|
 
         attr, val = x.split(/\s*=\s*["']/,2)
+        #@log.debug('dynarex: attr' + attr.inspect)
         self.method((attr + '=').to_sym).call(unescape val)
       end
 
     end
-
+#log = Logger.new('/home/james/mm.log')
+    #@log.debug('dynarex: before root()')
     # if records already exist find the max id
     i = @doc.root.xpath('max(records/*/attribute::id)').to_i
-    
+    #log.debug('dyanrex: after root()')
     raw_summary = schema[/\[([^\]]+)/,1]
 
     raw_lines = buffer.lines.to_a
@@ -741,62 +755,18 @@ EOF
         
       when '--+'
 
-        self.summary[:rawdoc_type] = 'rowx'
-        raw_lines.shift
-
-        a3 = raw_lines.join.strip.split(/\n\n(?=\w+:)/)
-
-        # get the fields
-        a4 = a3.map{|x| x.scan(/^\w+(?=:)/)}.flatten(1).uniq
-        
-        abbrv_fields = a4.all? {|x| x.length == 1}
-        
-        a5 = a3.map do |xlines|
+        rowx(raw_lines)
         
-          missing_fields = a4 - xlines.scan(/^\w+(?=:)/)
+      when '--#'
 
-          r = xlines.split(/\n(\w+:.*)/m)
-          missing_fields.map!{|x| x + ":"}
-          key = (abbrv_fields ? @fields[0].to_s[0] : @fields.first.to_s) + ':'
-          
-          if missing_fields.include? key
-            r.unshift key
-            missing_fields.delete key
-          end
-          
-          r += missing_fields
-          r.join("\n")
-        
-        end
-
-        xml = RowX.new(a5.join("\n").strip, level: 0).to_xml
-
-        a2 = Rexle.new(xml).root.xpath('item').inject([]) do |r,x|          
-
-          r << @fields.map do |field|
-            x.text(abbrv_fields ? field.to_s.chr : field.to_s )
-          end
-          
-        end
-
-        a2.compact!        
-          
-        # if there is no field value for the first field then 
-        #   the default_key is invalid. The default_key is changed to an ID.
-        if a2.detect {|x| x.first == ''} then
-          add_id(a2)
-        else
+        self.summary[:rawdoc_type] = 'sectionx'
+        raw_lines.shift
 
-          a3 = a2.map(&:first)
-          add_id(a2) if a3 != a3.uniq 
-          
-        end
-        
-        a2
+        raw_lines.join("\n").split(/(?=^#[^#])/).map {|x| [x.rstrip]}
         
     else
 
-    raw_lines = raw_lines.join("\n").gsub(/^\s*#[^\n]+/,'').lines.to_a        
+      raw_lines = raw_lines.join("\n").gsub(/^\s*#[^\n]+/,'').lines.to_a        
       a2 = raw_lines.map.with_index do |x,i|
 
         next if x[/^\s+$|\n\s*#/]
@@ -869,7 +839,7 @@ EOF
   def dynarex_new(s)
     @schema = s
     ptrn = %r((\w+)\[?([^\]]+)?\]?\/(\w+)\(([^\)]+)\))
-
+    #@log.debug 'inside dynarex_new'
     if s.match(ptrn) then
       @root_name, raw_summary, record_name, raw_fields = s.match(ptrn).captures 
       summary, fields = [raw_summary || '',raw_fields].map {|x| x.split(/,/).map &:strip}  
@@ -886,12 +856,13 @@ EOF
     end
 
     format_mask = fields ? fields.map {|x| "[!%s]" % x}.join(' ') : ''
-
+    #@log.debug 'dynarex_new: before @summary'
     @summary = Hash[summary.zip([''] * summary.length).flatten.each_slice(2)\
                     .map{|x1,x2| [x1.to_sym,x2]}]
     @summary.merge!({recordx_type: 'dynarex', format_mask: format_mask, schema: s})
     @records = {}
     @flat_records = {}
+    #@log.debug 'dynarex_new: before rebuild_doc'
     rebuild_doc
 
   end
@@ -901,13 +872,13 @@ EOF
   end
   
   def openx(s)
-
+    #@log.debug 'inside openx'
     if s[/</] then # xml
 
       buffer = s
               
     elsif s[/[\[\(]/] # schema
-
+      #@log.debug 'before dynarex_new'
       dynarex_new(s)
               
     elsif s[/^https?:\/\//] then  # url
@@ -919,7 +890,7 @@ EOF
       raise DynarexException, 'file not found: ' + s unless File.exists? s
       buffer = File.read s
     end
-
+    #@log.debug 'openx: before buffer'
     if buffer then
 
       raw_stylesheet = buffer.slice!(/<\?xml-stylesheet[^>]+>/)
@@ -927,8 +898,11 @@ EOF
       
       @doc = Rexle.new(buffer) unless @doc      
     end
-
+    
+    #@log.debug('dynarex: before lement summary')
+    return if @doc.root.nil?
     e = @doc.root.element('summary')
+    #@log.debug('dynarex: \after element summary')
     @schema = e.text('schema')
     @root_name = @doc.root.name
     @summary = summary_to_h
@@ -1046,6 +1020,63 @@ EOF
 
   end
 
+  def rowx(raw_lines)
+
+    self.summary[:rawdoc_type] = 'rowx'
+    raw_lines.shift
+
+    a3 = raw_lines.join.strip.split(/\n\n(?=\w+:)/)
+
+    # get the fields
+    a4 = a3.map{|x| x.scan(/^\w+(?=:)/)}.flatten(1).uniq
+    
+    abbrv_fields = a4.all? {|x| x.length == 1}
+    
+    a5 = a3.map do |xlines|
+    
+      missing_fields = a4 - xlines.scan(/^\w+(?=:)/)
+
+      r = xlines.split(/\n(\w+:.*)/m)
+      missing_fields.map!{|x| x + ":"}
+      key = (abbrv_fields ? @fields[0].to_s[0] : @fields.first.to_s) + ':'
+      
+      if missing_fields.include? key
+        r.unshift key
+        missing_fields.delete key
+      end
+      
+      r += missing_fields
+      r.join("\n")
+    
+    end
+
+    xml = RowX.new(a5.join("\n").strip, level: 0).to_xml
+    
+    a2 = Rexle.new(xml).root.xpath('item').inject([]) do |r,x|          
+
+      r << @fields.map do |field|
+        x.text(abbrv_fields ? field.to_s.chr : field.to_s )
+      end
+      
+    end
+
+    a2.compact!        
+      
+    # if there is no field value for the first field then 
+    #   the default_key is invalid. The default_key is changed to an ID.
+    if a2.detect {|x| x.first == ''} then
+      add_id(a2)
+    else
+
+      a3 = a2.map(&:first)
+      add_id(a2) if a3 != a3.uniq 
+      
+    end
+    
+    a2
+
+  end
+
   def sort_records
 xsl =<<XSL
 <?xml version="1.0" encoding="UTF-8"?>
@@ -1085,4 +1116,4 @@ XSL
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,47 +12,27 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDIyMzE4MzExNFoXDTE1MDIyMzE4MzExNFowSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDMwNTE0NTMzOVoXDTE2MDMwNDE0NTMzOVowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAJG9hQ6mEui3aEaUt51bfl607OibVzbmDNQdWG5+90uYe80l1LWxQBETrhF4
-  IzXxWAo1coYx3fn46g/QOPskbkQzKGNOpvrlSl8PfxcKLkZNwQC+iYXrtD20yVcy
-  iyhfNvvf+X8XHTh9vNQBkF8Br3M9DCIfWju8G3+5qPFXNtusoqyIq8BZ/5+Gl9nr
-  +PXPFCJ5g4ZNKcgEuERuIx0OxjwWIKBWcuKBY2iOHBsd85xdBYpLGFpLaFZmxbJZ
-  VCBXLd7wFjq19bWWuV3OdsCLAjapdtoscbXCCDPcJNDhORcesoLzqj5Q+56CCqM5
-  GHgOMgcQ5vzn0iM4IGe4oY1Zb30CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUOMvlbGQaJaZcBp4zMKGVvgk7pv0wJgYDVR0RBB8w
+  ggEBAMoGRaqVTEhnYLOeobX9k3wBUrD5t3iomr7yvv7IJ92pjkTsLHxIAt51K+yB
+  XHMuvSFoxjd/kh7G6P89DphWqJw+c6XRQRsTh27NE2SpHrqaTTSNLLCMs34nkdqK
+  sWp1Ixn6g9jOx4sj3mj+b1yNbg0zOpfsE05urczE1PY2qwYcT/K917hDgLr8VriZ
+  6AU6RVd5vO/b7GetV3NEA864eQ/D+lfnjADTDDBNmtBBd25EbVAle22WRhuC6PDr
+  FnXTIKrhmsFdooVaL1HPorjFrIDp/HoftmQJ0DgNvr7TNpIGM84DBvdvLI4LlcrK
+  547QRu+OrvBiaJS3pBdskGTH3J0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUwiMO3M7vHaf0BDqHsDqL8thD0UgwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhpWCyG+T
-  FT16lqwucs5l+BS6ylqyOzZ3ISPkJzwnhS1qbjlSV13fQbUDl9P6TNwp7PmucmU7
-  EYGIQvmADt6tgtBVrppMfi7J8B6qoQAeBpapGEAoRiLjsOsCPcC78ggnDtC8XEQP
-  0B2lzAWwhORMJbmX7TH06z3P0NT6u2T3YHTNQVIYlfQwPKSANAbEGTzktrck79UV
-  SQbwkRq8iiyhCbkkMm2wc8n+9xxnegdcfGespInbtFghC4EKgENN0kR4RfCS7nI9
-  SLshUY2PSjSnVYx3Gln9vzST8CSTQPZbVpDfzbTqqAZnzqhIe2UaLbzGCMoz8kbw
-  jQ7NXbu03ZrsvQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAA762tqY9
+  DQuf+Lp/PTnaRpWGckpS2c89o3MCzpBdj8CeTiZTesf3j/8481LwAIALAUnMQTZ9
+  cOdLECRKyiZ2wtvDUpDdOyfJ7uOAQ0owRzLzK/wC+fGwPNR6OKf1kObn/95ZavmP
+  VSLB69Ea910qZG1sLhdmdBtVfTVMausd25Yig065Kl7qTwc86Gu6Xja1PSsCVzoa
+  mf6ofYWjfavicrL3n3nJeYCeQF8W96P3VPKEq/OZNN/nrtrcOJOF/JKMimWKtdDC
+  zafTuKRozNy5wCw7Z32VaDGcJ+yTPq73CrcPrNyaoxqGfU0qNsh6oGvwrq4Q1k4j
+  Pz2GWE7KigXTBg==
   -----END CERTIFICATE-----
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rexle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: dynarex-import
   requirement: !ruby/object:Gem::Requirement
@@ -73,26 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
-- !ruby/object:Gem::Dependency
-  name: line-tree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +122,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,7 +132,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
@@ -199,20 +159,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -259,20 +219,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.2.1
 description: 
 email: james@r0bertson.co.uk
 executables: []