dynarex-daily 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59be52b7780b87131cd48a8f44e5578630430b04426bf1dae6e8ed61c36c7288
-  data.tar.gz: 0a567c0a7f3f370ac3fe82dd4df9d9cd6aab9cb0a40b2e93915c360710c6dc2a
+  metadata.gz: 00f7ad05f669c0844f8593b020b7b6365dde43ed38d92a9ef7b7da91c3f8829a
+  data.tar.gz: 415a516bce9564a6c91db463522c26485b48c26373fb2788ec282fa437968d03
 SHA512:
-  metadata.gz: b5d2c19a2b5212539666d5f9529f908224fca93d76f96a4761e9279d0113c6169344dea9aeb540787d9d86011ad4069fc47c45c10fc16e3afe41cce6ccd5de51
-  data.tar.gz: a4551e2a227ab58effd6c3b69e0ef2bbc4cc4462556fb18cff42e1fc06475e8fea9b31e62af7cf391022cd605b7527d4d4d12c64cb218b0cbed484fcf6519fd7
+  metadata.gz: 84fe28c1d077a3633140d2f4b1660cbf77a648f93ef175d13e6651e937bdea52bfa1fe112788242bd2788e6454379042a07268e20d2d74af30ec4971c7844427
+  data.tar.gz: 57a59988df1d7bb38a666cb9583d153acdaa8a256a3733e6d6d0fed71dd7ff662427876c7479de8af1b1a762c7df0a398ace76bb602cfaf8c1eb0ae0b8596ef2

data/lib/dynarex-daily.rb

@@ -6,12 +6,12 @@ require 'dynarex'
 require 'rxfileio'
 
 
-class DynarexDaily < Dynarex
+class DynarexDaily < Dynarex  
   include RXFileIOModule
-
-  def initialize(stringx=nil, dir_archive: :days, xslt: '',
+ 
+  def initialize(stringx=nil, dir_archive: :days, xslt: '', 
                  filename: 'dynarexdaily.xml', debug: false)
-
+    
     @dir_archive = dir_archive
 
     @filename = filename
@@ -20,30 +20,31 @@ class DynarexDaily < Dynarex
     @debug = debug
 
     puts 'DynarexDaily::initialize stringx: ' + stringx.inspect  if @debug
-
+    
     if stringx then
-      s, type = RXFHelper.read(stringx)
+      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)
       puts 'after super' if @debug
-      @delimiter = ' # '
+      @delimiter = ' # '      
       create_file
     end
 
@@ -51,37 +52,39 @@ class DynarexDaily < Dynarex
   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
-
+    end      
+    
     super(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 +94,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.0
+  version: 0.6.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-01-30 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