Merge branch 'master' into improved-multilangual

Author: hcvdwerf

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## [Unreleased](https://github.com/ckan/ckanext-dcat/compare/v2.4.0...HEAD)
+## [Unreleased](https://github.com/ckan/ckanext-dcat/compare/v2.4.1...HEAD)
+
+## [v2.4.1](https://github.com/ckan/ckanext-dcat/compare/v2.4.0...v2.4.1) - 2025-09-25
+
+* Fix regression redirect from /dataset to /dataset_series ([#362](https://github.com/ckan/ckanext-dcat/pull/362))
+* Provide default language in Croissant JSON-LD context ([#361](https://github.com/ckan/ckanext-dcat/pull/361))
+* Added [`IDCATURIGenerator`](https://docs.ckan.org/projects/ckanext-dcat/en/latest/uri-customization/)
+  plugin interface to allow customization of the URIs generation ([#351](https://github.com/ckan/ckanext-dcat/pull/351))
+* Added support for new fields to DCAT classes: `dcat:Dataset` (`prov:wasGeneratedBy`, `prov:qualifiedAttribution`,
+  `dcat:hasVersion`), `dcat:Catalog` (`foaf:homepage`), `dcat:DataService` (`dct:conformsTo`, `dct:format`, 
+  `dct:identifier`, `dct:language`, `dct:rights`, `dcat:landingPage`, `dcat:keyword`) ([#352](https://github.com/ckan/ckanext-dcat/pull/352))
+* Add HealthDCAT-AP mapping to CKAN field mapping table ([#347](https://github.com/ckan/ckanext-dcat/pull/347))
+* Docs: Add HealthDCAT-AP mapping to CKAN field mapping table ([#347](https://github.com/ckan/ckanext-dcat/pull/347))
 
 
 ## [v2.4.0](https://github.com/ckan/ckanext-dcat/compare/v2.3.0...v2.4.0) - 2025-05-20

ckanext/dcat/blueprints.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from flask import Blueprint, jsonify, make_response
 
 import ckantoolkit as toolkit
@@ -12,11 +11,7 @@
 config = toolkit.config
 
 
-dcat = Blueprint(
-    'dcat',
-    __name__,
-    url_defaults={u'package_type': u'dataset'}
-)
+dcat = Blueprint("dcat", __name__, url_defaults={"package_type": "dataset"})
 
 
 def read_catalog(_format=None, package_type=None):
@@ -30,36 +25,44 @@ def read_dataset(_id, _format=None, package_type=None):
 if endpoints_enabled():
 
     # requirements={'_format': 'xml|rdf|n3|ttl|jsonld'}
-    dcat.add_url_rule(config.get('ckanext.dcat.catalog_endpoint',
-                                 utils.DEFAULT_CATALOG_ENDPOINT).replace(
-                                     '{_format}', '<_format>'),
-                      view_func=read_catalog)
+    dcat.add_url_rule(
+        config.get(
+            "ckanext.dcat.catalog_endpoint", utils.DEFAULT_CATALOG_ENDPOINT
+        ).replace("{_format}", "<_format>"),
+        view_func=read_catalog,
+    )
 
     # TODO: Generalize for all dataset types
-    dcat.add_url_rule('/dataset_series/<_id>.<_format>', view_func=read_dataset)
-    dcat.add_url_rule('/dataset/<_id>.<_format>', view_func=read_dataset)
+    dcat.add_url_rule(
+        "/dataset_series/<_id>.<_format>",
+        view_func=read_dataset,
+        endpoint="read_dataset_series",
+    )
+    dcat.add_url_rule(
+        "/dataset/<_id>.<_format>", view_func=read_dataset, endpoint="read_dataset"
+    )
 
 
 if toolkit.asbool(config.get(utils.ENABLE_CONTENT_NEGOTIATION_CONFIG)):
-    dcat.add_url_rule('/', view_func=read_catalog)
+    dcat.add_url_rule("/", view_func=read_catalog)
 
-    dcat.add_url_rule('/dataset/new', view_func=CreateView.as_view(str(u'new')))
-    dcat.add_url_rule('/dataset/<_id>', view_func=read_dataset)
+    dcat.add_url_rule("/dataset/new", view_func=CreateView.as_view(str("new")))
+    dcat.add_url_rule("/dataset/<_id>", view_func=read_dataset)
 
-dcat_json_interface = Blueprint('dcat_json_interface', __name__)
+dcat_json_interface = Blueprint("dcat_json_interface", __name__)
 
 
 def dcat_json():
     datasets = utils.dcat_json_page()
     return jsonify(datasets)
 
 
-dcat_json_interface.add_url_rule(config.get('ckanext.dcat.json_endpoint',
-                                            '/dcat.json'),
-                                 view_func=dcat_json)
+dcat_json_interface.add_url_rule(
+    config.get("ckanext.dcat.json_endpoint", "/dcat.json"), view_func=dcat_json
+)
 
 
-croissant = Blueprint('croissant', __name__)
+croissant = Blueprint("croissant", __name__)
 
 
 def read_dataset_croissant(_id):
@@ -72,20 +75,22 @@ def read_dataset_croissant(_id):
         )
 
         context = {
-            'user': user_name,
+            "user": user_name,
         }
-        data_dict = {'id': _id}
+        data_dict = {"id": _id}
 
         dataset_dict = toolkit.get_action("package_show")(context, data_dict)
     except (toolkit.ObjectNotFound, toolkit.NotAuthorized):
         return toolkit.abort(
-            404,
-            toolkit._("Dataset not found or you have no permission to view it")
+            404, toolkit._("Dataset not found or you have no permission to view it")
         )
 
     response = make_response(croissant_serialization(dataset_dict))
     response.headers["Content-type"] = "application/ld+json"
 
     return response
 
-croissant.add_url_rule('/dataset/<_id>/croissant.jsonld', view_func=read_dataset_croissant)
+
+croissant.add_url_rule(
+    "/dataset/<_id>/croissant.jsonld", view_func=read_dataset_croissant
+)