dxlite 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e036712cdb12ebc28440edcfff5e89a9d7e3cd4bc92c5eeca4545b2158b3ad8d
-  data.tar.gz: '020807c1206d1388f60fc55facbe865fc2be92ee9ca9c4d8d4af8741073492cc'
+  metadata.gz: 4e41d21c786667b36de7cfd0411d9ca2cac88e69d79f19e9e1aaef453cd8c298
+  data.tar.gz: 23d18cda9ff1bd35797370937726b2a20aa4b67a76f12fcbf3f5c4b2c88bc405
 SHA512:
-  metadata.gz: 33fabd7df1cbd07065b2627c4c6a56941b6ba68812b86ae3672fba34bc8f0ed06afc940af162217ed34385337f310b4154e5c900cea4d2cb7fbc8f12339be048
-  data.tar.gz: f16f8874284397716679de4b6f6a7e79e6145767b46d12fca47aca0895a1221ce592fd4e38bf0c8d5751fc81a3bf1a3fa4a978e50eb6b6c63e8e606de6b427d3
+  metadata.gz: 2eb01b1e8d31818db54860679979a4401b248d58cf027b505344b98bcebcd21076b8c7d1473fbe1f3870c70a18ad24a99da469c461aba04b6e5f1677e318168d
+  data.tar.gz: 5e08527479ad8d18a3fa9deecdfc1960042bcd4f8aa74bbc642cdd08c4b7ec15b8f0f876de42abaf5b56cfc87b82e827198c563f48e159a877ed315196c21237

data/lib/dxlite.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'recordx'
 require 'rxfhelper'
 
+
 class DxLite
   using ColouredText
 
@@ -19,25 +20,34 @@ class DxLite
 
     buffer, type = RXFHelper.read(s)
     puts 'type: ' + type.inspect if @debug
-    
+    puts 'buffer: ' + buffer.inspect if @debug
+        
     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 = []
       
+    when :url
+      
+      read buffer      
+      
     end
     
+    
     @schema = @summary[:schema]
+    
+    summary_attributes = {
+      recordx_type: 'dynarex',
+      default_key: @schema[/(?<=\()\w+/],
+    }
+    
+    @summary.merge!(summary_attributes)
 
     summary = @summary[:schema][/(?<=\[)[^\]]+/]
     
@@ -62,11 +72,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
@@ -76,13 +90,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.
@@ -96,7 +126,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  
@@ -105,11 +139,58 @@ 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_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.
   #  dynarex.update 4, name: Jeff, age: 38  
   
@@ -121,8 +202,26 @@ 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 read(buffer)
+    
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 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-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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: 
 email: james@jamesrobertson.eu
 executables: []