dynarex 1.9.4 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c401a45ef4beaa3cbd24bbfdb27c9ea98ed97663c68258c0c4df22da5a93b4fe
-  data.tar.gz: 106b7cf191a6ae68068c2dd7dca8459f9fdf87a5eaca6ff90f54409dc62a2861
+  metadata.gz: 903f755678cd3451fe853d3275f8ca7f13d160137df996f39f69c83fa71b696f
+  data.tar.gz: 4c753224acba84017d3211d5e878e3fd02ba62dad49b6aee108d89338bb3dfc8
 SHA512:
-  metadata.gz: 0da38d16db5aa75bf5fed6264cdcae8397a81e1bfb9a1dcb647e50c9e54074ca3685097e5a04a2ab9478febaec3bdb27bf6fa16de55b858edd6efdde57d88c36
-  data.tar.gz: c67ed57227363ed2ca40e6478f1dc9c4a590e24bbb3ca02cb3cda7dc0828853ee1ec900db382c108d83c733325639aefbeba2a0cdb553d0ad081821dfb009470
+  metadata.gz: 53adf9a593b6586c6007dfdc16e792162fda0cb209dfbc85347b0b28533514556a9a9e6fc3a450638f18ed6710e53c4e3e56473700b01e5c0a436240c08b9d22
+  data.tar.gz: 075e7e489c57272de40f8dd5b789cdffdf308933800f616dbd54a3bf9e39b0ee2bf85c69ff56e4d6bd86a39d1aea4f6eb64af70b3ce6f521216d4c0f3cbffc17

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,
@@ -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,7 +529,7 @@ 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
 
@@ -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
 
@@ -995,7 +995,7 @@ EOF
             end
 
             puts 'attributes: ' + attributes.inspect if @debug
-            puts '@record_name: ' + @record_name.inspect
+            puts '@record_name: ' + @record_name.inspect if @debug
 
             xml.send(@record_name, attributes) do
               item[:body].each do |name,value|
@@ -1304,9 +1304,9 @@ 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
+    elsif s[/^dfs?:\/\//] or RXFReadWrite.fs[0..2] == 'dfs' then
 
       @local_filepath = s
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.7
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   Wt/hg1iB0cnuzli8yHYtvBQovgFKUdQ7vGKM2IC9ZoWstmfIRwUAdI/Y2eHvUg3z
   dRm4fWf/5CZ2qPKTB8vb2s4Q
   -----END CERTIFICATE-----
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -83,20 +83,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        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.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: dynarex-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -123,20 +123,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
@@ -203,20 +203,20 @@ dependencies:
     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: []