dxlite 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d801e5f83ee0cb995d9ce93d12f0dec7b12dee2d54abc9de52e756ad597ab2e4
-  data.tar.gz: 90aac22d4b4355a49f966e8f2b6a7002b7f5837dbd753c523fe20cee141f63e0
+  metadata.gz: cdef9eda0edd930a2698134328be46b4be487c13f3125e38b30e36e93ca5d22f
+  data.tar.gz: e44e9f3791b109b90e139ae749defcf7014adbbc21d642fb8aca70cd4378ce4e
 SHA512:
-  metadata.gz: fb2f3379b28b49e39c41a8cacc231a4e1b953b521c50f2cc2a406f5d081ebc9c3f35c8e48c29ec59122e40e7bab625e319941752d15a4bc7c45f425e0e056a13
-  data.tar.gz: ab1798ce52a986be50e48bdd3e31c745fd96e256ee39c49197bfaaf823799d5bdec0120e26932e4549c466d370bb0290575112d4ffc514f7decb5e959615a331
+  metadata.gz: a8875b822287ebd3037ccf1cff2ecd39dafcc70a6d99f75b35006448503f5624e1f7fd5dc61ccd6e1d909bb7a78331b5c39832dc0d9f3af7a751ea24e4f65fc5
+  data.tar.gz: d6abb77ad3dcfdddb2aa30449204286e2be4f7db49f0425380b8d8384212c58fcff9afc3af25f1b45c986c48471be91517bb8958a2a7e1fd49d32dc85dcd7f80

data/lib/dxlite.rb

@@ -6,12 +6,21 @@ require 'c32'
 require 'kvx'
 require 'json'
 require 'recordx'
-require 'rxfhelper'
+require 'rxfreadwrite'
 
 
+# DxLite can perform the following:
+#
+# * read or write an XML file
+# * read or write a JSON file (in Dynarex format)
+# * import an Array of records (Hash objects)
+#
+# note: It cannot read a Dynarex file in
+#       the raw Dynarex format (.txt plain text)
+
 class DxLite
   using ColouredText
-  include RXFHelperModule
+  include RXFReadWriteModule
 
   attr_accessor :summary, :filepath
   attr_reader :records, :schema
@@ -21,7 +30,7 @@ class DxLite
     @autosave, @debug = autosave, debug
 
     return unless s
-    buffer, type = RXFHelper.read(s)
+    buffer, type = RXFReader.read(s)
 
     @filepath = s if type == :file or type == :dfs
 
@@ -158,7 +167,7 @@ class DxLite
 
   def parse_xml(buffer)
 
-    doc = Rexle.new(buffer)
+    doc = Rexle.new(buffer.force_encoding('UTF-8'))
 
     asummary = doc.root.xpath('summary/*').map do |node|
       puts 'node: '  + node.xml.inspect if @debug
@@ -172,7 +181,7 @@ class DxLite
     @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
@@ -360,7 +369,7 @@ class DxLite
 
       h[:summary].each do |key, value|
 
-        if %i(recordx_type format_mask schema).include? key then
+        if %i(recordx_type format_mask schema default_key).include? key then
           @summary[key] = value
         else
           @summary[key.to_s] = value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,8 @@ cert_chain:
   9pK+pqislEMFrWscGeMsc6YMS7ALxEujTuwTWyxmWAXnYft4ff2O1Zh2sPmdOlgf
   camg7d8q+VZZzAtz0cFc4pip
   -----END CERTIFICATE-----
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: kvx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: recordx
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Handles Dynarex documents (in JSON format) faster and with less overheads.