dxlite 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07aaa0e99b004c084971d3d47bec08bd7dc4b2b00ed1744516c8a936d3a770d
-  data.tar.gz: 1354917117fe1e45a811e1e609980dbd83638a04a3cd940d5c88d80a2513b5bd
+  metadata.gz: a826f1bbdc7b1560d8a66ff303a87a1cf3a789cf0281b1aa8130ce0cdaf4893e
+  data.tar.gz: e4e5401e812f9b69def5f87f6cd2178292c7fb58d604bf6a091da1a8d634ea64
 SHA512:
-  metadata.gz: 1d32f0315a748d91738e7650c4f9636535563732feb283805d3ed0ec45e4ff9efcba278315ae9c276afbc7cb6b19d847df17db99622198715363f6324a4c0337
-  data.tar.gz: '07339c65f3bcc16f9ba435981a0f32d71348778cfdd3f2bcc6e117c51b9988d5773f0e1a4457998b57225bc52c3cd8450849996c9427f8196a5f3d55862889c8'
+  metadata.gz: fc84a8ef5723964235e215ceaad244725dc882917a4475da3b5f8ca702aacf375b0d8bd8536fe297580a5a8be321367867332a3aff2839636ccb0113beaf8cba
+  data.tar.gz: 21daf4162a732639f0b8c5c0b41f9e09edf552db9a55aa632a8c0f082273074b54b2a588bab166804fc9079452340a0956baf98a790abaa1214553e85b16eeb5

data/lib/dxlite.rb

@@ -11,7 +11,7 @@ require 'rxfhelper'
 class DxLite
   using ColouredText
 
-  attr_accessor :summary, :filepath
+  attr_accessor :summary, :filepath, :schema
   attr_reader :records
 
   def initialize(s=nil, autosave: false, debug: false)
@@ -20,34 +20,38 @@ class DxLite
 
     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
 
     @records = []
-          
+
     case type
-      
+
+    when :dfs
+
+      read buffer
+
     when :file
-      
+
       read buffer
-      
+
     when :text
-      
+
       @summary = {schema: s}
 
-      
+
     when :url
-      
-      read buffer      
-      
+
+      read buffer
+
     end
-    
-    puts '@summary: ' + @summary.inspect
+
+    puts '@summary: ' + @summary.inspect if @debug
     @schema = @summary[:schema]
-    
+
     summary_attributes = {
       recordx_type: 'dynarex',
       default_key: @schema[/(?<=\()\w+/]
@@ -57,131 +61,169 @@ class DxLite
     @summary.merge!(summary_attributes)
 
     summary = @summary[:schema][/(?<=\[)[^\]]+/]
-    
+
     if summary then
 
       summary.split(/ *, */).each do |x|
         @summary[x] = nil unless @summary[x]
       end
-      
-    end    
-    
-    make_methods()    
 
-  end  
+    end
+
+    make_methods()
+
+  end
 
   def all()
 
     @records.map do |h|
-      
+
       puts 'h: ' + h.inspect if @debug
-      RecordX.new(h[:body], self, h[:id], h[:created], 
+      RecordX.new(h[:body], self, h[:id], h[:created],
                   h[:last_modified])
     end
 
-  end  
-  
+  end
+
   def delete(id)
     found = @records.find {|x| x[:id] == id}
-    
+
     if found then
-      @records.delete found 
+      @records.delete found
       save() if @autosave
     end
-    
+
   end
-  
+
   def create(rawh, id: nil, custom_attributes: {created: Time.now})
-    
-    id ||= @records.map {|x| x[:id].to_i}.max.to_i + 1
+
+    if @debug then
+      puts 'create:: rawh: ' + rawh.inspect
+      puts 'custom_attributes: ' + custom_attributes.inspect
+    end
+
+    key = @summary[:default_key]
+
+    if key then
+
+      r = records.find {|x| x[:body][key.to_sym] == rawh[key.to_sym]}
+      if r then
+        r[:last_modified] = Time.now.to_s
+        return false
+      end
+
+    end
+
+    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
+
     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()
     @fields
   end
-  
+
   def inspect()
-    "#<DxLite:%s @debug=%s, @summary=%s, ...>" % [object_id, @debug, 
+    "#<DxLite:%s @debug=%s, @summary=%s, ...>" % [object_id, @debug,
                                                   @summary.inspect]
   end
-  
+
   # Parses 1 or more lines of text to create or update existing records.
 
   def parse(obj=nil)
-    
+
     if obj.is_a? Array then
-      
+
       unless schema() then
-        cols = obj.first.keys.map {|c| c == 'id' ? 'uid' : c} 
+        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
-        
+
       obj.each do |x|
         #puts 'x: ' + x.inspect if @debug
         self.create x, id: nil
       end
-      
-      return self 
-      
-    end  
+
+      return self
+
+    end
   end
-  
+
   alias import parse
-  
+
   def parse_xml(buffer)
-    
+
     doc = Rexle.new(buffer)
-    
+
     asummary = doc.root.xpath('summary/*').map do |node|
       puts 'node: '  + node.xml.inspect if @debug
       [node.name, node.text.to_s]
     end
-    
+
     summary = Hash[asummary]
     summary[:schema] = summary['schema']
     %w(recordx_type format_mask schema).each {|x| summary.delete x}
-    
+
     schema = summary[:schema]
     puts 'schema: ' + schema.inspect if @debug
-    
+
     @fields = schema[/\(([^\)]+)/,1].split(/ *, +/)
     puts 'fields: ' + @fields.inspect if @debug
-    
+
+    @summary = summary
+
     a = doc.root.xpath('records/*').each do |node|
-      
+
       h = Hash[@fields.map {|field| [field.to_sym, node.text(field).to_s] }]
-      self.create h, id: nil
-      
+      self.create h, id: nil, custom_attributes: node.attributes
+
     end
 
-    @summary = summary
-    
   end
 
   def save(file=@filepath)
-    
+
     return unless file
     @filepath = file
-    
+
     s = File.extname(file) == '.json' ? to_json() : to_xml()
     File.write file, s
   end
-  
+
   def to_a()
     @records.map {|x| x[:body]}
   end
-  
+
   def to_h()
-    
+
     root_name = schema()[/^\w+/]
     record_name = schema()[/(?<=\/)[^\(]+/]
-    
+
     h = {
       root_name.to_sym =>
       {
@@ -189,137 +231,139 @@ class DxLite
         records: @records.map {|h| {record_name.to_sym => h} }
       }
     }
-    
+
   end
-  
+
   def to_json(pretty: true)
     pretty ? JSON.pretty_generate(to_h()) : to_h()
   end
-  
+
   def to_xml()
-    
+
     root_name = schema()[/^\w+/]
     record_name = schema()[/(?<=\/)[^\(]+/]
-    
+
     a = RexleBuilder.build  do |xml|
-      
+
       xml.send(root_name.to_sym) do
         xml.summary({}, @summary)
         xml.records do
-          
+
           all().each do |x|
-            
-            h = {id: x.id, created: x.created, last_modified: x.last_modified}          
+
+            h = {id: x.id, created: x.created, last_modified: x.last_modified}
             puts 'x.to_h: ' + x.to_h.inspect if @debug
             xml.send(record_name.to_sym, h, x.to_h)
-            
+
           end
-          
+
         end
       end
     end
 
-    Rexle.new(a).xml pretty: true    
-        
-    
+    Rexle.new(a).xml pretty: true
+
+
   end
-  
+
   # Updates a record from an id and a hash containing field name and field value.
-  #  dynarex.update 4, name: Jeff, age: 38  
-  
+  #  dynarex.update 4, name: Jeff, age: 38
+
   def update(id, obj)
-    
+
     if @debug then
       puts 'inside update'.info
       puts ('id: ' + id.inspect).debug
       puts ('obj.class: '  + obj.class.inspect).debug
     end
-    
+
     r = @records.find {|x| x[:id] == id}
-    
+
     if r then
-      
+
       r[:body].merge!(obj)
       save() if @autosave
-      
+
     end
-    
+
   end
-  
+
   private
-  
+
   def find_record(rec, value, x)
-    r = 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()
-    
+
     # for each summary item create get and set methods
-    
+
     @summary.each do |key, value|
-      
+
       define_singleton_method(key) { @summary[key] }
-      
+
       define_singleton_method (key.to_s + '=').to_sym do |value|
         @summary[key] = value
-      end      
-      
+      end
+
     end
-    
+
     @fields = @summary[:schema][/(?<=\()[^\)]+/].split(',').map(&:strip)
 
     @fields.each do |x|
 
       define_singleton_method ('find_all_by_' + x).to_sym do |value|
-        
+
         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|
-        
+
         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
 
     end
-    
+
   end
-  
+
   def read(buffer)
-    
+
     if buffer[0] == '<' then
-    
+
       parse_xml buffer
-      
+
     else
-      
+
       h1 = JSON.parse(buffer, symbolize_names: true)
-      #puts 'h1:' + h1.inspect if @debug
-      
+      puts 'h1:' + h1.inspect if @debug
+
       h = h1[h1.keys.first]
-          
+
       @summary = {}
-      
+
       h[:summary].each do |key, value|
-        
+
         if %i(recordx_type format_mask schema).include? key then
           @summary[key] = value
-        else        
+        else
           @summary[key.to_s] = value
         end
-        
+
       end
-      
+
       @records = h[:records].map {|x| x[x.keys.first]}
-     
+
     end
-  
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjIwMDk1OTIyWhcN
-  MjEwNjIwMDk1OTIyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCcnuff
-  5MVmDII05CloWme8XkTcCkGTFTCGqacPAa5803163oHfU0CovEbdSR8KNVXQ0mVz
-  ZkE1kEi/xlAbZHKZTgJNjzXKcTfW0zNI/1l9Jyz59fjOUgO26oWgEJX1iJBUkzAx
-  1jHBvCGvAgKi1gmPovfrnPkXJ4e39Kklay4mrsfRO1qAkyfoUCn8TOc4/xVyB9UV
-  zpSfryHT41gM3vUyVyfkLsC8St6oI2j6R45YJIL2Hz1UBZsFk8ICn8MKL84b+nyX
-  YiW3BoOhB5x4M+tORhMqIYwSW///P3ztFVuZCoZsZm7KDlmZ5Q+kbtg2O6WJqOeX
-  2CLAag6UYpWUJd9SBDOOLvNAzdzKHOlD/tJQnHrLTJzNSQQZcCLa7xjAob2vooFi
-  zO7nNoPnRb7MFAdnjEgIPra6GZ6BxSzeWKmkXX6vFCs8Uy8N0ijHyWg4NKDlgHzl
-  VCS9RW6U/gIhciP3kabmxcu2R67I79UDJU4tf8fYN+7tZLfU7g5S0QLQfrsCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUDodJj5qi
-  akKU2hOApwE0BzK8lGswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMjE0MTkxMzA1WhcN
+  MjIxMjE0MTkxMzA1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDr8u3b
+  GnmbKxnrbY0y31GqwbhURpvc6bArdtA+PLcVgPHAVPUbPxoriPsyUQKcnXD/Ema+
+  QYUqHzph0SxI2PYrFdskTIVKQwXdUFGy6eYSW3CHvsXV4e5gg+zmSoW93tm2sd+w
+  7lxgkkxri7KhguwmXpWsTHCfMBHyBXxP/2E2IGaEuyATjUposENy9Mfe7BKDMMAf
+  e3k7o6AJx16OmLRKAch0BkEYd0M9TqdYSYjcvKbX/BxSwm3zfz+T0erG56h3D425
+  ljBig7CZxCNXJqq2wSzmnVMoattGhCDLCNa9+JMN/G4bGqswnjk/MupSYhTV608s
+  jXrQ8yk9YIGrYi3+KW1hT25aS7HEqeFdrPax5/M/2TLyPJ+Yz+2vCm89T92rW6e5
+  IMDkjsQZjomhgOFjiTjn81wtr+4jfYCyclV+dFpNP+GHTXes9GtL0wzrSBMtfPkJ
+  AE5YlIKE6m2a40k+hhp6v3sRqPldu07L9yWxLGuz7ugiQyLc08jh7ApmnqUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUxW2m/eFG
+  Ic5LrIOJvXpDgkUIXfUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAAp+SekW1hEJtEVytkrrwQlx/7umkgPsiQS18ch7v
-  sRZBRxLXwFdG0LLmqo1rP0vd+JMDq0DXZVR6bluBGp2NEsFD9XyBs7Rsz/+4SEQ4
-  4eLGxTkU8+expljNlWRAFZdyt1RPHbs0LScrjBZaVzfBJtLXLcl8CWhyqM4OPTHv
-  R18J5Arlbd4O0PfYXQ08UtoSsNrqf77o24nPuXMXKMwPhmaCpuj0Lo4zBkha9EO8
-  geBYBisigKBlddJirP391twfnfQS0Qx/j7LgkYgXAuD3Z0Ma1Z9E3HzuTvXernzM
-  sECCiG3ji+1NriaIv8rb6mG/Zbdjv8ydoFAj+M+0qbE+ZARNlBHKI7F7lYQJc0cT
-  vsTqpllA3ZpXxVzmfiJMahAv08eTnWbgCSRNbCm6mq6I4hyAiudbxcc+DPzLbrxx
-  dwbAN6/wokoLVZAiMRG1vZlI6RhtSOTHvFHbfBE5JI9rhjRtui8yeV+t8iI8G4Zs
-  2NszuYzdlVfzlrUiPWY5jL9P
+  BgkqhkiG9w0BAQsFAAOCAYEANUi0iJeImMVeBp8DW0SYTE7fi64K55TzV82BUWTx
+  kGmMfNyBDXkRPVqfZeubCNOUBhpe3zpziO26TIzZ+7lqXkTOWDNkGdYVNMp2rbLd
+  exukFDYOuLStjGnAl5KUfIj3fTKC9T9HGDvSaJec2KwnY2RIQhal8FGicLX5kkUx
+  BO3X5S9uHFZP2HY0VZq4CpGvuhz3ikCWxRLSVfypsJR9EXod8SkPpHhtP9JHUfAV
+  7+dqSt7LPuHaYoiEWezPyfaZEn0oHFTFkLaDPtUDN1UvkMNaDwIQ9UBeQrscz3rm
+  8tXnf5YUbiM9Ngft4jVa4FjEqjARjRB/l4OlO8cxIHZG+7KU7PhlbsqT/2ISjo+f
+  k0RwIfy2uAZ/no0qaVtnTkbeFBw4JKNnH5jrNEMUyEsbWkkeSg67vCHjZ+YLxdgn
+  9pK+pqislEMFrWscGeMsc6YMS7ALxEujTuwTWyxmWAXnYft4ff2O1Zh2sPmdOlgf
+  camg7d8q+VZZzAtz0cFc4pip
   -----END CERTIFICATE-----
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: recordx
@@ -78,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.3
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []