dynarex 1.8.21 → 1.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11494dcd4a9ab4d54cb9413b0d51f6fd79c745aa79200ceac3384ef18c346bad
-  data.tar.gz: 11eb76e28e08ccada73cd4f121f313125de5fa88cfe408015119dcdad421f3cb
+  metadata.gz: e53d646e16a9dc5418563c918079a755131d13bcbb8a9f09378a83641e8e263f
+  data.tar.gz: edfd2bced3fec3b31f4ecffff0ec6b01b8c0605633e19ece62f3832e0cef014c
 SHA512:
-  metadata.gz: 0eff1b42cf89f8e8843caf76be2d4ab7c0ab0956adaf8343df84e9d74d263f91ead5bc134ee66580dc7900d92b8d161c80295e7d9e98eef7018b4b6e452a8ca2
-  data.tar.gz: 8d503eeda7dc6b0ced20f553e532deb18551270088b6f83c4eb8e431ef8032209b8afd17066355a0102a242553c9d79d7d1ebe13c87b5e137bde56dd8a98e8c0
+  metadata.gz: 291eaa36c95e263c1233bd27aae70893bf759738f16872c93da104a015c0b0557694c828aaa67e8b439d8324c5b3fcb76568b7671faa839f4006a8b38066a86b
+  data.tar.gz: 4f96e7fc8a576515f6261c2a7dfc4044ad64b0009cf4e92d1a6e5001ba512ce0b0c119076e2e7080d4e0789f2405168443ba290a72b41901d3b649631448780c

data/lib/dynarex.rb

@@ -90,13 +90,14 @@ class Dynarex
   def initialize(rawx=nil, username: nil, password: nil, schema: nil, 
               default_key: nil, json_out: true, debug: false, 
                  delimiter: ' # ', autosave: false, order: 'ascending', 
-                 unique: false)
+                 unique: false, filepath: nil)
 
 
     puts 'inside Dynarex::initialize' if debug
     @username, @password, @schema, @default_key, @json_out, @debug = \
     username,  password, schema, default_key, json_out, debug
     @autosave, @unique = autosave, unique
+    @local_filepath = filepath
     
     puts ('@debug: ' + @debug.inspect).debug if debug
     @delimiter = delimiter
@@ -124,8 +125,11 @@ class Dynarex
   end
 
   def all()
+    
+    refresh! if @dirty_flag
     a = @doc.root.xpath("records/*").map {|x| recordx_to_record x}
     DynarexRecordset.new(a, self)
+    
   end
   
   def clone()
@@ -325,13 +329,28 @@ class Dynarex
 
   end      
   
-  def to_json(pretty: false)
+  
+  # to_json: pretty is set to true because although the file size is larger, 
+  # the file can be load slightly quicker
+  
+  def to_json(pretty: true)
     
     records = self.to_a
     summary = self.summary.to_h
-
-    h = {summary: summary, records: records}
+            
+    root_name = schema()[/^\w+/]
+    record_name = schema()[/(?<=\/)[^\(]+/]
+    
+    h = {
+      root_name.to_sym =>
+      {
+        summary: @summary,
+        records: @records.map {|_, h| {record_name.to_sym => h} }        
+      }
+    }
+    
     pretty ? JSON.pretty_generate(h) : h.to_json
+       
   end
   
   def to_s(header: true, delimiter: @delimiter)
@@ -397,6 +416,7 @@ EOF
       if @debug then
         File.write '/tmp/foo.xsl', xsl_buffer
         File.write '/tmp/foo.xml', @doc.xml
+        puts 'xsl_buffer: ' + xsl_buffer.inspect
       end
       
       out = Rexslt.new(xsl_buffer, @doc).to_s
@@ -413,6 +433,7 @@ EOF
       xslt_format = a.join      
 
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
+      puts 'xsl_buffer: ' + xsl_buffer.inspect if @debug
 
       out = Rexslt.new(xsl_buffer, @doc).to_s
       
@@ -474,6 +495,8 @@ EOF
 
     end
     
+    return unless filepath
+    
     opt = {pretty: true}.merge options
 
     @local_filepath = filepath || 'dx.xml'
@@ -653,6 +676,10 @@ EOF
     @dirty_flag = true
   end
   
+  def refresh!()
+    (load_records; rebuild_doc) if @dirty_flag == true    
+  end
+  
   # used internally by to_rss()
   #
   def rss_xslt(opt={})
@@ -718,17 +745,16 @@ EOF
       item.delete
       
       pubdate = @xslt_schema[/pubDate:/]
-      xslif = Rexle.new("<xsl:if test='position() &lt; #{h[:limit]}'/>").root
+      xslif = Rexle.new("<xsl:if test='position() < #{h[:limit]}'/>").root
       
       
-
       if pubdate.nil? then
         pubdate2 = Rexle.new("<pubDate><xsl:value-of select='pubDate'></xsl:value-of></pubDate>").root
         new_item.add pubdate2      
       end
 
       xslif.add new_item      
-      e2.add xslif.root
+      e2.add xslif
       xslt = doc.xml      
 
       xslt
@@ -822,7 +848,7 @@ EOF
 
     puts 'inside hash_create' if @debug
     record = make_record(raw_params, id, attr: attr)
-    puts 'record: '  + record.inspect
+    puts 'record: '  + record.inspect if @debug
     method_name = @order == 'ascending' ? :add : :prepend
     @doc.root.element('records').method(method_name).call record
 
@@ -1059,7 +1085,7 @@ EOF
        
     raw_lines.shift while raw_lines.first.strip.empty?
 
-    lines = case raw_lines.first.chomp
+    lines = case raw_lines.first.rstrip
 
       when '---'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.8.21
+  version: 1.8.26
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   3m/dAMW7lgXujFuiEWdIWXXpu+uf7b2FKdTmZ1gzaYUi8H0j0VraXT1jhzQYZH/1
   zCi9HdW7AMP5hS692rfwJuEY
   -----END CERTIFICATE-----
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -61,42 +61,42 @@ dependencies:
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: dynarex-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
@@ -203,20 +203,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.1
   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.1
+        version: 0.9.1
 description: 
 email: james@jamesrobertson.eu
 executables: []