#331 Change the 'license' to 'license_key'

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/attrib.py

@@ -238,7 +238,7 @@ def generate_and_save(abouts, output_location, use_mapping=False, mapping_file=N
                        str(special_char_in_expression))
                 errors.append(Error(ERROR, msg))
             else:
-                about.license.value = lic_list
+                about.license_key.value = lic_list
 
     # Parse the vartext and save to the vartext dictionary
     if vartext:

src/attributecode/model.py

@@ -677,8 +677,8 @@ def create_fields(self):
             ('homepage_url', UrlField()),
             ('notes', StringField()),
 
-            ('license', ListField()),
             ('license_expression', StringField()),
+            ('license_key', ListField()),
             ('license_name', ListField()),
             ('license_file', FileTextField()),
             ('license_url', UrlField()),
@@ -752,7 +752,7 @@ def attribution_fields(fields):
         """
         attrib_fields = ['name',
                          'version',
-                         'license',
+                         'license_key',
                          'license_name',
                          'license_file',
                          'license_url',
@@ -1099,7 +1099,8 @@ def dump_lic(self, location, license_dict):
 
         if self.license_expression.present and not self.license_file.present:
             special_char_in_expression, lic_list = parse_license_expression(self.license_expression.value)
-            self.license = lic_list
+            self.license_key.value = lic_list
+            self.license_key.present = True
             if not special_char_in_expression:
                 for lic_key in lic_list:
                     try:
@@ -1394,8 +1395,8 @@ def by_license_content(abouts):
     grouped[''] = []
     no_license = grouped['']
     for about in abouts:
-        if about.license.value:
-            special_char_in_expression, lic_list = parse_license_expression(about.license.value)
+        if about.license_key.value:
+            special_char_in_expression, lic_list = parse_license_expression(about.license_key.value)
             if not special_char_in_expression:
                 for lic in lic_list:
                     if lic in grouped:

src/attributecode/templates/default_html.template

@@ -42,8 +42,8 @@
                     <pre class="component-notice">{{ about_object.notice_file.value[notice] }}</pre>
                 {% endfor %}
             {% endif %}
-            {% if about_object.license.value %}
-                {% for license_key in about_object.license.value %}
+            {% if about_object.license_key.value %}
+                {% for license_key in about_object.license_key.value %}
                     {% if license_key in common_licenses %}
                         <p>Full text of
                             <a class="{{ license_key }}" href="#component-license-{{ license_key }}">

tests/test_model.py

@@ -597,8 +597,8 @@ def test_About_dumps_does_not_transform_strings_in_lists(self):
 description: AboutCode is a tool to process ABOUT files. An ABOUT file is a file.
 homepage_url: http://dejacode.org
 notes:
-license: apache-2.0
 license_expression: apache-2.0
+license_key: apache-2.0
 license_name:
 license_file: apache-2.0.LICENSE
 license_url:
@@ -674,8 +674,8 @@ def test_field_names(self):
             'description',
             'homepage_url',
             'notes',
-            'license',
             'license_expression',
+            'license_key',
             'license_name',
             'license_file',
             'license_url',
@@ -748,8 +748,8 @@ def test_About_dumps(self):
     to process ABOUT files.
     An ABOUT file is a file.
 homepage_url: http://dejacode.org
-license: apache-2.0
 license_expression: apache-2.0
+license_key: apache-2.0
 license_file: apache-2.0.LICENSE
 copyright: Copyright (c) 2013-2014 nexB Inc.
 notice_file: NOTICE
@@ -859,7 +859,7 @@ def test_About_as_dict_with_empty(self):
                     'author': u'',
                     'copyright': u'Copyright (c) 2013-2014 nexB Inc.',
                     'description': u'AboutCode is a tool\nfor files.',
-                    'license': u'apache-2.0',
+                    'license_key': u'apache-2.0',
                     'license_expression': u'apache-2.0',
                     'name': u'AboutCode',
                     'owner': u'nexB Inc.'}
@@ -891,7 +891,7 @@ def test_About_as_dict_with_present(self):
                     'description': u'AboutCode is a tool\nfor files.',
                     'download_url': u'',
                     'homepage_url': u'',
-                    'license': u'apache-2.0',
+                    'license_key': u'apache-2.0',
                     'license_expression': u'apache-2.0',
                     'license_file': u'',
                     'license_name': u'',
@@ -930,7 +930,7 @@ def test_About_as_dict_with_nothing(self):
         expected = {'about_resource': u'.',
                     'copyright': u'Copyright (c) 2013-2014 nexB Inc.',
                     'description': u'AboutCode is a tool\nfor files.',
-                    'license': u'apache-2.0',
+                    'license_key': u'apache-2.0',
                     'license_expression': u'apache-2.0',
                     'name': u'AboutCode',
                     'owner': u'nexB Inc.'}

tests/testdata/as_dict/about.ABOUT

@@ -6,7 +6,7 @@ author:
 description: |
     AboutCode is a tool 
     for files.
-license: apache-2.0
+license_key: apache-2.0
 license_expression: apache-2.0
 copyright: Copyright (c) 2013-2014 nexB Inc.
 custom1: some custom

tests/testdata/dumps/complete2/about.ABOUT

@@ -17,7 +17,7 @@ vcs_repository: https://github.com/dejacode/about-code-tool.git
 description: AboutCode is a tool to process ABOUT files. 
  An ABOUT file is a file.
 
-license: apache-2.0
+license_key: apache-2.0
 license_expression: apache-2.0
 license_file: apache-2.0.LICENSE
 copyright: Copyright (c) 2013-2014 nexB Inc.

tests/testdata/inventory/basic/about/about.ABOUT

@@ -15,7 +15,7 @@ description: AboutCode is a tool
  to process ABOUT files. 
  An ABOUT file is a file.
 
-license: apache-2.0
+license_key: apache-2.0
 license_expression: apache-2.0
 license_file: apache-2.0.LICENSE
 copyright: Copyright (c) 2013-2014 nexB Inc.

tests/testdata/inventory/basic/expected.csv

@@ -1,2 +1,2 @@
-about_file_path,about_resource_path,about_resource,name,version,download_url,description,homepage_url,notes,license,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_changes,modified,changelog_file,owner,owner_url,contact,author,author_file,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,checksum_sha256,spec_version
+about_file_path,about_resource_path,about_resource,name,version,download_url,description,homepage_url,notes,license_key,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_changes,modified,changelog_file,owner,owner_url,contact,author,author_file,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,checksum_sha256,spec_version
 /about/about.ABOUT,.,.,AboutCode,0.11.0,,AboutCode is a tool to process ABOUT files. An ABOUT file is a file.,http://dejacode.org,,apache-2.0,apache-2.0,,apache-2.0.LICENSE,,Copyright (c) 2013-2014 nexB Inc.,NOTICE,,,,,,,nexB Inc.,,,"Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez",,git,https://github.com/dejacode/about-code-tool.git,,,,,,,,

tests/testdata/inventory/basic_with_about_resource_path/expected.csv

@@ -1,3 +1,3 @@
-about_file_path,about_resource_path,about_resource,name,version,download_url,description,homepage_url,notes,license,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_changes,modified,changelog_file,owner,owner_url,contact,author,author_file,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,checksum_sha256,spec_version
+about_file_path,about_resource_path,about_resource,name,version,download_url,description,homepage_url,notes,license_key,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_changes,modified,changelog_file,owner,owner_url,contact,author,author_file,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,checksum_sha256,spec_version
 /about/about_with_about_resource_path.ABOUT,"./apache-2.0.LICENSE
 ../../complex/about/apache-2.0.LICENSE",apache-2.0.LICENSE,Apache License 2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

tests/testdata/inventory/complex/expected.csv

@@ -1,4 +1,4 @@
-about_file_path,about_resource_path,about_resource,name,version,download_url,description,homepage_url,notes,license,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_changes,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,spec_version,author_file,dje_license,keywords,license_text_file
+about_file_path,about_resource_path,about_resource,name,version,download_url,description,homepage_url,notes,license_key,license_expression,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_changes,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,spec_version,author_file,dje_license,keywords,license_text_file
 /about/about.ABOUT,/about/,.,AboutCode,0.11.0,,"AboutCode is a tool
 to process ABOUT files.
 An ABOUT file is a file.",http://dejacode.org,,apache-2.0,apache-2.0,,apache-2.0.LICENSE,,Copyright (c) 2013-2014 nexB Inc.,NOTICE,,,,,,,nexB Inc.,,,"Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez",git,https://github.com/dejacode/about-code-tool.git,,,,,,,,,,,