NOT TO BE MERGED - JUST SHOWS DIFFERENCE from 4.0.2 to 4.0.3

.github/pull_request_template.md

@@ -3,6 +3,7 @@ IMPORTANT NOTES:
 - Changes should always be made only in the raw .md files and not in the CSV, JSON, XLSX, PDF, DOCX files, etc.
 - Please do not open a pull request without first opening an associated issue.
 - Please carry out all discussion in the associated issue only.
+- Please refer to the following link for guidance on labeling contributions https://github.com/OWASP/ASVS/blob/master/CONTRIBUTING.md
 -->
 
 This Pull Request relates to issue #...

4.0/asvs.py

@@ -50,6 +50,8 @@ class ASVS:
         "provides developers with a list of requirements for secure development."
 
     asvs_flat = []
+    asvs_flat2 = {}
+    asvs_flat2['requirements'] = []
 
     def __init__(self, language):    
 
@@ -129,15 +131,16 @@ def __init__(self, language):
                     if m:
 
                         req_flat = {}
-                        req_flat['chapter_id'] = chapter['Shortcode']
-                        req_flat['chapter_name'] = chapter['Name']
+                        req_flat2 = {}
+                        req_flat2['Section'] = req_flat['chapter_id'] = chapter['Shortcode']
+                        req_flat2['Name'] = req_flat['chapter_name'] = chapter['Name']
                         req_flat['section_id'] = section['Shortcode']
                         req_flat['section_name'] = section['Name']
 
                         req = {}
-                        req_flat['req_id'] = req['Shortcode'] = "V" + m.group(1)
+                        req_flat2['Item'] = req_flat['req_id'] = req['Shortcode'] = "V" + m.group(1)
                         req['Ordinal'] = int(m.group(1).rsplit('.', 1)[1])
-                        req_flat['req_description'] = req['Description'] = m.group(2)
+                        req_flat2['Description'] = req_flat['req_description'] = req['Description'] = m.group(2)
 
                         level1 = {}
                         level2 = {}
@@ -148,8 +151,11 @@ def __init__(self, language):
                         req_flat['level3'] = m.group(5).strip(' ')
 
                         level1['Required'] = m.group(3).strip() != ''
+                        req_flat2['L1'] = ('X' if level1['Required'] else '')
                         level2['Required'] = m.group(4).strip() != ''
+                        req_flat2['L2'] = ('X' if level2['Required'] else '')
                         level3['Required'] = m.group(5).strip() != ''
+                        req_flat2['L3'] = ('X' if level3['Required'] else '')
 
                         level1['Requirement'] = ("Optional" if m.group(3).strip('✓ ') == "o" else m.group(3).strip('✓ '))
                         level2['Requirement'] = ("Optional" if m.group(4).strip('✓ ') == "o" else m.group(4).strip('✓ '))
@@ -160,17 +166,22 @@ def __init__(self, language):
                         req['L3'] = level3
 
                         req['CWE'] = [int(i.strip()) for i in filter(None, m.group(6).strip().split(','))]
-                        req_flat['cwe'] = m.group(6).strip()
+                        req_flat2['CWE'] = req_flat['cwe'] = m.group(6).strip()
                         req['NIST'] = [str(i.strip()) for i in filter(None,m.group(7).strip().split('/'))]
-                        req_flat['nist'] = m.group(7).strip()
+                        req_flat2['NIST'] = req_flat['nist'] = m.group(7).strip()
 
                         section['Items'].append(req)
                         self.asvs_flat.append(req_flat)
+                        self.asvs_flat2['requirements'].append(req_flat2)
 
     def to_json(self):
         ''' Returns a JSON-formatted string '''
         return json.dumps(self.asvs, indent = 2, sort_keys = False).strip()
 
+    def to_json_flat(self):
+        ''' Returns a JSON-formatted string which is flattened and simpler '''
+        return json.dumps(self.asvs_flat2, indent = 2, sort_keys = False).strip()
+
     def to_xmlOLD(self):
         ''' Returns XML '''
         xml = ''