dxlite 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a826f1bbdc7b1560d8a66ff303a87a1cf3a789cf0281b1aa8130ce0cdaf4893e
-  data.tar.gz: e4e5401e812f9b69def5f87f6cd2178292c7fb58d604bf6a091da1a8d634ea64
+  metadata.gz: 311deba556bb981c48b947115339623283f0dfc76a3a671fed8e218f69aebdf0
+  data.tar.gz: d5b969ae74713577ee67fb1784fb39c7630af74f6d9eed124be53c8df9773256
 SHA512:
-  metadata.gz: fc84a8ef5723964235e215ceaad244725dc882917a4475da3b5f8ca702aacf375b0d8bd8536fe297580a5a8be321367867332a3aff2839636ccb0113beaf8cba
-  data.tar.gz: 21daf4162a732639f0b8c5c0b41f9e09edf552db9a55aa632a8c0f082273074b54b2a588bab166804fc9079452340a0956baf98a790abaa1214553e85b16eeb5
+  metadata.gz: b8ca6e083258756136a584b45d875312aefed4892f9472f45bc55d97a79949bf32d86d1a5f8105a1e50424ff64cb69b1d4cba07ace8291b80cb5c9395bcf2f8c
+  data.tar.gz: 2b03e0a74f483a7af0eec600d73c5e449b528fc1c18e8d2af74144087cd6c2a4b0a67ff6e5212912e6297d4828a569e26886113734ceb3c829436a41ce259869

data/lib/dxlite.rb

@@ -3,16 +3,27 @@
 # file: dxlite.rb
 
 require 'c32'
+require 'kvx'
 require 'json'
 require 'recordx'
 require 'rxfhelper'
 
 
+# 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
 
-  attr_accessor :summary, :filepath, :schema
-  attr_reader :records
+  attr_accessor :summary, :filepath
+  attr_reader :records, :schema
 
   def initialize(s=nil, autosave: false, debug: false)
 
@@ -40,8 +51,7 @@ class DxLite
 
     when :text
 
-      @summary = {schema: s}
-
+      new_summary(s)
 
     when :url
 
@@ -49,29 +59,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()
@@ -155,13 +142,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|
@@ -178,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
@@ -189,10 +178,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
@@ -212,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()
@@ -335,6 +324,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
@@ -364,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.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   9pK+pqislEMFrWscGeMsc6YMS7ALxEujTuwTWyxmWAXnYft4ff2O1Zh2sPmdOlgf
   camg7d8q+VZZzAtz0cFc4pip
   -----END CERTIFICATE-----
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-02-19 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.2
   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.2
 - !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.2.22
 signing_key: 
 specification_version: 4
 summary: Handles Dynarex documents (in JSON format) faster and with less overheads.