dxlite 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6638bca4c2fef3679ec9d456318f51b51eeeb49230afadbd1baa8af4308620ca
-  data.tar.gz: 1fcaedf6a4692a244e5930ed1d8ec10e7784b5003958faafb45b8e32cdaa707a
+  metadata.gz: 52a6f519b3142ed9207a881bf65f9df9afceed0bc0eccdb258aa46b61988f20e
+  data.tar.gz: 1df9a6b682dc8a05fea3d88152c2d8fdb6042cc75aa246731fa69374568bacfd
 SHA512:
-  metadata.gz: 54a8938acfd2116234f3a750c9e007adae6e2bc7cb894379702aebe2730b8a601c88f178a490f4b260275e5682c211efee2c5c9da57b9fa645f5146b66a5c7d9
-  data.tar.gz: ec2fde50afa20bbea953fc3ffb503ae07f160580248ecde88e99f1c272f64404cf6bea099c75e4286f411f3c83df27516df39394c27e78d3bc1846e2fce2b88d
+  metadata.gz: 641a55501dcada49b36db49c38cbbaf66d94283b9c96f5572a7cfce098b651e899d0d3cdede7561cd2b0ce53b42f3a0b1c97518e39cf12ed75b0ca4ead920cef
+  data.tar.gz: 1b5abceae389e71fd4f813e6cc841abf212eab8db0a56800dc1f627452b454593cf4b86ced042b8ce14a33c6ae34908f3ef90b968f39979fb268cf1feb2781f0

data/lib/dxlite.rb

@@ -11,15 +11,18 @@ require 'rxfhelper'
 class DxLite
   using ColouredText
 
-  attr_accessor :summary
+  attr_accessor :summary, :filepath, :schema
   attr_reader :records
 
-  def initialize(s=nil, filepath: nil, debug: false)
+  def initialize(s=nil, autosave: false, debug: false)
 
-    @filepath, @debug = filepath, debug
+    @autosave, @debug = autosave, debug
 
     return unless s
     buffer, type = RXFHelper.read(s)
+    
+    @filepath = s if type == :file or type == :dfs
+      
     puts 'type: ' + type.inspect if @debug
     puts 'buffer: ' + buffer.inspect if @debug
 
@@ -80,16 +83,42 @@ class DxLite
   
   def delete(id)
     found = @records.find {|x| x[:id] == id}
-    @records.delete found if found
+    
+    if found then
+      @records.delete found 
+      save() if @autosave
+    end
+    
   end
   
   def create(rawh, id: nil, custom_attributes: {created: Time.now})
+
+    if id.nil? then
+      
+      puts '@records: ' + @records.inspect if @debug
+      
+      if @records then
+        id = @records.map {|x| x[:id].to_i}.max.to_i + 1
+      else
+        @records = []
+        id = 1
+      end
+      
+    end
     
-    id ||= @records.map {|x| x[:id].to_i}.max.to_i + 1
     h2 = custom_attributes
-    h = fields.map {|x| [x.to_sym, nil] }.to_h.merge(rawh)
-    @records << {id: id.to_s, created: h2[:created], last_modified: nil, 
-                 body: h}
+    
+    fields = rawh.keys    
+    puts 'fields: ' + fields.inspect if @debug    
+
+    h3 = fields.map {|x| [x.to_sym, nil] }.to_h.merge(rawh)
+    h = {id: id.to_s, created: h2[:created], last_modified: nil, body: h3}
+    @records << h
+    
+    save() if @autosave
+    
+    RecordX.new(h[:body], self, h[:id], h[:created], h[:last_modified])
+    
   end
   
   def fields()
@@ -108,7 +137,9 @@ class DxLite
     if obj.is_a? Array then
       
       unless schema() then
+        puts 'obj.first: ' + obj.first.inspect if @debug
         cols = obj.first.keys.map {|c| c == 'id' ? 'uid' : c} 
+        puts 'after cols' if @debug
         self.schema = "items/item(%s)" % cols.join(', ')
       end
         
@@ -155,6 +186,10 @@ class DxLite
   end
 
   def save(file=@filepath)
+    
+    return unless file
+    @filepath = file
+    
     s = File.extname(file) == '.json' ? to_json() : to_xml()
     File.write file, s
   end
@@ -222,13 +257,20 @@ class DxLite
     end
     
     r = @records.find {|x| x[:id] == id}
-    r[:body].merge!(obj)
+    
+    if r then
+      
+      r[:body].merge!(obj)
+      save() if @autosave
+      
+    end
+    
   end
   
   private
   
   def find_record(rec, value, x)
-    value.is_a?(Regexp) ? rec[x.to_sym] =~ value : rec[x.to_sym] == value    
+    r = value.is_a?(Regexp) ? rec[x.to_sym] =~ value : rec[x.to_sym] == value    
   end
   
   def make_methods()
@@ -251,13 +293,20 @@ class DxLite
 
       define_singleton_method ('find_all_by_' + x).to_sym do |value|
         
-        @records.select {|rec| find_record(rec[:body], value, x) }
+        a = @records.select {|rec| find_record(rec[:body], value, x) }
+        
+        a.map do |h|
+          RecordX.new(h[:body], self, h[:id], h[:created], h[:last_modified])
+        end
         
       end
 
       define_singleton_method ('find_by_' + x).to_sym do |value|
         
-        @records.find {|rec| find_record(rec[:body], value, x) }
+        h = @records.find {|rec| find_record(rec[:body], value, x) }
+        return nil unless h
+        
+        RecordX.new(h[:body], self, h[:id], h[:created], h[:last_modified]) 
         
       end
 
@@ -277,9 +326,20 @@ class DxLite
       #puts 'h1:' + h1.inspect if @debug
       
       h = h1[h1.keys.first]
-    
-     @summary = h[:summary]
-     @records = h[:records].map {|x| x[x.keys.first]}
+          
+      @summary = {}
+      
+      h[:summary].each do |key, value|
+        
+        if %i(recordx_type format_mask schema).include? key then
+          @summary[key] = value
+        else        
+          @summary[key.to_s] = value
+        end
+        
+      end
+      
+      @records = h[:records].map {|x| x[x.keys.first]}
      
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   dwbAN6/wokoLVZAiMRG1vZlI6RhtSOTHvFHbfBE5JI9rhjRtui8yeV+t8iI8G4Zs
   2NszuYzdlVfzlrUiPWY5jL9P
   -----END CERTIFICATE-----
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: recordx