dxlite 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7ca783b4730eb45379b1e06eed84ad925b0c07fcffa430bdcffbe5e6eb4f58
-  data.tar.gz: abe705038e2ba9de443ec9d05ccc6f9ad0a6373c2f666e074ed663fde4c8d486
+  metadata.gz: d801e5f83ee0cb995d9ce93d12f0dec7b12dee2d54abc9de52e756ad597ab2e4
+  data.tar.gz: 90aac22d4b4355a49f966e8f2b6a7002b7f5837dbd753c523fe20cee141f63e0
 SHA512:
-  metadata.gz: ecf2d3105cf6e647a3218282369801206cce0711f7502a67b20fde8623dcb40dbe4e0c072e20f60d54a82b55e7479d6e4563f83dff43d53f603d50e26ab0f7a8
-  data.tar.gz: 3673db0fe254541450bc167d351af2992d2706923b6383dba8f61ffaf9ac2d47c2d2696a70e00f4cd55093d93f01e6e9ea6acb28a6392f21569113716d3180f1
+  metadata.gz: fb2f3379b28b49e39c41a8cacc231a4e1b953b521c50f2cc2a406f5d081ebc9c3f35c8e48c29ec59122e40e7bab625e319941752d15a4bc7c45f425e0e056a13
+  data.tar.gz: ab1798ce52a986be50e48bdd3e31c745fd96e256ee39c49197bfaaf823799d5bdec0120e26932e4549c466d370bb0290575112d4ffc514f7decb5e959615a331

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-%��э��[^X��l���I�O����Џ)-��6�Ӿ���S�ԉ���`�k`��e�fJ�ۣ��ū%�C�Z��=m,-�)m���$�j[W���;�Ο��96��RNy��,Q�ׂ�n���41$�m���b�'��?�~9����?����6�%�]H�����aB2�C`�*z7��f�����pσ�����+S�*˞�?����`S�;Y
-N_�T>��S�s|f�)9�5PX�[���
-����.q��5;���G��S��®�ee.���m�1揜���5��Tؗ*�#��ӤH߻���@�Xw�����R�ǵ	B	���y�C0EX�Z2�[��Q\p��w�����Y\v�9�B�آ؈
+���zp�k��^�k�0
�f+g���s(��*�
+5�`����
+��`6��b��^�&+ܬ�v1��Z�yuc�X�~ʱM���X�[���~�i��y�vk�͢;j`'x��@�?oj�<f��c��_���+�O��9(�7�m�F>�w��+����V�p�[\��+��$��d>��:l�=SQ<�7ں\���:"D�X�S�A����X��GfT������9�R��f���3�b(��T<��g���p�<�s����8�J���,��~�<|C���A,|��u=5���}��L�_v
�I�ރ����H�B�M����L̍ea�'Ll��wF����G�0�

data/lib/dxlite.rb

@@ -3,6 +3,7 @@
 # file: dxlite.rb
 
 require 'c32'
+require 'kvx'
 require 'json'
 require 'recordx'
 require 'rxfhelper'
@@ -10,9 +11,10 @@ require 'rxfhelper'
 
 class DxLite
   using ColouredText
+  include RXFHelperModule
 
-  attr_accessor :summary, :filepath, :schema
-  attr_reader :records
+  attr_accessor :summary, :filepath
+  attr_reader :records, :schema
 
   def initialize(s=nil, autosave: false, debug: false)
 
@@ -30,14 +32,17 @@ class DxLite
 
     case type
 
+    when :dfs
+
+      read buffer
+
     when :file
 
       read buffer
 
     when :text
 
-      @summary = {schema: s}
-
+      new_summary(s)
 
     when :url
 
@@ -45,29 +50,6 @@ class DxLite
 
     end
 
-    puts '@summary: ' + @summary.inspect if @debug
-    @schema = @summary[:schema]
-
-    summary_attributes = {
-      recordx_type: 'dynarex',
-      default_key: @schema[/(?<=\()\w+/]
-    }
-
-    puts 'before merge' if @debug
-    @summary.merge!(summary_attributes)
-
-    summary = @summary[:schema][/(?<=\[)[^\]]+/]
-
-    if summary then
-
-      summary.split(/ *, */).each do |x|
-        @summary[x] = nil unless @summary[x]
-      end
-
-    end
-
-    make_methods()
-
   end
 
   def all()
@@ -151,13 +133,15 @@ class DxLite
 
   def parse(obj=nil)
 
+    @records ||= []
+
     if obj.is_a? Array then
 
       unless schema() then
         puts 'obj.first: ' + obj.first.inspect if @debug
         cols = obj.first.keys.map {|c| c == 'id' ? 'uid' : c}
         puts 'after cols' if @debug
-        self.schema = "items/item(%s)" % cols.join(', ')
+        new_summary "items/item(%s)" % cols.join(', ')
       end
 
       obj.each do |x|
@@ -185,10 +169,10 @@ class DxLite
     summary[:schema] = summary['schema']
     %w(recordx_type format_mask schema).each {|x| summary.delete x}
 
-    schema = summary[:schema]
+    @schema = summary[:schema]
     puts 'schema: ' + schema.inspect if @debug
 
-    @fields = schema[/\(([^\)]+)/,1].split(/ *, +/)
+    @fields = @schema[/\(([^\)]+)/,1].split(/ *, +/)
     puts 'fields: ' + @fields.inspect if @debug
 
     @summary = summary
@@ -208,7 +192,7 @@ class DxLite
     @filepath = file
 
     s = File.extname(file) == '.json' ? to_json() : to_xml()
-    File.write file, s
+    FileX.write file, s
   end
 
   def to_a()
@@ -331,6 +315,34 @@ class DxLite
 
   end
 
+  def new_summary(schema)
+
+    @summary = {schema: schema}
+
+    puts '@summary: ' + @summary.inspect if @debug
+    @schema = @summary[:schema]
+
+    summary_attributes = {
+      recordx_type: 'dynarex',
+      default_key: schema[/(?<=\()\w+/]
+    }
+
+    puts 'before merge' if @debug
+    @summary.merge!(summary_attributes)
+
+    summary = @summary[:schema][/(?<=\[)[^\]]+/]
+
+    if summary then
+
+      summary.split(/ *, */).each do |x|
+        @summary[x] = nil unless @summary[x]
+      end
+
+    end
+
+    make_methods()
+  end
+
   def read(buffer)
 
     if buffer[0] == '<' then
@@ -340,7 +352,7 @@ class DxLite
     else
 
       h1 = JSON.parse(buffer, symbolize_names: true)
-      #puts 'h1:' + h1.inspect if @debug
+      puts 'h1:' + h1.inspect if @debug
 
       h = h1[h1.keys.first]
 
@@ -360,6 +372,8 @@ class DxLite
 
     end
 
+    make_methods()
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   9pK+pqislEMFrWscGeMsc6YMS7ALxEujTuwTWyxmWAXnYft4ff2O1Zh2sPmdOlgf
   camg7d8q+VZZzAtz0cFc4pip
   -----END CERTIFICATE-----
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: recordx
+  name: kvx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: rxfhelper
+  name: recordx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.5.5
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Handles Dynarex documents (in JSON format) faster and with less overheads.