#349 Partial fixes

 * New UrlListField introduced for lsit of urls
 * The UrlField is now only taking single URL value

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

Author: chinyeungli

docs/CHANGELOG.rst

@@ -1,3 +1,11 @@
+2018-xx-xx
+
+    Release x.x.x
+
+    * New UrlListField introduced for list of urls
+    * The UrlField is now only taking single URL value
+
+
 2018-10-23
 
     Release 3.2.2

src/attributecode/model.py

@@ -344,20 +344,19 @@ def __eq__(self, other):
         if sval == oval:
             return True
 
-
-class UrlField(ListField):
+class UrlListField(ListField):
     """
     A URL field. The validated value is a list of URLs.
     """
     def _validate(self, *args, **kwargs):
         """
         Check that URLs are valid. Return a list of errors.
         """
-        errors = super(UrlField, self)._validate(*args, ** kwargs)
-        for url in self.value:
+        errors = super(UrlListField, self)._validate(*args, ** kwargs)
+        name = self.name
+        val = self.value
+        for url in val:
             if not self.is_valid_url(url):
-                name = self.name
-                val = self.value
                 msg = (u'Field %(name)s: Invalid URL: %(val)s' % locals())
                 errors.append(Error(WARNING, msg))
         return errors
@@ -372,6 +371,32 @@ def is_valid_url(url):
         return valid
 
 
+class UrlField(StringField):
+    """
+    A URL field. The validated value is a URL.
+    """
+    def _validate(self, *args, **kwargs):
+        """
+        Check that URL is valid. Return a list of errors.
+        """
+        errors = super(UrlField, self)._validate(*args, ** kwargs)
+        name = self.name
+        val = self.value
+        if not self.is_valid_url(val):
+            msg = (u'Field %(name)s: Invalid URL: %(val)s' % locals())
+            errors.append(Error(WARNING, msg))
+        return errors
+
+    @staticmethod
+    def is_valid_url(url):
+        """
+        Return True if a URL is valid.
+        """
+        scheme, netloc, _path, _p, _q, _frg = urlparse(url)
+        valid = scheme in ('http', 'https', 'ftp') and netloc
+        return valid
+
+
 class PathField(ListField):
     """
     A field pointing to one or more paths relative to the ABOUT file location.
@@ -692,7 +717,7 @@ def create_fields(self):
             ('license_key', ListField()),
             ('license_name', ListField()),
             ('license_file', FileTextField()),
-            ('license_url', UrlField()),
+            ('license_url', UrlListField()),
             ('copyright', StringField()),
             ('notice_file', FileTextField()),
             ('notice_url', UrlField()),

tests/test_model.py

@@ -193,12 +193,15 @@ def test_PathField_contains_dict_after_validate(self):
                           ]
         self.check_validate(field_class, value, expected, expected_errors)
 
+    """
+    UrlField no longer become a list.
+    If a list is wanted, use UrlListField instead.
     def test_UrlField_contains_list_after_validate(self):
         value = 'http://some.com/url'
         field_class = model.UrlField
         expected = [value]
         self.check_validate(field_class, value, expected, expected_errors=[])
-
+    """
     def test_SingleLineField_has_errors_if_multiline(self):
         value = '''line1
         line2'''
@@ -714,8 +717,7 @@ def test_About_dumps(self):
     AboutCode is a tool
     to process ABOUT files.
     An ABOUT file is a file.
-homepage_url:
-    - http://dejacode.org
+homepage_url: http://dejacode.org
 license_expression: apache-2.0
 licenses:
     -   file: apache-2.0.LICENSE
@@ -1002,7 +1004,7 @@ def test_load_dict_handles_field_validation_correctly(self):
                 u'author': [u'Jillian Daguil, Chin Yeung Li, Philippe Ombredanne, Thomas Druez'],
                 u'copyright': u'Copyright (c) 2013-2014 nexB Inc.',
                 u'description': u'AboutCode is a tool to process ABOUT files. An ABOUT file is a file.',
-                u'homepage_url': [u'http://dejacode.org'],
+                u'homepage_url': u'http://dejacode.org',
                 u'license_expression': u'apache-2.0',
                 u'name': u'AboutCode',
                 u'owner': [u'nexB Inc.'],

tests/testdata/parse/multi_line_license_expresion.ABOUT

@@ -1,6 +1,8 @@
 about_resource: .
 name: test
 license_expression: mit or apache-2.0
-license_url: |
-    https://enterprise.dejacode.com/urn/?urn=urn:dje:license:mit
-    https://enterprise.dejacode.com/urn/?urn=urn:dje:license:apache-2.0
+licenses:
+    -   key: mit
+        url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:mit 
+    -   key: apache-2.0
+        url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:apache-2.0