dxlite 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6268d88624bc2c37694a40bcd196ef5653e67ee4f49c2e3aa57762e0c24eaf74
-  data.tar.gz: ff5277f2debc53311cc5b4d59eebb04d568199ff28df0e77bf4a731ddc89408d
+  metadata.gz: 17e3592686fa48db902f98d0d7dce8ed09b6bca4d2f42b36994bb940d47b5fd4
+  data.tar.gz: 6b2cb9ae5b94c25880b369e6bd558ca02005564bfaa96a810532963faba6fabd
 SHA512:
-  metadata.gz: 4b639ab519450eee10073783acdcf0ed5c6cdf3013c54fb5251e06dc30f85147629d90572de01e322861e16443542e26f124390f3616b47c327191aafbed78da
-  data.tar.gz: 36fc53ce6d3bb42ee0c07bd072b19cd83a61a72445b63f3c8b8de98dd20dc061cca69e71e1987ae0ead27d23286a901e719807f473b9e0b8bb25795deec647a1
+  metadata.gz: 241329fd8c70eb330cd70ea488c25f6fdbcc6ca0a062b3a3f3ce40bc43b65bb0207d4a25ce9ba8184ad457ebd574bbc4ff7025a6095d9d231eff6184b99ea80c
+  data.tar.gz: d57fac1b246db2e6915a4f8d4ce64341aba08a9e683a7a26d1692a13828756bafc75995664fde5369ff8e0ec9aafb7bf2ec50588c15ea6ded2c9d9b37e149ee6

data/lib/dxlite.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'recordx'
 require 'rxfhelper'
 
+
 class DxLite
   using ColouredText
 
@@ -24,9 +25,12 @@ 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]
     
@@ -38,6 +42,13 @@ class DxLite
     end
     
     @schema = @summary[:schema]
+    
+    summary_attributes = {
+      recordx_type: 'dynarex',
+      default_key: @schema[/(?<=\()\w+/],
+    }
+    
+    @summary.merge!(summary_attributes)
 
     summary = @summary[:schema][/(?<=\[)[^\]]+/]
     
@@ -84,13 +95,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.
@@ -104,7 +131,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  
@@ -113,13 +144,13 @@ class DxLite
   alias import parse
 
   def save(file=@filepath)
-    File.write file, {summary: @summary, records: @records}.to_json
+    File.write file, to_json()
   end
   
   alias to_a records
   
-  def to_xml()
-        
+  def to_h()
+    
     root_name = schema()[/^\w+/]
     record_name = schema()[/(?<=\/)[^\(]+/]
     
@@ -130,8 +161,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 +207,8 @@ 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
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - James Robertson
@@ -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.