dynarex 1.9.1 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5372615b4ec91fc55c240cae2a993e641e3c53da03986c7fc68871393953efce
-  data.tar.gz: c6ded46e9e56dd208c1c8f8babb9675adc54b13b31dc4ca0cbba3c6067e0d739
+  metadata.gz: c46d4fcb9b14d12267b5ad08cafd81951384aeafcbe68953836b1e83769c836a
+  data.tar.gz: 5616c928edbf1e4ef7076ca5236e335009bc6b11f922b34a16c67fb10967709f
 SHA512:
-  metadata.gz: e560695bd9a1179eaa5b96947d24b63f99d81dac67646c12a19211863bce9e604e37f253108b9ce0a449173b6652a5dc7b3024ba494f14b8e6edc9102bd4e606
-  data.tar.gz: f1cb6159a438012e52f27843d998df8d00c8d16d748b4f28c533535adc76af61bb127c6c7891373c2a1491797f19218570ab4f653da1fc65bfff5665cc5b2690
+  metadata.gz: 51947520e02a33849f82ed868b95fccd70d5afd607f5d6b79c5acc0d27a2946b3bd42a1157179cdc476751d9d2623857d92a5a5495e3a646b76bf7f4f37720ab
+  data.tar.gz: 4012981e3cb950c54eba69cae53b809708be07c93748787f3b57368464547010be66183fb3d8a048c7786f52aa68f3b3f2543168dc34df3e0e8b09e955419a3f

data/lib/dynarex.rb

@@ -15,7 +15,7 @@ require 'yaml'
 require 'rowx'
 require 'ostruct'
 require 'table-formatter'
-#require 'rxfhelper'
+require 'rxfreader'
 require 'kvx'
 require 'json'
 
@@ -72,7 +72,7 @@ end
 
 
 class Dynarex
-  include RXFHelperModule
+  include RXFReadWriteModule
   using ColouredText
 
   attr_accessor :format_mask, :delimiter, :xslt_schema, :schema, :linked,
@@ -94,8 +94,8 @@ class Dynarex
 
 
     puts 'inside Dynarex::initialize' if debug
-    @username, @password, @schema, @default_key, @json_out, @debug = \
-    username,  password, schema, default_key, json_out, debug
+    @username, @password, @schema,  = username,  password, schema
+    @default_key, @json_out, @debug = default_key, json_out, debug
     @autosave, @unique = autosave, unique
     @local_filepath = filepath
 
@@ -324,7 +324,7 @@ class Dynarex
   def to_html(domain: '')
 
     h = {username: @username, password: @password}
-    xsl_buffer = RXFHelper.read(domain + @xslt, h).first
+    xsl_buffer = RXFReader.read(domain + @xslt, h).first
     Rexslt.new(xsl_buffer, self.to_doc).to_s
 
   end
@@ -529,12 +529,12 @@ EOF
       return self
 
     end
-    raw_buffer, type = RXFHelper.read(x, auto: false)
+    raw_buffer, type = RXFReader.read(x, auto: false)
 
     if raw_buffer.is_a? String then
 
       buffer = block_given? ? yield(raw_buffer) : raw_buffer.clone
-      string_parse buffer
+      string_parse buffer.force_encoding('UTF-8')
 
     else
       foreign_import x
@@ -930,7 +930,7 @@ EOF
 
     raw_lines.map do |line|
 
-      buffer = RXFHelper.read(line.chomp, auto: false).first
+      buffer = RXFReader.read(line.chomp, auto: false).first
 
       doc = Rexle.new buffer
 
@@ -994,6 +994,9 @@ EOF
               raise DynarexException, 'record_name can\'t be nil. Check the schema'
             end
 
+            puts 'attributes: ' + attributes.inspect if @debug
+            puts '@record_name: ' + @record_name.inspect
+
             xml.send(@record_name, attributes) do
               item[:body].each do |name,value|
 
@@ -1252,6 +1255,9 @@ EOF
     if s.match(ptrn) then
 
       @root_name, raw_summary, record_name, raw_fields = s.match(ptrn).captures
+      reserved = %w(require parent gem)
+
+      raise 'reserved keyword: ' + record_name if reserved.include? record_name
       summary, fields = [raw_summary || '',raw_fields].map {|x| x.split(/,/).map &:strip}
 
       if fields.include? 'id' then
@@ -1260,7 +1266,7 @@ EOF
 
       create_find fields
 
-      reserved = %w(require parent)
+
       raise 'reserved keyword' if (fields & reserved).any?
 
     else
@@ -1298,14 +1304,14 @@ EOF
       dynarex_new(s)
 
     elsif s[/^https?:\/\//] then  # url
-      buffer, type = RXFHelper.read s, {username: @username,
+      buffer, type = RXFReader.read s, {username: @username,
                                      password: @password, auto: false}
     elsif s[/^dfs?:\/\//] then
 
       @local_filepath = s
 
       if FileX.exists? s then
-        buffer = FileX.read s
+        buffer = FileX.read(s).force_encoding("UTF-8")
       elsif @schema
         dynarex_new @schema, default_key: @default_key
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   Wt/hg1iB0cnuzli8yHYtvBQovgFKUdQ7vGKM2IC9ZoWstmfIRwUAdI/Y2eHvUg3z
   dRm4fWf/5CZ2qPKTB8vb2s4Q
   -----END CERTIFICATE-----
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -81,22 +81,22 @@ dependencies:
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: dynarex-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -141,82 +141,82 @@ dependencies:
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rowx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: table-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: kvx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -243,8 +243,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: The Dynarex gem creates, reads, updates or delete rows of Dynarex flavoured