dynarex 1.8.22 → 1.8.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0154b77227c491f54d90c35a1d598d35ec9abb111a86cca1a55db3b893d9cfc5
-  data.tar.gz: e0eb1e28361308b5e8a37013160420ef0ae6d8bd61ca155a469382eb921e8041
+  metadata.gz: d331676a235d9cb8422a3855be3803bbf3203ac0f87238efe44c7adf2d541dc4
+  data.tar.gz: 306dfe9c3667fdf27db9e9ac7d410ef1fe25148fe79dd278543109264823112c
 SHA512:
-  metadata.gz: fd313c5eb9a96c34b55ab33b9d372a19bed20fb3b8b12b05ff0a702145e5d7101285e0894251829f55c6cc7d5764a00bbbbadd4ffb7e999fa9db45569a1edbc1
-  data.tar.gz: 68b37852644dbeec04772e158ab6fe8e9316b870e7d954d07493f7e79b7a68684e8d15392c4b985d90d307dc28b8ea0882e50e4cd123b2a94e3c8c5de5214e23
+  metadata.gz: 3577e9e6067e4fef09f1c31654212a5ce47c3af65dafd9e1e10d887c190ff4ed253ae8859980ea3cfc273a57664da7aa6d58bfbb6b94f996c5efd2fb17a208f0
+  data.tar.gz: 81d4c396ba22264bc517117a6cfc3011a185c26e733f63f25ea42e0b28dc9177ea2788b5bd01282c8bff7e0556a8f9b6f2094b11c326eedad81b5357d65f5571

data/lib/dynarex.rb

@@ -125,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()
@@ -326,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)
@@ -477,6 +495,8 @@ EOF
 
     end
     
+    return unless filepath
+    
     opt = {pretty: true}.merge options
 
     @local_filepath = filepath || 'dx.xml'
@@ -656,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={})
@@ -724,14 +748,13 @@ EOF
       xslif = Rexle.new("<xsl:if test='position() &lt; #{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
@@ -750,9 +773,9 @@ EOF
     end
 
     puts ('doc: ' + doc.root.xml) if @debug
-    #File.write '/tmp/blog.xml', doc.root.xml
+    File.write '/tmp/blog.xml', doc.root.xml
     puts ('xslt:'  + xslt.inspect) if @debug
-    #File.write '/tmp/blog.xslt', xslt
+    File.write '/tmp/blog.xslt', xslt
     
     out = Rexslt.new(xslt, doc).to_s(declaration: false)
 
@@ -825,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.8.22
+  version: 1.8.27
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   3m/dAMW7lgXujFuiEWdIWXXpu+uf7b2FKdTmZ1gzaYUi8H0j0VraXT1jhzQYZH/1
   zCi9HdW7AMP5hS692rfwJuEY
   -----END CERTIFICATE-----
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-07-22 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: []