dxlite 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6268d88624bc2c37694a40bcd196ef5653e67ee4f49c2e3aa57762e0c24eaf74
-  data.tar.gz: ff5277f2debc53311cc5b4d59eebb04d568199ff28df0e77bf4a731ddc89408d
+  metadata.gz: 6638bca4c2fef3679ec9d456318f51b51eeeb49230afadbd1baa8af4308620ca
+  data.tar.gz: 1fcaedf6a4692a244e5930ed1d8ec10e7784b5003958faafb45b8e32cdaa707a
 SHA512:
-  metadata.gz: 4b639ab519450eee10073783acdcf0ed5c6cdf3013c54fb5251e06dc30f85147629d90572de01e322861e16443542e26f124390f3616b47c327191aafbed78da
-  data.tar.gz: 36fc53ce6d3bb42ee0c07bd072b19cd83a61a72445b63f3c8b8de98dd20dc061cca69e71e1987ae0ead27d23286a901e719807f473b9e0b8bb25795deec647a1
+  metadata.gz: 54a8938acfd2116234f3a750c9e007adae6e2bc7cb894379702aebe2730b8a601c88f178a490f4b260275e5682c211efee2c5c9da57b9fa645f5146b66a5c7d9
+  data.tar.gz: ec2fde50afa20bbea953fc3ffb503ae07f160580248ecde88e99f1c272f64404cf6bea099c75e4286f411f3c83df27516df39394c27e78d3bc1846e2fce2b88d

data/lib/dxlite.rb

@@ -7,90 +7,98 @@ require 'json'
 require 'recordx'
 require 'rxfhelper'
 
+
 class DxLite
   using ColouredText
 
   attr_accessor :summary
   attr_reader :records
 
-  def initialize(s, filepath: nil, debug: false)
+  def initialize(s=nil, filepath: nil, debug: false)
 
     @filepath, @debug = filepath, debug
 
+    return unless s
     buffer, type = RXFHelper.read(s)
     puts 'type: ' + type.inspect if @debug
-    
+    puts 'buffer: ' + buffer.inspect if @debug
+
+    @records = []
+          
     case type
       
     when :file
       
-      h = JSON.parse(buffer, symbolize_names: true)
-      @filepath = s
+      read buffer
       
-      @summary = h[:summary]
-      @records = h[:records]
-    
     when :text
       
       @summary = {schema: s}
-      @records = []
-      
-    end
-    
-    @schema = @summary[:schema]
 
-    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] }
+    when :url
       
-      define_singleton_method (key.to_s + '=').to_sym do |value|
-        @summary[key] = value
-      end      
+      read buffer      
       
     end
     
-    @fields = @summary[:schema][/(?<=\()[^\)]+/].split(',').map(&:strip)
+    puts '@summary: ' + @summary.inspect
+    @schema = @summary[:schema]
+    
+    summary_attributes = {
+      recordx_type: 'dynarex',
+      default_key: @schema[/(?<=\()\w+/]
+    }
 
-    @fields.each do |x|
+    puts 'before merge' if @debug
+    @summary.merge!(summary_attributes)
 
-      define_singleton_method ('find_all_by_' + x).to_sym do |value|
-        
-        @records.select do |rec| 
-          value.is_a?(Regexp) ? rec[x.to_sym] =~ value : rec[x.to_sym] == value
-        end
-        
-      end
+    summary = @summary[:schema][/(?<=\[)[^\]]+/]
+    
+    if summary then
 
-      define_singleton_method ('find_by_' + x).to_sym do |value|
-        
-        @records.find do |rec| 
-          value.is_a?(Regexp) ? rec[x.to_sym] =~ value : rec[x.to_sym] == value
-        end
-        
+      summary.split(/ *, */).each do |x|
+        @summary[x] = nil unless @summary[x]
       end
-
-    end
+      
+    end    
+    
+    make_methods()    
 
   end  
 
   def all()
 
     @records.map do |h|
-      RecordX.new(h, self, h.object_id, h[:created], h[:last_modified])
+      
+      puts 'h: ' + h.inspect if @debug
+      RecordX.new(h[:body], self, h[:id], h[:created], 
+                  h[:last_modified])
     end
 
   end  
   
-  def create(h)
-    @records << h
+  def delete(id)
+    found = @records.find {|x| x[:id] == id}
+    @records.delete found if found
+  end
+  
+  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
+    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}
+  end
+  
+  def fields()
+    @fields
+  end
+  
+  def inspect()
+    "#<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.
@@ -104,22 +112,59 @@ class DxLite
         self.schema = "items/item(%s)" % cols.join(', ')
       end
         
-      obj.each {|x| self.create x }
+      obj.each do |x|
+        #puts 'x: ' + x.inspect if @debug
+        self.create x, id: nil
+      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
+    
+    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, {summary: @summary, records: @records}.to_json
+    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_xml()
-        
+  def to_h()
+    
     root_name = schema()[/^\w+/]
     record_name = schema()[/(?<=\/)[^\(]+/]
     
@@ -130,8 +175,38 @@ 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}          
+            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(RexleBuilder.new(h, debug: false).to_a).xml pretty: true
+    Rexle.new(a).xml pretty: true    
+        
     
   end
   
@@ -146,8 +221,68 @@ class DxLite
       puts ('obj.class: '  + obj.class.inspect).debug
     end
     
-    r = @records.find {|x| x.object_id == id}
-    r.merge!(obj)
+    r = @records.find {|x| x[:id] == id}
+    r[:body].merge!(obj)
+  end
+  
+  private
+  
+  def find_record(rec, value, x)
+    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
+    
+    @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) }
+        
+      end
+
+      define_singleton_method ('find_by_' + x).to_sym do |value|
+        
+        @records.find {|rec| find_record(rec[:body], value, x) }
+        
+      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]
+     @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.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   dwbAN6/wokoLVZAiMRG1vZlI6RhtSOTHvFHbfBE5JI9rhjRtui8yeV+t8iI8G4Zs
   2NszuYzdlVfzlrUiPWY5jL9P
   -----END CERTIFICATE-----
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2021-01-23 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.