dynarex 1.5.15 → 1.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463d045750a1cfed97c0e92bfd4552d5486f5b85
-  data.tar.gz: 30a19a3104987b594d032115f2419bee01874820
+  metadata.gz: 83aa5387c01f6875e9fcd0a870cf6e287a9e6a14
+  data.tar.gz: ce3cd13b74385b8a678125a532d375a143b30f90
 SHA512:
-  metadata.gz: d247077cb0ba9eb0855cbcc04943b8ff8c968191fd459b6a87cb3503948e6613f7e39d356c84248dc896b66762ffb0ad01952194820acee720b2b30958877b5f
-  data.tar.gz: 9031121ea34ad8eb0d749bc9a870cd765df20c0ce292bd5f73d47c0b0870030ac208cfc63f1b8a4e3a4fc90787277774e1f8c6a0eba9d5cac209de50ffa239b6
+  metadata.gz: 85a0837a4109ae4455541c075d835a653fed933e0591290b380e977a00b5b6dd8a3160defb3efdd05292431e5a51fd54c8ba8bfd49184f97853dc0b76c0497a4
+  data.tar.gz: 0e5b784a2e0e4873af2b4fefccbea07e8b5c81a9d42220b2747a2fe3f9def745926018f98077d99d08c4b73ebc323b881fcef33cd659b0b9293119c2dfab852a

data/lib/dynarex.rb

@@ -473,17 +473,13 @@ 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
@@ -663,7 +659,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, "--- ")
@@ -672,37 +668,31 @@ 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
@@ -865,8 +855,11 @@ EOF
     s.gsub('&lt;', '<').gsub('&gt;','>')
   end
 
-  def dynarex_new(s)
+  def dynarex_new(s, default_key: nil)
+    
     @schema = s
+    @default_key = default_key if default_key
+    
     ptrn = %r((\w+)\[?([^\]]+)?\]?\/(\w+)\(([^\)]+)\))
     #@log.debug 'inside dynarex_new'
     if s.match(ptrn) then
@@ -901,13 +894,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
@@ -918,12 +911,12 @@ EOF
       if File.exists? s then 
         buffer = File.read s
       elsif @opt[:schema]
-        dynarex_new @opt[:schema]
+        dynarex_new @opt[:schema], default_key: @opt[:default_key]
       else
         raise DynarexException, 'file not found: ' + s
       end
     end
-    #@log.debug 'openx: before buffer'
+
     if buffer then
 
       raw_stylesheet = buffer.slice!(/<\?xml-stylesheet[^>]+>/)
@@ -932,10 +925,9 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.16
 platform: ruby
 authors:
 - James Robertson