dxlite 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e0e8b4f265fe12323cca22407f3b06ce13f090192fb0abd83588aa4bd2cf13b
-  data.tar.gz: e9b725095dde2698fbd7a6afed799fec375f0d4009901b2021bfad73371ad0cf
+  metadata.gz: 4224fc9854dcb1157666fca8b3a307f6e5228a7eb2a442ed4511b4a0df3c14fc
+  data.tar.gz: aa9ff2cd93b0ef7cf9b46f135c541d9406de49b54fe1e7a11125e67cebc63ec8
 SHA512:
-  metadata.gz: 439ffafee850ff7f07dd8915099c97cc24f4f9914780ce03231a57f200b43a734c3ebafeaa49d21f0b850a25bd5ce34b505e669bfac55bd911ea26c343313e6f
-  data.tar.gz: 370a4daca23b52c6a0b2e06c9abcd653cb061e14d93dfd4195250f41cb8c6b220261388f9812ee977bfe09963c37f7a1d3ef3fc7f20b9dc110f2fccfcdbedd0d
+  metadata.gz: 2f175b4810c7a749170b43839d70bbfc06e925959401696780f91b11c086c2365ca1319f307f0f2f2fcee71a62e20265326f6fd68337b4774115041d11ad0b44
+  data.tar.gz: 7903b9ef0094847037f8f12789ef0c6e4c5926e640f2c2660b0abe8fed1d8519ebcbbe936a7507f4fa5386ef24a185fc580203ef88a4c7905fd486c6e5e4caa8

data/lib/dxlite.rb

@@ -7,15 +7,16 @@ require 'json'
 require 'recordx'
 require 'rxfhelper'
 
+
 class DxLite
   using ColouredText
 
   attr_accessor :summary
   attr_reader :records
 
-  def initialize(s, debug: false)
+  def initialize(s, filepath: nil, debug: false)
 
-    @debug = debug
+    @filepath, @debug = filepath, debug
 
     buffer, type = RXFHelper.read(s)
     puts 'type: ' + type.inspect if @debug
@@ -24,11 +25,14 @@ class DxLite
       
     when :file
       
-      h = JSON.parse(buffer, symbolize_names: true)
+      h1 = JSON.parse(buffer, symbolize_names: true)
+      puts 'h1:' + h1.inspect if @debug
       @filepath = s
       
+      h = h1[h1.keys.first]
+      
       @summary = h[:summary]
-      @records = h[:records]
+      @records = h[:records].map {|x| x[x.keys.first]}
     
     when :text
       
@@ -38,9 +42,19 @@ class DxLite
     end
     
     @schema = @summary[:schema]
+    
+    summary_attributes = {
+      recordx_type: 'dynarex',
+      default_key: @schema[/(?<=\()\w+/],
+    }
+    
+    @summary.merge!(summary_attributes)
 
-    @summary.merge! @summary[:schema][/(?<=\[)[^\]]+/].split(',')\
-        .map {|x|[x.strip, nil] }.to_h
+    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
     
@@ -59,11 +73,15 @@ class DxLite
     @fields.each do |x|
 
       define_singleton_method ('find_all_by_' + x).to_sym do |value|
-        @records.select {|rec| rec[x.to_sym] == value }
+        
+        @records.select {|rec| find_record(rec[:body], value, x) }
+        
       end
 
       define_singleton_method ('find_by_' + x).to_sym do |value|
-        @records.find {|rec| rec[x.to_sym] == value }
+        
+        @records.find {|rec| find_record(rec[:body], value, x) }
+        
       end
 
     end
@@ -73,13 +91,29 @@ class DxLite
   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(h, 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}
+  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.
@@ -93,7 +127,11 @@ 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  
@@ -102,7 +140,56 @@ class DxLite
   alias import parse
 
   def save(file=@filepath)
-    File.write file, @records.to_json
+    File.write file, to_json()
+  end
+  
+  alias to_a records
+  
+  def to_h()
+    
+    root_name = schema()[/^\w+/]
+    record_name = schema()[/(?<=\/)[^\(]+/]
+    
+    h = {
+      root_name.to_sym =>
+      {
+        summary: @summary,
+        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(a).xml pretty: true    
+        
+    
   end
   
   # Updates a record from an id and a hash containing field name and field value.
@@ -116,8 +203,14 @@ 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
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   dwbAN6/wokoLVZAiMRG1vZlI6RhtSOTHvFHbfBE5JI9rhjRtui8yeV+t8iI8G4Zs
   2NszuYzdlVfzlrUiPWY5jL9P
   -----END CERTIFICATE-----
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: recordx
@@ -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.