[whimsy] branch master updated: Parameterise and simplify

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 345eed2  Parameterise and simplify
345eed2 is described below

commit 345eed29a9d6dc8e78861a10e85508582132d265
Author: Sebb <s...@apache.org>
AuthorDate: Sat Jul 11 16:26:03 2020 +0100

    Parameterise and simplify
---
 lib/whimsy/asf/documents.rb | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/lib/whimsy/asf/documents.rb b/lib/whimsy/asf/documents.rb
index dad6a75..34fd239 100644
--- a/lib/whimsy/asf/documents.rb
+++ b/lib/whimsy/asf/documents.rb
@@ -103,8 +103,9 @@ module ASF
   end
 
   class EmeritusFiles
+    @base = 'emeritus'
     def self.listnames
-      _, list = ASF::SVN.getlisting('emeritus')
+      _, list = ASF::SVN.getlisting(@base)
       list
     end
 
@@ -141,43 +142,25 @@ module ASF
     # nil if it is not in this directory
     def self.extractfilename(fileurl)
       return nil unless fileurl
-      root_url = ASF::SVN.svnurl('emeritus') + '/'
+      root_url = ASF::SVN.svnurl(@base) + '/'
       extractfilenamefrom(root_url, fileurl)
     end
   end
 
   class EmeritusRequestFiles < EmeritusFiles
-    def self.listnames
-      _, list = ASF::SVN.getlisting('emeritus-requests-received')
-      list
-    end
-    # Extract the file name if it is in emeritus-requests-received
-    # nil if it is not in this directory
-    def self.extractfilename(fileurl)
-      root_url = ASF::SVN.svnurl('emeritus-requests-received') + '/'
-      extractfilenamefrom(root_url, fileurl)
-    end
+    @base = 'emeritus-requests-received'
   end
 
   class EmeritusRescindedFiles < EmeritusFiles
-    def self.listnames
-      _, list = ASF::SVN.getlisting('emeritus-requests-rescinded')
-      list
-    end
+    @base = 'emeritus-requests-rescinded'
   end
 
   class EmeritusReinstatedFiles < EmeritusFiles
-    def self.listnames
-      _, list = ASF::SVN.getlisting('emeritus-reinstated')
-      list
-    end
+    @base = 'emeritus-reinstated'
   end
 
   class COIFiles < EmeritusFiles
-    def self.listnames
-      _, list = ASF::SVN.getlisting('conflict-of-interest')
-      list
-    end
+    @base = 'conflict-of-interest'
   end
 
 end