dxlite 0.2.7 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6258ec8d0f416cd7236549ab79736b74d4acd4a452af8fd5d1cc87332a56d90b
-  data.tar.gz: bfb040a5d78c81ea0e1a0461783e3d89f9603b5360387c5a1d9305da515abd0a
+  metadata.gz: 28362d972f8389e1b817f21be4fb9524ca4188761b4f4128c21a886eb67a11a5
+  data.tar.gz: df45a19238f82766d2abd14f08dc0f105b6bb1d66e4ddf85c46e4089f2600c8a
 SHA512:
-  metadata.gz: 6f80a21604960566b022c4adca5ce6f53d5514d746551498802037291287df866833de858f6d069236e191ace3cee225d4f059288495ed9ba3194967d4acde9c
-  data.tar.gz: 41e9874cb37039d9464d2a1e299b95c0415d46a8bb2d64bfda3b0175c0038e2067fb5e76b25b980b1dae89df5f711c9c6e227417b77d230de79b7db1c67aaf5a
+  metadata.gz: 515c3ed54028756c1ff4a5e660f204b878b0c2098f8de61ac43096c7b3191d2a2ffaf9b8d1f0a5f8fed62d80dd22845661c2927bc40bddc5a44c02986e1b32bc
+  data.tar.gz: e8aa916f1ebf5118440c45d75c75ec116d64cd98215ba1a0b9d85c49d8c4d92530d7686f1833097506f6453e8370587700c1dd67aba88ab51ff4ee0c24703932

data/lib/dxlite.rb

@@ -11,17 +11,23 @@ require 'rxfhelper'
 class DxLite
   using ColouredText
 
-  attr_accessor :summary
+  attr_accessor :summary, :filepath
   attr_reader :records
 
-  def initialize(s, 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
-        
+
+    @records = []
+          
     case type
       
     when :file
@@ -31,7 +37,7 @@ class DxLite
     when :text
       
       @summary = {schema: s}
-      @records = []
+
       
     when :url
       
@@ -39,51 +45,28 @@ class DxLite
       
     end
     
-    
+    puts '@summary: ' + @summary.inspect
     @schema = @summary[:schema]
     
     summary_attributes = {
       recordx_type: 'dynarex',
-      default_key: @schema[/(?<=\()\w+/],
+      default_key: @schema[/(?<=\()\w+/]
     }
-    
+
+    puts 'before merge' if @debug
     @summary.merge!(summary_attributes)
 
     summary = @summary[:schema][/(?<=\[)[^\]]+/]
     
     if summary then
-      @summary.merge! summary.split(',').map {|x|[x.strip, nil] }.to_h
-    end
-    
-    # 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
-    
-    @fields = @summary[:schema][/(?<=\()[^\)]+/].split(',').map(&:strip)
-
-    @fields.each do |x|
 
-      define_singleton_method ('find_all_by_' + x).to_sym do |value|
-        
-        @records.select {|rec| find_record(rec[:body], value, x) }
-        
+      summary.split(/ *, */).each do |x|
+        @summary[x] = nil unless @summary[x]
       end
-
-      define_singleton_method ('find_by_' + x).to_sym do |value|
-        
-        @records.find {|rec| find_record(rec[:body], value, x) }
-        
-      end
-
-    end
+      
+    end    
+    
+    make_methods()    
 
   end  
 
@@ -100,14 +83,30 @@ 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(h, id: nil, custom_attributes: {created: Time.now})
+  def create(rawh, id: nil, custom_attributes: {created: Time.now})
     
     id ||= @records.map {|x| x[:id].to_i}.max.to_i + 1
     h2 = custom_attributes
-    @records << {id: id.to_s, created: h2[:created], last_modified: nil, body: h}
+    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()
@@ -127,7 +126,7 @@ class DxLite
       end
         
       obj.each do |x|
-        puts 'x: ' + x.inspect if @debug
+        #puts 'x: ' + x.inspect if @debug
         self.create x, id: nil
       end
       
@@ -137,12 +136,49 @@ class DxLite
   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
+    
+    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
+      
+    end
+
+    @summary = summary
+    
+  end
 
   def save(file=@filepath)
-    File.write file, to_json()
+    
+    return unless file
+    @filepath = file
+    
+    s = File.extname(file) == '.json' ? to_json() : to_xml()
+    File.write file, s
   end
   
-  alias to_a records
+  def to_a()
+    @records.map {|x| x[:body]}
+  end
   
   def to_h()
     
@@ -203,25 +239,92 @@ 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 read(buffer)
+  def make_methods()
     
-    h1 = JSON.parse(buffer, symbolize_names: true)
-    puts 'h1:' + h1.inspect if @debug
+    # for each summary item create get and set methods
     
-    h = h1[h1.keys.first]
+    @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
     
-    @summary = h[:summary]
-    @records = h[:records].map {|x| x[x.keys.first]}
+    @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
+      
+      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        
+          @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.2.7
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   dwbAN6/wokoLVZAiMRG1vZlI6RhtSOTHvFHbfBE5JI9rhjRtui8yeV+t8iI8G4Zs
   2NszuYzdlVfzlrUiPWY5jL9P
   -----END CERTIFICATE-----
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: recordx
@@ -61,22 +61,22 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,7 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Handles Dynarex documents (in JSON format) faster and with less overheads.