rxfhelper 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1e52810e2517ff7876a47943781bf3fd7ff1220d883f0eb78a380d5e58e0d8
-  data.tar.gz: 4e3ba3c6dcc781f6fd497caf5dad53c6b7f67312c7a6c7d3ffff07ecc3a67745
+  metadata.gz: 37c5247bbc525a9b4310d111f02237b3d643251c5c9be907bd7e8d4259da13fb
+  data.tar.gz: 71793ac9b2b51f3d43d9357871d4bc41d6b86e79364d1e2680dd71d29963a7d2
 SHA512:
-  metadata.gz: 5627fe3e97c9453fa1dac8ce8ffaa140be430096a9492306830ffb0578c138be9e6ba47e73b56179640ad44378b71e3638566a772846b41b808ccade77c5f4e4
-  data.tar.gz: 4aaba1cd307cc62420ea24cc25f2032a2c044c260302d32987c4f3aac4339b2372800563d7867a6b2e790546e52e7059558f6959b0e40a20b9e679f494384caf
+  metadata.gz: 8cb3e32a2b80d372c131a0d626b0ce69de8d9fb698d1bd4bdfea4a5c8fbaa7569d7a3b04112f8550490d33e693b4c80b3deb5013428f48ed15414c2b6ece85e7
+  data.tar.gz: 97c66de7c737d25ce802b296eec5faade73e7b25a36b733ff1baa61e7abca1f4499d70fac3965ddb8ded365786afa6515e604d34e3aa17ad3e3e8ffc005d6bec

data/lib/rxfhelper.rb

@@ -94,6 +94,7 @@ end
 # Read XML File Helper
 #
 class RXFHelper
+  using ColouredText
   
   @fs = :local
   
@@ -159,6 +160,23 @@ class RXFHelper
     DfsFile.mv(s1, s2)
   end  
   
+  # used by self.read
+  #  
+  def self.objectize(contents)
+    
+    doctype = contents.lines.first[/(?<=^<\?)\w+/]
+    reg = RemoteDwsRegistry.new domain: 'reg', port: '9292'
+    r = reg.get_key 'hkey_gems/doctype/' + doctype
+        
+    return contents unless r
+
+    require r.text('require')
+    
+    obj = Object.const_get(r.text('class')).new
+    obj.import contents
+    obj    
+  end
+  
   def self.pwd()
     
     DfsFile.pwd
@@ -168,6 +186,8 @@ class RXFHelper
   def self.read(x, h={})   
     
     opt = {debug: false, auto: false}.merge(h)
+    
+    debug = opt[:debug]
 
     puts 'x: ' + x.inspect if opt[:debug]
     raise RXFHelperException, 'nil found, expected a string' if x.nil?
@@ -182,8 +202,12 @@ class RXFHelper
       
     elsif x.lines.length == 1 then
       
+      puts 'x.lines == 1'.info if debug
+      
       if x[/\bhttps?:\/\//] then
         
+        puts 'before GPDRequest'.info if debug
+        
         r = GPDRequest.new(opt[:username], opt[:password]).get(x)
         
         case r.code
@@ -193,7 +217,9 @@ class RXFHelper
           raise(RXFHelperException, "401 %s unauthorized access" % x)        
         end
         
-        [r.body, :url]
+        obj = opt[:auto] ? objectize(r.body) :   r.body
+        
+        [obj, :url]
         
       elsif  x[/^dfs:\/\//] then
         
@@ -212,27 +238,7 @@ class RXFHelper
         
         puts 'opt: ' + opt.inspect if opt[:debug]
         
-        obj = if opt[:auto] then
-
-          doctype = contents.lines.first[/(?<=^<\?)\w+/]
-          reg = RemoteDwsRegistry.new domain: 'reg', port: '9292'
-          r = reg.get_key 'hkey_gems/doctype/' + doctype
-          
-          puts 'r: '  + r.inspect if opt[:debug]
-          
-          return contents unless r
-
-          require r.text('require')
-          
-          obj = Object.const_get(r.text('class')).new
-          obj.import contents
-          obj
-          
-        else
-          
-          contents
-          
-        end
+        obj = opt[:auto] ? objectize(contents) :   contents
         
         [obj, :file]
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   +rB3ZZRITz3UYJX4CRAhjbCFz5Cxnpy9Vak6Qd9BWwl5Zv09QPxO3W+CIFDO+VpN
   MnDB4XRJPLbz3OzpiLtqEWES
   -----END CERTIFICATE-----
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc