whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Redirect to replacement
Date Thu, 04 May 2017 09:19:50 GMT
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  0650efa   Redirect to replacement
0650efa is described below

commit 0650efaa4ab1920cbe21c1e4675608062ae09a3e
Author: Sebb <sebb@apache.org>
AuthorDate: Thu May 4 10:19:48 2017 +0100

    Redirect to replacement
---
 www/test/site-check.cgi | 149 ++----------------------------------------------
 1 file changed, 4 insertions(+), 145 deletions(-)

diff --git a/www/test/site-check.cgi b/www/test/site-check.cgi
index 0410953..67e96fd 100755
--- a/www/test/site-check.cgi
+++ b/www/test/site-check.cgi
@@ -1,147 +1,6 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
-require 'json'
-require 'whimsy/asf'
-require 'wunderbar'
-require 'wunderbar/bootstrap'
-require 'wunderbar/jquery/stupidtable'
-require 'net/http'
 
-PAGETITLE = 'Apache TLP Website Link Checks'
-cols = %w( events foundation license sponsorship security thanks copyright trademarks )
-DATAURI = 'https://whimsy.apache.org/public/site-scan.json'
-
-def analyze(sites)
-    success = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
-    counts = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
-    { 
-      'copyright' => %r{Copyright [^.]+ Apache Software Foundation}i, # Do we need '[Tt]he
ASF'?
-      # TODO more checks needed here, e.g. ASF registered and 3rd party marks
-      'trademarks' => %r{trademarks of [Tt]he Apache Software Foundation}i,
-      'events' => %r{apache.org/events/current-event}i,
-      'license' => %r{apache.org/licenses/$}i, # should link to parent license page only
-      'sponsorship' => %r{apache.org/foundation/sponsorship}i,
-      'security' => %r{apache.org/security}i,
-      'thanks' => %r{apache.org/foundation/thanks}i
-    }.each do |nam, pat|
-      success[nam] = sites.select{ |k, site| site[nam] =~ pat  }.keys
-      counts[nam]['label-success'] = success[nam].count
-      counts[nam]['label-warning'] = 0 # Reorder output 
-      counts[nam]['label-danger'] = sites.select{ |k, site| site[nam].nil? }.count
-      counts[nam]['label-warning'] = sites.size - counts[nam]['label-success'] - counts[nam]['label-danger']
-    end
-    
-    [
-      counts, {
-      'label-success' => '# Sites with links to primary ASF page',
-      'label-warning' => '# Sites with link, but not an expected ASF one',
-      'label-danger' => '# Sites with no link for this topic'
-      }, success
-    ]
-end
-
-_html do
-  _head do
-    _style %{
-      .table td {font-size: smaller;}
-    }
-  end
-
-  _body? do
-
-    local_copy = File.expand_path('../public/site-scan.json').untaint
-
-    if File.exist? local_copy
-      crawl_time = File.mtime(local_copy).rfc2822
-      sites = JSON.parse(File.read(local_copy))
-    else
-      response = Net::HTTP.get_response(URI(DATAURI))
-      crawl_time = response['last-modified']
-      sites = JSON.parse(response.body)
-    end
-    analysis = analyze(sites)
-    
-    _whimsy_header PAGETITLE
-
-    _whimsy_content do
-      _div.panel.panel_default do
-        _div!.panel_heading 'Common Links Found On TLP Sites'
-        _div.panel_body do
-          _ 'Current (beta) status of Apache PMC top level websites vis-a-vis '
-          _a 'required links', href: 'https://www.apache.org/foundation/marks/pmcs#navigation'
-          _ '.  '
-          _a 'See crawler code', href: 'https://whimsy.apache.org/tools/site-check.rb'
-          _ ' and '
-          _a 'raw JSON data', href: DATAURI         
-          _ ".  Last crawl time: #{crawl_time} over #{sites.size} sites."
-          _br
-          _ul do
-            analysis[1].each do |cls, desc|
-              _li.label desc, class: cls
-            end
-          end  
-        end
-      end
-      _table.table.table_condensed.table_striped do
-        _thead do  
-          _tr do
-            _th! 'Project', data_sort: 'string-ins'
-            cols.each do |col|
-              _th! data_sort: 'string' do 
-                _ col.capitalize
-                _br
-                analysis[0][col].each do |cls, val|
-                  _ ' '
-                  _span.label val, class: cls
-                end
-              end
-            end
-          end
-        end
-
-        _tbody do
-          sites.each do |n, links|
-            _tr do
-              _td do 
-                _a! "#{links['display_name']}", href: links['uri']
-              end
-              cols.each do |c|
-                if analysis[2].include? c and not analysis[2][c].include? n
-                    cls = 'label-warning'
-                else
-                    cls = '' # link not present or link OK
-                end
-                if not links[c]
-                  _td ''
-                elsif links[c] =~ /^http/
-                  _td do
-                    _a links[c].sub(/https?:\/\//, '').
-                      sub(/(www\.)?apache\.org/i, 'a.o'), href: links[c], class: cls
-                  end
-                else
-                  _td links[c].gsub(/Apache Software Foundation/,'ASF'), class: cls
-                end
-              end
-            end
-          end
-        end
-      end
-    end      
-
-    _script %{
-      var table = $(".table").stupidtable();
-      table.on("aftertablesort", function (event, data) {
-        var th = $(this).find("th");
-        th.find(".arrow").remove();
-        var dir = $.fn.stupidtable.dir;
-        var arrow = data.direction === dir.ASC ? "&uarr;" : "&darr;";
-        th.eq(data.column).append('<span class="arrow">' + arrow +'</span>');
-      });
-    }
-    _whimsy_footer({
-      "https://www.apache.org/foundation/marks/pmcs" => "Apache Project Branding Policy",
-      "https://www.apache.org/foundation/marks/resources" => "Trademark Site Map",
-      "https://www.apache.org/foundation/marks/list/" => "Official Apache Trademark List"
-    })
-  end
-end
+print "Status: 301 Moved Permanently\r\n"
+print "Location: ../site/\r\n"
+print "\r\n"
+exit

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message