[whimsy] branch master updated: Drop duplicate code

[se...@apache.org]

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 7ad26d2  Drop duplicate code
7ad26d2 is described below

commit 7ad26d210a4c53eb62d447b118fad58313c0eef1
Author: Sebb <se...@apache.org>
AuthorDate: Wed Oct 21 16:00:57 2020 +0100

    Drop duplicate code
---
 www/foundation/orgchart.cgi   |  2 +-
 www/roster/main.rb            |  7 ++++---
 www/roster/models.rb          |  1 -
 www/roster/models/orgchart.rb | 40 ----------------------------------------
 4 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/www/foundation/orgchart.cgi b/www/foundation/orgchart.cgi
index 2a19ed7..a24e6b9 100755
--- a/www/foundation/orgchart.cgi
+++ b/www/foundation/orgchart.cgi
@@ -3,7 +3,7 @@ PAGETITLE = "Apache Corporate Organization Chart" # Wvisible:orgchart
 $LOAD_PATH.unshift '/srv/whimsy/lib'
 require 'json'
 require 'whimsy/asf'
-require 'whimsy/asf/orgchart' # New class not yet in gem; duplicates www/roster/models/orgchart
+require 'whimsy/asf/orgchart'
 require 'wunderbar'
 require 'wunderbar/bootstrap'
 require 'wunderbar/markdown'
diff --git a/www/roster/main.rb b/www/roster/main.rb
index d0cdd1b..f9e085a 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -7,6 +7,7 @@
 ENV['LANG'] = 'en_US.UTF-8'
 
 require 'whimsy/asf'
+require 'whimsy/asf/orgchart'
 
 require 'mail'
 require 'tmpdir'
@@ -352,7 +353,7 @@ end
 
 # Handle overall organization chart
 get '/orgchart/' do
-  @org = OrgChart.load
+  @org = ASF::OrgChart.load
   _html :orgchart
 end
 
@@ -364,9 +365,9 @@ get '/orgchart/:name' do |name|
     halt 401, "Not authorized\n"
   end
 
-  @org = OrgChart.load
+  @org = ASF::OrgChart.load
   @role = @org[name]
-  @desc = OrgChart.desc
+  @desc = ASF::OrgChart.desc
   pass unless @role
 
   @oversees = @org.select do |role, duties|
diff --git a/www/roster/models.rb b/www/roster/models.rb
index 0239483..5c59e01 100644
--- a/www/roster/models.rb
+++ b/www/roster/models.rb
@@ -4,7 +4,6 @@ require_relative 'models/committer'
 require_relative 'models/committee'
 require_relative 'models/nonpmc'
 require_relative 'models/group'
-require_relative 'models/orgchart'
 require_relative 'models/ppmc'
 
 require_relative 'models/ldap'
diff --git a/www/roster/models/orgchart.rb b/www/roster/models/orgchart.rb
deleted file mode 100644
index 2f37e83..0000000
--- a/www/roster/models/orgchart.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-class OrgChart
-  @@duties = {}
-  @@desc = {}
-
-  def self.load
-    @@source ||= ASF::SVN['personnel-duties']
-
-    Dir[File.join(@@source, '*.txt')].each do |file|
-      name = file[/.*\/(.*?)\.txt/, 1]
-      next if @@duties[name] and @@duties[name]['mtime'] > File.mtime(file).to_f
-      data = Hash[*File.read(file).split(/^\[(.*)\]\n/)[1..-1].map(&:strip)]
-      next unless data['info']
-      data['info'] = YAML.safe_load(data['info'])
-      data['mtime'] = File.mtime(file).to_f
-      @@duties[name] = data
-    end
-
-    file = File.join(@@source, 'README')
-    unless @@desc['mtime'] and @@desc['mtime'] > File.mtime(file).to_f
-      data = Hash[*File.read(file).split(/^\[(.*)\]\n/)[1..-1].map(&:strip)]
-      if data['info'] then
-        data = YAML.safe_load(data['info'])
-        data['mtime'] = File.mtime(file).to_f
-        @@desc = data
-      end
-    end
-
-    @@duties
-  end
-
-  def self.[](name)
-    self.load
-    @@duties[name]
-  end
-
-  def self.desc
-    self.load
-    @@desc
-  end
-end
\ No newline at end of file