Merge pull request #99 from OBOFoundry/allow-303-status

Add support for 303 See Other status, closes #94

config/obo.yml

@@ -39,13 +39,15 @@ entries:
 # Term redirects for CHEBI
 - regex: ^/obo/CHEBI_(\d+)$
   replacement: http://www.ebi.ac.uk/chebi/searchId.do?chebiId=CHEBI:$1
+  status: see other
   tests:
   - from: /CHEBI_15377
     to: http://www.ebi.ac.uk/chebi/searchId.do?chebiId=CHEBI:15377
 
 # Term redirects for HAO
 - regex: ^/obo/HAO_(\d+)$
   replacement: http://api.hymao.org/api/ontology/ontology_class/HAO_$1
+  status: see other
   tests:
   - from: /HAO_0000000
     to: http://api.hymao.org/api/ontology/ontology_class/HAO_0000000
@@ -54,6 +56,7 @@ entries:
 # Match digits or UniProt ID, see http://www.uniprot.org/help/accession_numbers
 - regex: ^/obo/PR_(\d+|[OPQ][0-9][A-Z0-9]{3}[0-9]|[A-NR-Z][0-9]([A-Z][A-Z0-9]{2}[0-9]){1,2})$
   replacement: http://pir.georgetown.edu/cgi-bin/pro/entry_pro?id=PR_$1
+  status: see other
   tests:
   - from: /PR_000000001
     to: http://pir.georgetown.edu/cgi-bin/pro/entry_pro?id=PR_000000001

tools/config.schema.yml

@@ -70,6 +70,10 @@ mapping:
             pattern: /^(https?|ftp)\:\/\/.+/
             required: true
             unique: false
+          "status":
+            type: str
+            required: false
+            pattern: /^(permanent|temporary|see other)$/
           "tests":
             type: seq
             required: false

tools/examples/test2.htaccess

@@ -4,4 +4,4 @@
 
 RedirectMatch temp "(?i)^/obo/test2/project$" "http://example.org/project.html"
 RedirectMatch temp "(?i)^/obo/test2/branches/(.*)$" "http://example.org/branches/$1"
-RedirectMatch temp "(?i)^/obo/test2/TEST_(\d+)$" "http://example.org/about/TEST_$1"
+RedirectMatch seeother "(?i)^/obo/test2/TEST_(\d+)$" "http://example.org/about/TEST_$1"

tools/examples/test2.yml

@@ -25,6 +25,7 @@ entries:
 
 - regex: (?i)^/obo/test2/TEST_(\d+)$
   replacement: http://example.org/about/TEST_$1
+  status: see other
   tests:
   - from: /TEST_1234
     replacement: http://example.org/about/TEST_1234

tools/test.py

@@ -160,10 +160,12 @@ def process_entry(base_url, i, entry):
   # Validate status code.
   status = '302'
   if 'status' in entry:
-    if entry['status'] == 'temporary':
-      status = '302'
-    elif entry['status'] == 'permanent':
+    if entry['status'] == 'permanent':
+      status = '301'
+    elif entry['status'] == 'temporary':
       status = '302'
+    elif entry['status'] == 'see other':
+      status = '303'
     else:
       raise ValueError('Invalid status "%s" for entry %d' % (entry['status'], i))
   test['status'] = status

tools/translate-entries.py

@@ -151,14 +151,16 @@ def process_entry(base_url, i, entry):
   # Validate status code
   status = 'temporary'
   if 'status' in entry:
-    if entry['status'] in ('temporary', 'permanent'):
+    if entry['status'] in ('permanent', 'temporary', 'see other'):
       status = entry['status']
     else:
       raise ValueError('Invalid status "%s" for entry %d' % (entry['status'], i))
 
-  # Note: Apache config uses "temp" instead of "temporary"
+  # Switch to Apache's preferred names
   if status == 'temporary':
     status = 'temp'
+  elif status == 'see other':
+    status = 'seeother'
 
   return 'RedirectMatch %s "%s" "%s"' % (status, source, replacement)