Merge pull request #1016 from juanjemdIos/fix-1014

solve bug with some project status. Fixes #1014

Author: dgarijo

src/somef/regular_expressions.py

@@ -220,22 +220,22 @@ def extract_repo_status(unfiltered_text, repository_metadata: Result, readme_sou
 
     repo_status = ""
     init = unfiltered_text.find("[![Project Status:")
-    if init > 0:
+    if init >= 0:
         end = unfiltered_text.find("](", init)
-        repo_status = unfiltered_text[init + 3:end]
-        # repo_status = repo_status.replace("Project Status: ", "")
-        # short_status = repo_status[0:repo_status.find(" ")].lower()
-        
-        status_value = repo_status.replace("Project Status:", "").strip()
-        parts = re.split(r'[ \]]', status_value)
-        short_status = parts[0].lower()
+
+        start_badge_url = end + 2
+        end_badge_url = unfiltered_text.find(")", start_badge_url)
+        badge_url = unfiltered_text[start_badge_url:end_badge_url]
+        short_status = badge_url.split("/")[-1].replace(".svg", "").lower()
+        # short_status = "active"
 
         repository_metadata.add_result(constants.CAT_STATUS,
                                        {
                                            constants.PROP_TYPE: constants.URL,
                                            constants.PROP_VALUE: "https://www.repostatus.org/#" + short_status,
                                            constants.PROP_DESCRIPTION: repo_status
                                        }, 1, constants.TECHNIQUE_REGULAR_EXPRESSION, readme_source)
+
     return repository_metadata
 
 

src/somef/test/test_data/README-FTR.md

@@ -0,0 +1,50 @@
+# FAIR Testing Resource Vocabulary (FTR)
+[![Project Status: The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) 
+
+Repository to track the requirements and specifications of FAIR assessment results, metrics, benchmarks and scoring algorithms.
+
+**Permanent identifier:** [https://w3id.org/ftr#](https://w3id.org/ftr#) (click to see documentation and examples)
+
+**Authors**:  Daniel Garijo, Mark Wilkinson, Pablo Alarcón, Esteban Gonzalez-Guardia, Tomasz Miksa, Lukas Arnhold, Allyson Lister, Elli Papadopoulou, Leonidas Pispiringas 
+
+**Contributors**: Rober Huber, Neil Chue Hong, Clement Jonquet, Wim Hugo
+
+**Source document**: [https://docs.google.com/document/d/1HusredfHgymRg2ub4L0GnVSRV8IWZvFJyMkE6POejpc/edit?usp=sharing](https://docs.google.com/document/d/1HusredfHgymRg2ub4L0GnVSRV8IWZvFJyMkE6POejpc/edit?usp=sharing), with contributions from an initial modeling by Robert Huber and a [diagram](https://owncloud.tuwien.ac.at/index.php/s/VaGxqnf5MxfDtzz#/files_mediaviewer/dmp-dqv.png) authored by Lukas Arnhold.
+
+**Ongoing document**: [Assessment components glossary and description](https://docs.google.com/document/d/1_dFj5bi6JKlcGZt40BEzVWUg6NjG1CBzGnCWAaad6NU/edit?usp=sharing) and [Metadata elements for FAIR assessment](https://docs.google.com/spreadsheets/d/1QKOoy-YJLNgnQywe6wOTTCBqCg0YuRWmIT-xFoB3ZCo/edit?usp=sharing)
+
+
+## Core test result representation
+We distinguish the following main concepts:
+- **TestResult**: Output of running a test over a resource. A test result also should contain provenance metadata about the process followed to create it. `TestResult`is represented as an extension of `prov:Entity`. A test result points to the corresponding test through the `ftr:outputFromTest` property.
+- **TestResultSet**: A set of FAIR test results, together with their respective metadata. Common metadata may describe the set. For example, if all results where run by a request to the same API.
+- **Test**: Service, formed by an API and associated piece of code that implements a Metric, and is executed (by a FAIR assessment tool), retrieving a particular and standardised result.
+- **TestExecutionActivity**: The action carried out by an agent of calling an API in which a test (or set of tests) were run. The result of this activity is either a `TestResult` or a `TestResultSet`.
+- **Metric**: Narrative description that a Test must wholly implement. Metrics may be domain-agnostic or not. Metrics do not include technical details on their implementation.
+- **Dimension**: Represents criteria relevant for an assessment (e.g., one of the FAIR principles). Each quality dimension must have one or more metric to measure it (definition adapted from [W3C Data Quality Vocabulary](https://www.w3.org/TR/vocab-dqv/#dqv:Dimension)).
+- **Benchmark**: Benchmarks are community-specific groupings of a set of Metrics that provides a narrative of those particular ways in which that community defines FAIR for assessment purposes.
+- **ScoringAlgorithm**: Piece of code that contextualises the sum of all test results for a given benchmark, into a final quantitative assessment result. 
+- **BenchmarkScore**: Score obtained after executing a scoring algorithm over a set of test results. The benchmark score includes a value, a log and a link to the test results used to obtain the score.
+
+![diagram](./development/img/FAIRTestResult_diagram_v13.drawio.png "FTR overview")
+
+## Context
+If you want to use a JSON-LD serialization to implement FTR, we recommend using the [ftr contex](https://w3id.org/ftr/context). It will help you making your JSON-LD documents easier to read (see some [examples](https://w3id.org/ftr#desc) in the specification too). 
+
+## OpenAPI template
+If you want to implement a REST API following the FTR specification, you may use the [OpenAPI template](https://github.com/OSTrails/FAIR_testing_resource_vocabulary/blob/main/development/api/open_api_description.yaml) provided in this repository. See [an example implementation](https://w3id.org/foops/api))
+
+## Requirements and Competency Questions
+The proposed vocabulary is derived from a set of competency questions, available at the `cqs` folder. CQs come from:
+* Requirements based on the experience of the authors (as FAIR assessment tool developers)
+* The [open document](https://docs.google.com/document/d/1HusredfHgymRg2ub4L0GnVSRV8IWZvFJyMkE6POejpc/edit?usp=sharing) where experts from various projects regarding FAIR assessment have gathered.
+
+## Examples
+Please see the [latest specification draft for examples](https://w3id.org/ftr#desc) of tests, metrics, benchmarks and scoring algorithms.
+
+## Reference implementations
+The FTR specification has been implemented through four different reference implementations: 
+- FAIR Champion: https://tools.ostrails.eu/champion 
+- FOOPS!: https://w3id.org/foops (see API [here](https://w3id.org/foops/api))
+- Research Software FAIRness Checks (RSFC): https://w3id.org/rsfc/ (see API [here](https://w3id.org/rsfc/api))
+- FAIR for Research Objects (FAIROs): https://w3id.org/FAIROS/

src/somef/test/test_data/expected/runtime_platform_repo.yaml

@@ -6,4 +6,4 @@ CAT_PROGRAMMING_LANGUAGES:
   name: Java
   value: Java
   version: "1.8"
-  type: Language
+  type: Programming_language

src/somef/test/test_regular_expressions.py

@@ -587,4 +587,17 @@ def test_issue_985(self):
             extracted_url = status[0]['result']['value']
             expected_url = "https://www.repostatus.org/#active"
 
-            assert extracted_url == expected_url, f"Expected {expected_url}, but got {extracted_url}"
+            assert extracted_url == expected_url, f"Expected {expected_url}, but got {extracted_url}"
+
+    def test_repo_status_issue_1014(self):
+        """Another test to ensure extract_repo_status are extracted correctly."""
+        with open(test_data_path + "README-FTR.md", "r") as data_file:
+            test_text = data_file.read()
+            repo_status = regular_expressions.extract_repo_status(test_text, Result(),
+                                                                  test_data_path + "README-FTR.md")
+            status = repo_status.results[constants.CAT_STATUS]
+
+            assert len(status) == 1, f"Should be 1 status, but got {len(status)}"
+            extracted_url = status[0]['result']['value']
+            expected_url = "https://www.repostatus.org/#active"
+            self.assertEqual(extracted_url, expected_url)