Merge branch 'f-dotall' into 'dev'

F dotall

See merge request !55

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed ###
 
+- `_AbstractDictElementConverter` uses `re.DOTALL` for `match_value`
+
 ### Deprecated ###
 
 ### Removed ###

src/caoscrawler/converters.py

@@ -638,7 +638,7 @@ class _AbstractDictElementConverter(Converter):
         m1 = re.match(self.definition["match_name"], element.name)
         if m1 is None:
             return None
-        m2 = re.match(self.definition["match_value"], str(element.value))
+        m2 = re.match(self.definition["match_value"], str(element.value), re.DOTALL)
         if m2 is None:
             return None
         values = dict()

unittests/test_converters.py

@@ -32,6 +32,7 @@ from caoscrawler.converters import (Converter, ConverterValidationError,
                                     DictConverter, DirectoryConverter,
                                     handle_value, MarkdownFileConverter,
                                     JSONFileConverter)
+from caoscrawler.converters import _AbstractDictElementConverter
 from caoscrawler.crawl import Crawler
 from caoscrawler.stores import GeneralStore
 from caoscrawler.structure_elements import (File, DictTextElement,
@@ -385,3 +386,21 @@ MyElement:
         list(yaml.safe_load_all(two_doc_yaml)))
     assert "MyElement" in two_doc_definitions
     assert two_doc_definitions["MyElement"]["type"] == one_doc_definitions["MyElement"]["type"]
+
+
+def test_abstract_dict_element_converter():
+    definition = yaml.safe_load("""
+match_name: text
+match_value: .*begin(?P<text>.*)end
+    """)
+    converter = _AbstractDictElementConverter(
+        definition, "test_converter",
+        None  # This is possible when "subtree" is not used
+    )
+    element = DictTextElement("text", """
+begin
+bla
+end""")
+    val = converter.match(element)
+    assert val is not None
+    assert val["text"] == "\nbla\n"

unittests/test_directories/examples_article/SimulationData/2020_climate-model-predict/2020-02-01/README.md

 ---
 responsible: AuthorE
-description: >
+description: >-
   Code for fitting the predictive model to the
   training data and for predicting the average
   annual temperature for all measurement stations