dynarex 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd1d16bcce0b6a80e25930b6d55b75bf96a7b9bda61e69c15bf82567839c298
-  data.tar.gz: 40c5f54a4a6badf5622e240a9501f8e3233f7055f2efddbd83944edecd2a8095
+  metadata.gz: 9b490ec6437795cbd03aa1225879d2d71cb52fcf962fd85050ab455b27a16642
+  data.tar.gz: d58c100605804bc1fd0426330d64988997e93793614a24f7de6f123b1a159041
 SHA512:
-  metadata.gz: 11bc9d27b9d5ea334f78a4647a402b35ede9fdb3e84f715215a402996352d9dba2c4254b9375c76fbfdead34de0b324c3cf5dbe1b6bef1f5025d5ca11118a22c
-  data.tar.gz: 420c08fd2fa0eecdcb9ab69863dd417adf7964eff41a0684ca8ba1d9ff03df524d866a9404459d19f90042b2d8e6bcb0f58e62a11f8b629c0f9f2e18a2ecc90e
+  metadata.gz: 72e6e915b63d03cd0e27f6451f9ae840524565b1155306ed45273d392579a579ab6f9cf23653fbf698004132e04891d4c7961a26795485ec588f0e7acd44187e
+  data.tar.gz: 8378cd095e160cea18e196818229081e0906b675d1ceb24b9a295429d146aa8600ea21fd4e58846ab0bbee890b17963070533e99cb9cadff7cb34d53e56d157a

data/lib/dynarex.rb

@@ -388,6 +388,7 @@ EOF
         
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
 
+      puts 'xsl_buffer: ' + xsl_buffer if @debug
       out = Rexslt.new(xsl_buffer, @doc).to_s
 
       header ? docheader + "\n" + out : out
@@ -1147,11 +1148,19 @@ EOF
     elsif s[/[\[\(]/] # schema
 
       dynarex_new(s)
-              
-    elsif s[/^(?:http|df)s?:\/\//] then  # url
-      buffer, _ = RXFHelper.read s, {username: @username, 
-                                     password: @password, auto: false}
-      @local_filepath = s if s =~ /^dfs:\/\/.*\.xml$/
+      
+    elsif s[/^https?:\/\//] then  # url
+      buffer, type = RXFHelper.read s, {username: @username, 
+                                     password: @password, auto: false}              
+    elsif s[/^dfs?:\/\//] then      
+      
+      @local_filepath = s      
+
+      if FileX.exists? s then
+        buffer = FileX.read s
+      elsif @schema
+        dynarex_new @schema, default_key: @default_key        
+      end        
       
     else # local file
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   +2pKHQJfU1lEmVoo4afsLMvmq/CZPJba1LR3Z1QJXYCWt9IEZTECStKlK7H6RiIx
   gRA=
   -----END CERTIFICATE-----
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -121,7 +121,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement