Merge branch 'main' into jacobcalvert/add-rpm-and-deb-clarification

Author: jacobcalvert

ADOPTERS.md

@@ -4,6 +4,7 @@
 
 - [CycloneDX](https://github.com/CycloneDX): A lightweight software
   bill-of-material (SBOM) specification
+- [Dark Sky Technology (Bulletproof Trust)](https://www.darkskytechnology.com/bulletproof-trust): A software assurance platform to measure risk and detect threats in critical open-source supply chains.
 - [Ecosyste.ms](https://ecosyste.ms): Indexes and analyzes open source packages, ecosystems, and their dependencies.
 - [GitHub Dependency Submission API](https://docs.github.com/en/rest/dependency-graph/dependency-submission): allows third-party tools
   to submit dependency data to GitHub for inclusion in a repository's dependency graph.

docs/how-to-parse.md

@@ -11,12 +11,11 @@ To parse a `purl` string in its components:
 - Split the `purl` string once from right on '#'
 
   - The left side is the `remainder`
-  - Strip the right side from leading and trailing '/'
-  - Split this on '/'
-  - Discard any empty string segment from that split
+  - Split the right side on `/`
   - Percent-decode each segment
-  - Discard any '.' or '..' segment from that split
   - UTF-8-decode each segment if needed in your programming language
+  - Discard any segment that is empty, or equal to `.` or `..`
+  - Report an error if any segment contains a slash `/`
   - Join segments back with a '/'
   - This is the `subpath`
 

tests/types/rpm-test.json

@@ -108,10 +108,10 @@
       "description": "Parse test for PURL type: rpm",
       "test_group": "base",
       "test_type": "parse",
-      "input": "pkg:rpm/[email protected]?arch=i686&epoch=1&distro=fedora-25",
+      "input": "pkg:rpm/fedora/[email protected]?arch=i686&epoch=1&distro=fedora-25",
       "expected_output": {
         "type": "rpm",
-        "namespace": null,
+        "namespace": "fedora",
         "name": "centerim",
         "version": "4.22.10-1.el6",
         "qualifiers": {
@@ -128,8 +128,8 @@
       "description": "Roundtrip test for PURL type: rpm",
       "test_group": "base",
       "test_type": "roundtrip",
-      "input": "pkg:rpm/[email protected]?arch=i686&epoch=1&distro=fedora-25",
-      "expected_output": "pkg:rpm/[email protected]?arch=i686&distro=fedora-25&epoch=1",
+      "input": "pkg:rpm/fedora/[email protected]?arch=i686&epoch=1&distro=fedora-25",
+      "expected_output": "pkg:rpm/fedora/[email protected]?arch=i686&distro=fedora-25&epoch=1",
       "expected_failure": false,
       "expected_failure_reason": null
     },
@@ -139,7 +139,7 @@
       "test_type": "build",
       "input": {
         "type": "rpm",
-        "namespace": null,
+        "namespace": "fedora",
         "name": "centerim",
         "version": "4.22.10-1.el6",
         "qualifiers": {
@@ -149,7 +149,7 @@
         },
         "subpath": null
       },
-      "expected_output": "pkg:rpm/[email protected]?arch=i686&distro=fedora-25&epoch=1",
+      "expected_output": "pkg:rpm/fedora/[email protected]?arch=i686&distro=fedora-25&epoch=1",
       "expected_failure": false,
       "expected_failure_reason": null
     }

types/mlflow-definition.json

@@ -2,7 +2,7 @@
   "$schema": "https://packageurl.org/schemas/purl-type-definition.schema-1.0.json",
   "$id": "https://packageurl.org/types/mlflow-definition.json",
   "type": "mlflow",
-  "type_name": "",
+  "type_name": "MLflow",
   "description": "MLflow ML models (Azure ML, Databricks, etc.)",
   "repository": {
     "use_repository": true,