dxlite 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a826f1bbdc7b1560d8a66ff303a87a1cf3a789cf0281b1aa8130ce0cdaf4893e
-  data.tar.gz: e4e5401e812f9b69def5f87f6cd2178292c7fb58d604bf6a091da1a8d634ea64
+  metadata.gz: 26b439376d323ebf252c80b4beb705a078b4aafae6a8c454eade112ff2bafef1
+  data.tar.gz: 89a361d248390fed5cd385f2cb1ff9025dbd6e13df64b05413eab830eef0e454
 SHA512:
-  metadata.gz: fc84a8ef5723964235e215ceaad244725dc882917a4475da3b5f8ca702aacf375b0d8bd8536fe297580a5a8be321367867332a3aff2839636ccb0113beaf8cba
-  data.tar.gz: 21daf4162a732639f0b8c5c0b41f9e09edf552db9a55aa632a8c0f082273074b54b2a588bab166804fc9079452340a0956baf98a790abaa1214553e85b16eeb5
+  metadata.gz: 8348c12d469466b5915a9178e7fb15076bd2345768e4440a6ce99d1fee79ec1423754d65e922c03dac6f4a875ecb16dd23f7e3a477d73e4c1adb30b16f98a127
+  data.tar.gz: 57a73d0c80ea752eb8f79dbb99e04bb757ffa48fd0c389c48402a9387905f67a6fab637ea9e1074e9e53d09eb2c5902ca168c279297216bb6e78cebc0ea2a373

data/lib/dxlite.rb

@@ -3,6 +3,7 @@
 # file: dxlite.rb
 
 require 'c32'
+require 'kvx'
 require 'json'
 require 'recordx'
 require 'rxfhelper'
@@ -11,8 +12,8 @@ require 'rxfhelper'
 class DxLite
   using ColouredText
 
-  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 +41,7 @@ class DxLite
 
     when :text
 
-      @summary = {schema: s}
-
+      new_summary(s)
 
     when :url
 
@@ -49,29 +49,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 +132,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|
@@ -189,10 +168,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
@@ -335,6 +314,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxlite
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 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-04 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: []