rxfhelper 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc697b75550b4e156ba5b97cb7a5944d82b4e1695a543759ca664f1e7d3bba2
-  data.tar.gz: f86a10a6c29dc64a9676bc4662d611fdf465e5dd59bd9c1abe2aceed74a94bd2
+  metadata.gz: dcd17284d8b25c5e1f13822ac915ae2aea99f35d5f16a7d60e75de6a5375ec6f
+  data.tar.gz: 1219b2fa5db461da843aa8e34044ce233c0d5f4efe36fe06d065a97a4690f436
 SHA512:
-  metadata.gz: 510fb702f882209f7328be1111c26d37217c77ea0abd35a90082dd14bc38a47d80adc76fd85cd90d553b36cacff893dd9570ae275f0f09c4082abfa19c975c8e
-  data.tar.gz: b7c56bf83303c4fdaefd83970fce08c03e6350b11180978c2634240ee1a5501f92eb43245b556a7fd0c0274f958f47e53e1dd6b429f4ccef9458dd7cb644eb16
+  metadata.gz: 17dad46db34c4de8354b0a2e74081844e79b9e7ad60f3a494a4d1382f047892b35358077c2025b3efc69079ee8852a447a39238329e817a213700f719545556f
+  data.tar.gz: 1e40245b0342bc97eb8f3500f22c15113b0e57cd82e208f07f3d2af3d5d8cf758bfb55e9f0736a35024060ffc62e1d04ee415966e54552a1d46147014d6e5f77

data/lib/rxfhelper.rb

@@ -3,13 +3,9 @@
 # file: rxfhelper.rb
 
 require 'rsc'
-#require 'gpd-request'
-require 'rest-client'
-require 'mymedia_ftp'
-require 'drb_fileclient'
 require 'drb_reg_client'
 require 'remote_dwsregistry'
-require 'dir-to-xml'
+require 'rxfileio'
 
 
 
@@ -17,135 +13,32 @@ require 'dir-to-xml'
 #        using the Registry feaure to look up objects automatically.
 
 module RXFHelperModule
+  include RXFileIOModule
 
-  class DirX
+  def FileX.exists?(s)  RXFHelper.exists?(s)   end
+  def FileX.filetype(x) RXFHelper.filetype(s)  end
 
-    def self.chdir(s)  RXFHelper.chdir(s)   end
-    def self.glob(s)   RXFHelper.glob(s)    end
-    def self.mkdir(s)  RXFHelper.mkdir(s)   end
-    def self.pwd()     RXFHelper.pwd()      end
-
-  end
-
-  class FileX
-
-    def self.chdir(s)  RXFHelper.chdir(s)   end
-
-    def self.directory?(filename)
-
-      type = self.filetype(filename)
-
-      filex = case type
-      when :file
-        File
-      when :dfs
-        DfsFile
-      else
-        nil
-      end
-
-      return nil unless filex
-
-      filex.directory? filename
-
-    end
-
-    def self.exists?(filename)
-
-      type = self.filetype(filename)
-
-      filex = case type
-      when :file
-        File
-      when :dfs
-        DfsFile
-      when :sqlite
-        host = filename[/(?<=^sqlite:\/\/)[^\/]+/]
-        DRbObject.new nil, "druby://#{host}:57000"
-      else
-        nil
-      end
-
-      return nil unless filex
-
-      filex.exists? filename
-
-    end
-
-    def self.exist?(filename)
-      exists? filename
-    end
-
-    def self.filetype(x)
-
-      return :string if x.lines.length > 1
-
-      case x
-      when /^rse:\/\//
-        :rse
-      when /^https?:\/\//
-        :http
-      when /^dfs:\/\//
-        :dfs
-      when /^sqlite:\/\//
-        :sqlite
-      when /^file:\/\//
-        :file
-      else
-
-        if File.exists?(x) then
-          :file
-        else
-          :text
-        end
-
-      end
-    end
-
-    def self.chmod(num, s) RXFHelper.chmod(num, s)     end
-    def self.cp(s, s2)     RXFHelper.cp(s, s2)      end
-    def self.ls(s)         RXFHelper.ls(s)          end
-    def self.mkdir(s)      RXFHelper.mkdir(s)       end
-    def self.mkdir_p(s)    RXFHelper.mkdir_p(s)     end
-    def self.mv(s, s2)     RXFHelper.mv(s, s2)      end
-    def self.pwd()         RXFHelper.pwd()          end
-    def self.read(x)       RXFHelper.read(x).first  end
-    def self.rm(s)         RXFHelper.rm(s)          end
-
-    def self.rm_r(s, force: false)
-      RXFHelper.rm_r(s, force: force)
-    end
-
-    def self.ru(s)         RXFHelper.ru(s)          end
-    def self.ru_r(s)       RXFHelper.ru_r(s)        end
-
-    def self.touch(s, mtime: Time.now)
-      RXFHelper.touch(s, mtime: mtime)
-    end
-
-    def self.write(x, s)   RXFHelper.write(x, s)    end
-    def self.zip(s, a)     RXFHelper.zip(s, a)      end
-
-  end
 end
 
+=begin
+  # 20th February 2022 # JR
+  # the following code has been commented out because it appears to be redundant
 class URL
 
   def self.join(*a)
     a.map {|x| x.sub(/(?:^\/|\/$)/,'') }.join '/'
   end
 end
-
+=end
 
 class RXFHelperException < Exception
 end
 
 # Read XML File Helper
 #
-class RXFHelper
+class RXFHelper < RXFileIO
   using ColouredText
 
-  @fs = :local
 
   def self.call(s)
 
@@ -162,66 +55,54 @@ class RXFHelper
 
   end
 
-  def self.chmod(permissions, s)
+  def self.exists?(filename)
 
-    return unless permissions.is_a? Integer
-    return unless s.is_a? String
+    type = self.filetype(filename)
 
-    if s[/^dfs:\/\//] or @fs[0..2] == 'dfs' then
-      DfsFile.chmod permissions, s
+    filex = case type
+    when :file
+      File
+    when :dfs
+      DfsFile
+    when :sqlite
+      host = filename[/(?<=^sqlite:\/\/)[^\/]+/]
+      DRbObject.new nil, "druby://#{host}:57000"
     else
-      FileUtils.chmod permissions, s
+      nil
     end
 
-  end
+    return nil unless filex
 
-  def self.cp(s1, s2, debug: false)
+    filex.exists? filename
 
-    puts 'inside RXFHelper.cp' if debug
+  end
 
-    found = [s1,s2].grep /^\w+:\/\//
-    puts 'found: ' + found.inspect if debug
+  def self.filetype(x)
 
-    if found.any? then
+    return :string if x.lines.length > 1
 
-      case found.first[/^\w+(?=:\/\/)/]
+    case x
+    when /^rse:\/\//
+      :rse
+    when /^https?:\/\//
+      :http
+    when /^dfs:\/\//
+      :dfs
+    when /^sqlite:\/\//
+      :sqlite
+    when /^file:\/\//
+      :file
+    else
 
-      when 'dfs'
-        DfsFile.cp(s1, s2)
-      when 'ftp'
-        MyMediaFTP.cp s1, s2
+      if File.exists?(x) then
+        :file
       else
-
+        :text
       end
 
-    else
-
-      FileUtils.cp s1, s2
-
     end
   end
 
-  def self.chdir(x)
-
-    # We can use @fs within chdir() to flag the current file system.
-    # Allowing us to use relative paths with FileX operations instead
-    # of explicitly stating the path each time. e.g. touch 'foo.txt'
-    #
-
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
-
-      @fs = :local
-      FileUtils.chdir x
-
-    elsif x[/^dfs:\/\//]
-
-      host = x[/(?<=dfs:\/\/)[^\/]+/]
-      @fs = 'dfs://' + host
-      DfsFile.chdir x
-
-    end
-
-  end
 
   def self.get(x)
 
@@ -242,57 +123,6 @@ class RXFHelper
 
   end
 
-  def self.glob(s)
-
-    if s[/^dfs:\/\//] then
-      DfsFile.glob(s)
-    else
-      Dir.glob(s)
-    end
-
-  end
-
-  def self.ls(x='*')
-
-    return Dir[x] if File.exists?(File.dirname(x))
-
-    case x[/^\w+(?=:\/\/)/]
-    when 'file'
-      Dir[x]
-    when 'dfs'
-      DfsFile.ls x
-    when 'ftp'
-      MyMediaFTP.ls x
-    else
-
-    end
-
-  end
-
-  def self.mkdir(x)
-
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
-      FileUtils.mkdir x
-    elsif x[/^dfs:\/\//]
-      DfsFile.mkdir x
-    end
-
-  end
-
-  def self.mkdir_p(x)
-
-    if x[/^dfs:\/\//] or @fs[0..2] == 'dfs' then
-      DfsFile.mkdir_p x
-    else
-      FileUtils.mkdir_p x
-    end
-
-  end
-
-  def self.mv(s1, s2)
-    DfsFile.mv(s1, s2)
-  end
-
   # used by self.read
   #
   def self.objectize(contents)
@@ -310,11 +140,6 @@ class RXFHelper
     obj
   end
 
-  def self.pwd()
-
-    DfsFile.pwd
-
-  end
 
   def self.read(x, h={})
 
@@ -360,7 +185,7 @@ class RXFHelper
 
       elsif  x[/^dfs:\/\//] then
 
-        r = DfsFile.read(x)
+        r = DfsFile.read(x).force_encoding('UTF-8')
         [opt[:auto] ? objectize(r) : r, :dfs]
 
       elsif  x[/^ftp:\/\//] then
@@ -392,7 +217,7 @@ class RXFHelper
       elsif x =~ /\s/
         [x, :text]
       elsif DfsFile.exists?(x)
-        [DfsFile.read(x), :dfs]
+        [DfsFile.read(x).force_encoding('UTF-8'), :dfs]
       else
         [x, :unknown]
       end
@@ -403,113 +228,6 @@ class RXFHelper
     end
   end
 
-  def self.rm(filename)
-
-    case filename[/^\w+(?=:\/\/)/]
-    when 'dfs'
-      DfsFile.rm filename
-    when 'ftp'
-      MyMediaFTP.rm filename
-    else
-
-      if File.basename(filename) =~ /\*/ then
-
-        Dir.glob(filename).each do |file|
-
-          begin
-            FileUtils.rm file
-          rescue
-            puts ('RXFHelper#rm: ' + file + ' is a Directory').warning
-          end
-
-        end
-
-      else
-        FileUtils.rm filename
-      end
-
-    end
-
-  end
-
-  def self.rm_r(filename, force: false)
-
-    case filename[/^\w+(?=:\/\/)/]
-    when 'dfs'
-      DfsFile.rm_r filename, force: force
-    #when 'ftp'
-    #  MyMediaFTP.rm filename
-    else
-
-      if File.basename(filename) =~ /\*/ then
-
-        Dir.glob(filename).each do |file|
-
-          begin
-            FileUtils.rm_r file, force: force
-          rescue
-            puts ('RXFHelper#rm: ' + file + ' is a Directory').warning
-          end
-
-        end
-
-      else
-        FileUtils.rm_r filename, force: force
-      end
-
-    end
-
-  end
-
-  # recently_updated
-  #
-  def self.ru(path='.')
-
-    case path[/^\w+(?=:\/\/)/]
-    when 'dfs'
-      DfsFile.ru path
-
-    else
-
-      DirToXML.new(path, recursive: false, verbose: false).latest
-
-    end
-
-  end
-
-  # recently updated recursively check directories
-  #
-  def self.ru_r(path='.')
-
-    case path[/^\w+(?=:\/\/)/]
-    when 'dfs'
-      DfsFile.ru_r path
-
-    else
-
-      DirToXML.new(path, recursive: true, verbose: false).latest
-
-    end
-
-  end
-
-  def self.touch(filename, mtime: Time.now)
-
-    if @fs[0..2] == 'dfs' then
-      return DfsFile.touch(@fs + pwd + '/' + filename, mtime: mtime)
-    end
-
-    case filename[/^\w+(?=:\/\/)/]
-    when 'dfs'
-      DfsFile.touch filename, mtime: mtime
-    #when 'ftp'
-    #  MyMediaFTP.touch filename
-    else
-      FileUtils.touch filename, mtime: mtime
-    end
-
-  end
-
   def self.write(location, s=nil)
 
     case location
@@ -541,22 +259,9 @@ class RXFHelper
 
   end
 
-  def self.writeable?(source)
-
-    return false if source.lines.length > 1
-
-    if not source =~ /:\/\// then
-
-      return true if File.exists? source
-
-    else
-
-      return true if source =~ /^dfs:/
-
-    end
-
-    return false
-  end
+=begin
+  # 20th February 2022 # JR
+  # the following code has been commented out because it appears to be redundant
 
   def self.absolute_url(page_url, item_location)
 
@@ -572,6 +277,7 @@ class RXFHelper
         File.join page_url[/.*\//], item_location
     end
   end
+=end
 
   def self.post(uri, x=nil)
 
@@ -606,7 +312,4 @@ class RXFHelper
 
   end
 
-  def self.zip(filename, a)
-    DfsFile.zip(filename, a)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   MrrH8cS6bqJRPQqEL1FsPmXfQpp86RvPSr0WqNSRnYEUCmqL0l2pYrXdPAyBLcji
   X1jPyhH0sl/QdPdaUnsigze+
   -----END CERTIFICATE-----
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -58,105 +58,65 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
-  name: drb_fileclient
+  name: remote_dwsregistry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: mymedia_ftp
+  name: drb_reg_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: remote_dwsregistry
+  name: rxfileio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: drb_reg_client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.2.2
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -183,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Helpful library for primarily reading the contents of a file either from