rxfreader 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c771adeccd1e72c4ece1074e644fe3ed1d368b415b298a766be843fca0d8199b
-  data.tar.gz: 7ce5c6dc0c1e29031e5ae25e4d7ec11c029380425ab0479b725ba7e16c0cb84e
+  metadata.gz: f4cbe4e77e93e40c6fa085b6916e58c9cfb70438c21295877d7890f122961a52
+  data.tar.gz: db8ffdb4a7d38a29442f414e5d793ac80effa2653bc5cbc9b3ef78b6cd925369
 SHA512:
-  metadata.gz: 13e8b31cca1a5979e6582490babef00147483ce3a077d6b95c3fa2fd3edb6808b8f19e8a49367cc0a99526726b333db474ad2edf366715a0f08e294ee6bd57aa
-  data.tar.gz: 31aeb2a5b65d78364e81893d229003e81e358e9fb71d40c02ea637b9068b6fa0ea971df7f659c031883fded45d4da3025a118764a3911003743a7793c464fdac
+  metadata.gz: 39fbbe11535c2ae606dfe9a11508036747cfd2ac989f62719b695307f28d91bf6a674776f1c307095f671520cf4bc6dac00d918b7a81547861953ed06ecbe805
+  data.tar.gz: 1b7867cba68181db1089c5230cfc7d83fe1cac1d2d9811c4a0ac9318fe57e65ac541f75ac7b07be48e772ba03b62de00a62453a08b1dc3d2efee849a9da848e4

data/lib/rxfreader.rb

@@ -16,7 +16,8 @@ module RXFRead
 
   class FileX
 
-    def self.exists?(s)   RXFReader.exists?(s)     end
+    def self.exist?(s)    RXFReader.exist?(s)       end    
+    def self.exists?(s)   RXFReader.exist?(s)       end
     def self.filetype(s)  RXFReader.filetype(s)     end
     def self.read(s)      RXFReader.read(s).first   end
 
@@ -31,7 +32,7 @@ end
 class RXFReader
   using ColouredText
 
-  def self.exists?(filename)
+  def self.exist?(filename)
 
     type = self.filetype(filename)
 
@@ -46,145 +47,12 @@ class RXFReader
 
     return nil unless filex
 
-    filex.exists? filename
-
-  end
-
-  def self.filetype(x)
-
-    return :string if x.lines.length > 1
-
-    case x
-    when /^https?:\/\//
-      :http
-    when /^dfs:\/\//
-      :dfs
-    when /^file:\/\//
-      :file
-    else
-
-      if File.exists?(x) then
-        :file
-      else
-        :text
-      end
-
-    end
-  end
-
-  def self.read(x, h={})
-
-    opt = {debug: false, auto: false}.merge(h)
-
-    debug = opt[:debug]
-
-    raise RXFReaderException, 'nil found, expected a string' if x.nil?
-
-    if x.class.to_s =~ /Rexle$/ then
-
-      [x.xml, :rexle]
-
-    elsif x.strip[/^<(\?xml|[^\?])/] then
-
-      [x, :xml]
-
-    elsif x.lines.length == 1 then
-
-      if x[/^https?:\/\//] then
-
-        puts 'before GPDRequest'.info if debug
-
-        r = if opt[:username] and opt[:password] then
-          GPDRequest.new(opt[:username], opt[:password]).get(x)
-        else
-          response = RestClient.get(x)
-        end
-
-        case r.code
-        when '404'
-          raise(RXFReaderException, "404 %s not found" % x)
-        when '401'
-          raise(RXFReaderException, "401 %s unauthorized access" % x)
-        end
-
-        [r.body, :url]
-
-      elsif  x[/^dfs:\/\//] then
-
-        r = DfsFile.read(x).force_encoding('UTF-8')
-        [r, :dfs]
-
-
-      elsif x[/^file:\/\//] or File.exists?(x) then
-
-        puts 'RXFHelper.read before File.read' if debug
-        contents = File.read(File.expand_path(x.sub(%r{^file://}, '')))
-
-        [contents, :file]
-
-      elsif x =~ /\s/
-        [x, :text]
-      elsif DfsFile.exists?(x)
-        [DfsFile.read(x).force_encoding('UTF-8'), :dfs]
-      else
-        [x, :unknown]
-      end
-
-    else
-
-      [x, :unknown]
-    end
-  end
-
-  def self.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
-module RXFRead
-
-  class FileX
-
-    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
+    filex.exist? filename
 
   end
-
-end
-
-
-class RXFReaderException < Exception
-end
-
-class RXFReader
-  using ColouredText
-
+  
   def self.exists?(filename)
-
-    type = self.filetype(filename)
-
-    filex = case type
-    when :file
-      File
-    when :dfs
-      DfsFile
-    else
-      nil
-    end
-
-    return nil unless filex
-
-    filex.exists? filename
-
+    self.exist?(filename)
   end
 
   def self.filetype(x)
@@ -200,7 +68,7 @@ class RXFReader
       :file
     else
 
-      if File.exists?(x) then
+      if File.exist?(x) then
         :file
       else
         :text
@@ -209,10 +77,10 @@ class RXFReader
     end
   end
 
-  def self.read(x, h={})
-
+  def self.read(x, h={})   
+    
     opt = {debug: false, auto: false}.merge(h)
-
+    
     debug = opt[:debug]
 
     raise RXFReaderException, 'nil found, expected a string' if x.nil?
@@ -222,51 +90,51 @@ class RXFReader
       [x.xml, :rexle]
 
     elsif x.strip[/^<(\?xml|[^\?])/] then
-
+      
       [x, :xml]
 
     elsif x.lines.length == 1 then
 
       if x[/^https?:\/\//] then
-
+        
         puts 'before GPDRequest'.info if debug
-
+        
         r = if opt[:username] and opt[:password] then
           GPDRequest.new(opt[:username], opt[:password]).get(x)
         else
           response = RestClient.get(x)
         end
-
+        
         case r.code
-        when '404'
+        when '404'          
           raise(RXFReaderException, "404 %s not found" % x)
-        when '401'
+        when '401'          
           raise(RXFReaderException, "401 %s unauthorized access" % x)
         end
-
+        
         [r.body, :url]
-
+        
       elsif  x[/^dfs:\/\//] then
-
+        
         r = DfsFile.read(x).force_encoding('UTF-8')
         [r, :dfs]
+        
 
-
-      elsif x[/^file:\/\//] or File.exists?(x) then
-
+      elsif x[/^file:\/\//] or File.exist?(x) then
+        
         puts 'RXFHelper.read before File.read' if debug
         contents = File.read(File.expand_path(x.sub(%r{^file://}, '')))
-
+        
         [contents, :file]
-
+        
       elsif x =~ /\s/
         [x, :text]
-      elsif DfsFile.exists?(x)
+      elsif DfsFile.exist?(x)
         [DfsFile.read(x).force_encoding('UTF-8'), :dfs]
       else
         [x, :unknown]
       end
-
+      
     else
 
       [x, :unknown]
@@ -288,5 +156,5 @@ class RXFReader
     reveal(url, a << uri_str)
   end
 
-
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfreader
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   ZhYGFOGLCyFBzNWg6gwMKjzpzDZB/H0+GTRB2c3+7DVuJWqyC5SbGnVLkT4Q8+B6
   Ws39Z48SRONdDWtHwAiUtnU+
   -----END CERTIFICATE-----
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpd-request