dxlite 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26b439376d323ebf252c80b4beb705a078b4aafae6a8c454eade112ff2bafef1
-  data.tar.gz: 89a361d248390fed5cd385f2cb1ff9025dbd6e13df64b05413eab830eef0e454
+  metadata.gz: d5f7ff09ef018e512c58d742d1147b0808845c383a8e951fd973f682a7bc1fc1
+  data.tar.gz: 63ee1993b296960d11ba2c0144e7d0b5eccb7c9d95c825ad684b5ed4d9c008c6
 SHA512:
-  metadata.gz: 8348c12d469466b5915a9178e7fb15076bd2345768e4440a6ce99d1fee79ec1423754d65e922c03dac6f4a875ecb16dd23f7e3a477d73e4c1adb30b16f98a127
-  data.tar.gz: 57a73d0c80ea752eb8f79dbb99e04bb757ffa48fd0c389c48402a9387905f67a6fab637ea9e1074e9e53d09eb2c5902ca168c279297216bb6e78cebc0ea2a373
+  metadata.gz: 175d5dc5ff60d75663435b4b3f3d2df8fb71ca19782313406fc08b14001b1d3d1e29aaec2bab587b9e87259d0d87c6f9f67e17203232df3afb13a142a8d757dc
+  data.tar.gz: 54ec532d5826582eedee068aa749d68112bab86f6da808cfec6a2b940bca5ef699071df8c8867242f666bc370449f44bc75575cdc9d3dab2a2d44b096f2c3033

data/lib/dxlite.rb

@@ -6,11 +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 RXFReadWriteModule
 
   attr_accessor :summary, :filepath
   attr_reader :records, :schema
@@ -20,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
 
@@ -157,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
@@ -171,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
@@ -191,7 +201,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()
@@ -371,6 +381,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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   9pK+pqislEMFrWscGeMsc6YMS7ALxEujTuwTWyxmWAXnYft4ff2O1Zh2sPmdOlgf
   camg7d8q+VZZzAtz0cFc4pip
   -----END CERTIFICATE-----
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kvx
@@ -46,7 +46,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: recordx
   requirement: !ruby/object:Gem::Requirement
@@ -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.2.22
 signing_key: 
 specification_version: 4
 summary: Handles Dynarex documents (in JSON format) faster and with less overheads.