dynarex-daily 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298993b50800fc403aeb22df85ec8d1274f55ffce9192eafd7114cb868ea9d0e
-  data.tar.gz: e1363575685faba891e1730f113a09a314d3dee9d032f744849366ad4724833b
+  metadata.gz: 3e5f46eeebb7b92758dc6bd8690ef5ac0117abf18b8d79b8c6c342c724fa384a
+  data.tar.gz: a359ed5ceb7684d678d1b6b0dcdcef68f70498c1e79a9fd3c27c68306c27f80a
 SHA512:
-  metadata.gz: 17e5133b4dee869ea5a68d7decc7affac4880bb18eb5a1acda1687bd43b9442e4239e441d13e3914f6eae768a5760f6e388f5c9a51dc580f999faa514b71dba7
-  data.tar.gz: 424ee27e16edee68b20dc9812753d49b045c81f2602bd46c65276fa83326070fed13d95af3fc516e65521e779735363e719254d7becad8bce7dee366c7ec9aa3
+  metadata.gz: 8b7c623a33a4fd818f0b1bf47f86c42f8972f89123480a7199a22e243ca70c65cd426ecd6d719ccdbc0e1cd6153004acbe3e389411d34e5c8f42bab4931c9bbc
+  data.tar.gz: bf79901a76421f628c1807a3fdde16b5278d67ce5402b602bf75fc4b115085887efb6a0725d5228c63b3844b316975d743cf1ce1c32ce6a2368c0e647d5ce39b

data/lib/dynarex-daily.rb

@@ -6,82 +6,88 @@ require 'dynarex'
 require 'rxfileio'
 
 
-class DynarexDaily < Dynarex
+class DynarexDaily < Dynarex  
   include RXFileIOModule
-
-  def initialize(stringx=nil, dir_archive: :days, xslt: '',
-                 filename: 'dynarexdaily.xml', debug: false)
-
+ 
+  def initialize(stringx=nil, dir_archive: :days, xslt: '', 
+                 filename: 'dynarexdaily.xml', fields: %i(desc), 
+                 autosave: false, order: 'ascending', debug: false)
+    
     @dir_archive = dir_archive
 
     @filename = filename
-    @schema = 'entries[date]/entry(time, desc)'
+    @schema = 'entries[date]/entry(time, ' + fields.join(', ') + ')'
     @default_key = 'uid'
     @debug = debug
 
     puts 'DynarexDaily::initialize stringx: ' + stringx.inspect  if @debug
-
+    
     if stringx then
       s, type = RXFReader.read(stringx)
       @filename = stringx if type == :file or type == :dfs
     end
-
+    
     puts 'DynarexDaily::initialize @filename: ' + @filename.inspect  if @debug
-
-    if FileX.exists?(@filename) then
-
+    
+    if FileX.exist?(@filename) then
+      
+      puts 'file exists!' if @debug
       super @filename, debug: debug
-
+      
       if !summary[:date].empty? and \
           Date.parse(summary[:date]) != Date.today then
-
+        
         archive_file Date.parse(summary[:date])
         create_file
-      end
-
+      end  
+      
     else
       puts 'before super: stringx: ' + stringx.inspect if @debug
-      super( stringx || @schema , debug: debug)
+      super( stringx || @schema , order: order, debug: debug)
       puts 'after super' if @debug
-      @delimiter = ' # '
+      @delimiter = ' # '      
       create_file
     end
+                                                        
+    @autosave = autosave
 
     self.xslt = xslt if xslt
   end
 
   def create(h)
+    
+    puts 'Date.today: ' + Date.today.inspect if @debug
 
     if !summary[:date].empty? and \
         Date.parse(summary[:date]) != Date.today then
-
+      
       archive_file Date.parse(summary[:date])
       create_file
-    end
-
-    super(h)
+    end      
+    
+    super({time: Time.now.to_f.to_s}.merge(h))
   end
-
-
+    
+  
   def save(filename=@filename, options={})
 
     puts 'inside DynarexDaily::save() filename: ' + filename.inspect if @debug
     super(filename, options)
 
   end
-
+  
   def schema=(s)
     super(s.sub(/^\w+(?=\/)/,'\0[date]'))
     summary[:date] = Date.today.to_s
-    summary[:order] = 'descending'
+    summary[:order] = 'descending'    
   end
 
   private
-
+  
   def create_file()
-
-    puts 'inside DynarexDaily::create_file' if @debug
-
+    
+    puts 'inside DynarexDaily::create_file' if @debug   
+    
     openx(@schema)
     summary[:date] = Date.today.to_s
     summary[:order] = 'descending'
@@ -91,26 +97,29 @@ class DynarexDaily < Dynarex
 
   def archive_file(t)
 
-    puts 'inside DynarexDaily::archive_file' if @debug
-
+    puts 'inside DynarexDaily::archive_file' if @debug   
+    
     dir, file = if @dir_archive == :days then
+      puts 'days archive' if @debug
       ['days', t.strftime("d%d%m%y.xml")]
     else
+      puts 'other archive' if @debug
       [t.strftime("%Y/%b/%d").downcase, 'index.xml']
     end
 
+    puts 'about to mkdir ' + dir.inspect if @debug
     FileX.mkdir_p dir unless FileX.exist? dir
-
+    
     if @debug then
       puts 'inside DynarexDaily::archive_file '
       puts '  @filename: %s' % [@filename]
       puts '  dir: %s; file: %s' % [dir, file]
       puts '  FileX: %s' % [dir, FileX.pwd]
     end
-
+    
     FileX.mv(@filename, "%s/%s" % [dir, file])
     puts 'inside DynarexDaily::archive_file after FileX.mv' if @debug
-
+    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex-daily
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   E/GgkjQ28u/f6qcQgMPVvPiO6Ku2M2Zp4D5AL6Pb4ipSACsLEZZHMWo/CJBLOQ7f
   KYgoP6fr0Bkw0gyMZIHEwNMH
   -----END CERTIFICATE-----
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: 1.10.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: A Dynarex flavoured log file for humans which is archived daily