rxfreader 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c5cd88a74400b7e567f87155effc79c2765c6c93edf8430cc770aab6658f9d
-  data.tar.gz: 9f82b705e8154d26d89277fdf7cc6a2a37bf7abcec73631a3c8e661d79e1084a
+  metadata.gz: 439ac6839199c6d53cb40bbf2a56a73666ecd8c3119a141249284c6dd3c4d2d3
+  data.tar.gz: b67ef02d5fe587838eb6b9647e422b57e4c4528ced5d44b9238a110a26803d7b
 SHA512:
-  metadata.gz: 64c81ead21828a0c2401c940736872cb788058bb2884a2a7f133d8ebc767e0020cc46994f1a02a267cf2aa24e752fcb3c9b9511d727a7997a991c49573a2210a
-  data.tar.gz: 95025bc99aafe7053c545f90a932e57efc2330e5f5b5bafa512bf63e3fcf942b563084f14e618495d3959774d59030827f5e4cbe28695b58ddbca7c2ec28e9a5
+  metadata.gz: 0e5498c3ad23d1afd698c6d72800b505c28ec78ab5643d99b8f0b7d45cd1845289adabe01941c4f5b0cc2c304de51144975f0730e92cedb56593f6feb6776296
+  data.tar.gz: b087e28234b235fb6110a328a0ed3a752ff4482c58974c8922fa560acd851d98c4426806d5265b10548b26761d85dbfeb889254026a9cf63ec5136a30d1497e8

data/lib/rxfreader.rb

@@ -2,7 +2,8 @@
 
 # file: rxfreader.rb
 
-
+require 'net/http'
+require 'uri'
 require 'gpd-request'
 require 'rest-client'
 require 'drb_fileclient-reader'
@@ -15,61 +16,61 @@ module RXFRead
 
   class FileX
 
-    def self.exists?(filename)
+    def self.exists?(s)   RXFReader.exists?(s)     end
+    def self.filetype(s)  RXFReader.filetype(s)     end
+    def self.read(s)      RXFReader.read(s).first   end
 
-      type = FileX.filetype(filename)
+  end
 
-      filex = case type
-      when :file
-        File
-      when :dfs
-        DfsFile
-      else
-        nil
-      end
+end
 
-      return nil unless filex
 
-      filex.exists? filename
+class RXFReaderException < Exception
+end
 
-    end
+class RXFReader
+  using ColouredText
 
+  def self.exists?(filename)
 
-    def self.filetype(x)
+    type = self.filetype(filename)
 
-      return :string if x.lines.length > 1
+    filex = case type
+    when :file
+      File
+    when :dfs
+      DfsFile
+    else
+      nil
+    end
 
-      case x
-      when /^https?:\/\//
-        :http
-      when /^dfs:\/\//
-        :dfs
-      when /^file:\/\//
-        :file
-      else
+    return nil unless filex
 
-        if File.exists?(x) then
-          :file
-        else
-          :text
-        end
+    filex.exists? filename
 
-      end
-    end
+  end
 
-    def self.read(x)
-      RXFReader.read(x).first
-    end
+  def self.filetype(x)
 
-  end
-end
+    return :string if x.lines.length > 1
 
+    case x
+    when /^https?:\/\//
+      :http
+    when /^dfs:\/\//
+      :dfs
+    when /^file:\/\//
+      :file
+    else
 
-class RXFReaderException < Exception
-end
+      if File.exists?(x) then
+        :file
+      else
+        :text
+      end
 
-class RXFReader
-  using ColouredText
+    end
+  end
 
   def self.read(x, h={})
 
@@ -79,7 +80,11 @@ class RXFReader
 
     raise RXFReaderException, 'nil found, expected a string' if x.nil?
 
-    if x.strip[/^<(\?xml|[^\?])/] then
+    if x.class.to_s =~ /Rexle$/ then
+
+      [x.xml, :rexle]
+
+    elsif x.strip[/^<(\?xml|[^\?])/] then
 
       [x, :xml]
 
@@ -131,4 +136,19 @@ class RXFReader
     end
   end
 
+  def reveal(uri_str, a=[])
+
+    response = Net::HTTP.get_response(URI.parse(uri_str))
+    url = case response
+      when Net::HTTPRedirection then response['location']
+    end
+
+    return a << uri_str if url.nil?
+
+    reveal(url, a << uri_str)
+  end
+
+end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfreader
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   ZhYGFOGLCyFBzNWg6gwMKjzpzDZB/H0+GTRB2c3+7DVuJWqyC5SbGnVLkT4Q8+B6
   Ws39Z48SRONdDWtHwAiUtnU+
   -----END CERTIFICATE-----
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpd-request
@@ -86,7 +86,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []