dxlite 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e3592686fa48db902f98d0d7dce8ed09b6bca4d2f42b36994bb940d47b5fd4
-  data.tar.gz: 6b2cb9ae5b94c25880b369e6bd558ca02005564bfaa96a810532963faba6fabd
+  metadata.gz: 90e750d486323e8a58475cb5471ce9724fb1e74c723aade42c9ed8e8b8eeb146
+  data.tar.gz: 1fa49e26bd6b74fcbc68cfde7a7ff38746adb1227de26bd7241ff2c494eb2127
 SHA512:
-  metadata.gz: 241329fd8c70eb330cd70ea488c25f6fdbcc6ca0a062b3a3f3ce40bc43b65bb0207d4a25ce9ba8184ad457ebd574bbc4ff7025a6095d9d231eff6184b99ea80c
-  data.tar.gz: d57fac1b246db2e6915a4f8d4ce64341aba08a9e683a7a26d1692a13828756bafc75995664fde5369ff8e0ec9aafb7bf2ec50588c15ea6ded2c9d9b37e149ee6
+  metadata.gz: 7fc7a7fe58be371ba3ae9120cba0cad446917c55c8e5e438ebe9be4b74eefca0f2bf36b48813683d406fda740c45b1de9aed0b773a1815c624344b8d978f6bc7
+  data.tar.gz: c82bde55b5410360b3e2114750e24bf8ce6b7747913b6e9dbcc6e38e47549407171ea836cfcc251d0025d6a91bd6b8c160109711d69687e2d975898fbdf57fe7

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-�����b,�l"�~�b8|��\^+��JKK�ĸlR�C��|���`V�sв�"�kn��,4�#a���gh�D��S��#�9��N�8J�·ʥ���e[E��	�� r���K�˩u���u�׆&�b�7��+(����/�uyl�����/�:�;C?�+8�"�/P���~�F��xџ�������u�`T�v��"/�#s)��e4u����,i��.�z�vA��#
+&�ar��r��]k����N��f'V�h'�a�T��=��A�}�h������J��>U���
+�F�>ǭU�D��� d�ߛl2�|�2ukE�uQ�)��{���7���Kʵ%�3���D۠o��{h4)���w�J��}K���v?�u���	%u?��x�|���u.���ֱ֏S�(�?iȺ���B�zG�7�U���A)9w'@��JJ̞j
+Aq/��'L֗ͯ�R�	X��e������rʛ2A=:q2,������lD6$EYz.f��eL�z]��2e��ѫQ6��ҠJ*������P��bPW��c��q����]FcD�(ʗ	��l��?�

data.tar.gz.sig

@@ -1 +1,2 @@
-0�����8������s#��K�g�LJ��Yc����/6�Nē֜.h������ە�!�`�Q&!�9@נFrz�+���F%��,8Pޡ����h���"��k�t/煕nF񍸓Z —S#G�%\�.������qS�Z��[TL�ѭR�"f��Ti�|�Gbѻ$���f�����˦�P=�\��zy�&��ĺ�˗��Cz�/C��,�����$7����hl�7���K�'�k-M�@�r�XH�lp�����(yj@E�eDD�7����tl�h8Θ����q@[2��(��ęk�>*d��p/����c�ܭ��R�m��<�9���iĞ#s坍S�� p�W�\%:�>��.h���O���-�G��
+~3�����N��;�q���t�p55��s�Qs��C>��#�v���Hhj~VV96ð���az�﷋#�!��:-�y���ScbD
+yr.�_x��|O29��w4�0�<?�¥��v�J�J�a���ե��Ӭ�މ����t��x�ק�3��T�s
�F�t~,��
l�Po@��L�����ֈA�N�C~�Tلz"�k������L�����sU�Y;��xM����ff��>�E��Y)���<e���9J�?�

data/lib/dxlite.rb

@@ -14,81 +14,59 @@ class DxLite
   attr_accessor :summary
   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)
-    puts 'type: ' + type.inspect if @debug
     
+    @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
       
-      h1 = JSON.parse(buffer, symbolize_names: true)
-      puts 'h1:' + h1.inspect if @debug
-      @filepath = s
-      
-      h = h1[h1.keys.first]
+      read buffer
       
-      @summary = h[:summary]
-      @records = h[:records]
-    
     when :text
       
       @summary = {schema: s}
-      @records = []
+
+      
+    when :url
+      
+      read buffer      
       
     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 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
-
-      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
-        
-      end
-
-    end
+      
+    end    
+    
+    make_methods()    
 
   end  
 
@@ -105,14 +83,27 @@ 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}
+    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}
+    
+    save() if @autosave
+  end
+  
+  def fields()
+    @fields
   end
   
   def inspect()
@@ -132,7 +123,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
       
@@ -142,12 +133,48 @@ 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
+    
+    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()
     
@@ -208,7 +235,74 @@ 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    
+  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.4
+  version: 0.3.1
 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-27 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: []