Fix filter issues

- Filter inheritance from target should now work again,
  except for special edge cases around exports & the preprocessor.
  (Initial load of most pages has to be before instantiating the
  target, so filters from the target are not yet available.)

- Filters are now applied in the order they are listed, by group:

    1. global filters
    2. target filters
    3. page filters

    Duplicate filters are applied at most once, at their earliest
    listed timing.

Author: mDuo13

dactyl/page.py

@@ -16,7 +16,7 @@
 from dactyl.jinja_loaders import FrontMatterRemoteLoader, FrontMatterFSLoader
 
 class DactylPage:
-    def __init__(self, config, data, skip_pp=False):
+    def __init__(self, config, data, skip_pp=False, more_filters=[]):
         self.config = config
         self.data = data
         self.rawtext = None
@@ -29,6 +29,7 @@ def __init__(self, config, data, skip_pp=False):
         self.html = None
         self.soup = None
 
+        self.gain_filters(more_filters)
         self.load_content()
         self.provide_default_filename()
         self.provide_name()
@@ -53,7 +54,7 @@ def undefined_or_ne(a,b):
         pp_env.tests["undefined_or_ne"] = undefined_or_ne
 
         # Pull exported values (& functions) from page filters into the pp_env
-        for filter_name in self.filters():
+        for filter_name in self.filters(save=False):
             if filter_name not in self.config.filters.keys():
                 logger.debug("Skipping unloaded filter '%s'" % filter_name)
                 continue
@@ -508,22 +509,35 @@ def filepath(self, mode):
             # for pdf or html just use the html field as-is
             return self.data["html"]
 
+    def gain_filters(self, filterlist):
+        """
+        Called by target to add its filters to this page's.
+        """
+        if "filters" in self.data:
+            self.data["filters"] = filterlist + self.data["filters"]
+        else:
+            self.data["filters"] = filterlist
 
-    def filters(self):
+    def filters(self, save=True):
         """
         Returns the names of filters to use when processing this page.
         """
         if self.ffp:
             # Return saved results
             return self.ffp
-        ffp = set(self.config["default_filters"])
-        if "filters" in self.data:
-            # self.data should already include filters inherited from target
-            ffp.update(self.data["filters"])
-        loaded_filters = set(self.config.filters.keys())
-        ffp &= loaded_filters
+
+        # Create de-duplicated list of loaded filters only
+        ffp = []
+        for f in self.config["default_filters"]:
+            if f not in ffp and f in self.config.filters:
+                ffp.append(f)
+        for f in self.data.get("filters", [])    :
+            if f not in ffp and f in self.config.filters:
+                ffp.append(f)
+
         logger.debug("...filters for page: %s"%ffp)
-        self.ffp = ffp
+        if save:
+            self.ffp = ffp
         return ffp
 
     def __repr__(self):

dactyl/target.py

@@ -130,7 +130,8 @@ def add_cover(self):
         coverpage_data = self.config["cover_page"]
         coverpage_data["targets"] = [self.name]
         skip_pp = self.config.get("skip_preprocessor", False)
-        self.cover = DactylPage(self.config, coverpage_data, skip_pp)
+        more_filters = self.data.get("filters", [])
+        self.cover = DactylPage(self.config, coverpage_data, skip_pp, more_filters)
 
     def default_pdf_name(self):
         """Choose a reasonable name for a PDF file in case one isn't specified."""
@@ -155,6 +156,7 @@ def gain_fields(self, fields):
         if "display_name" in fields: # Exception to reserved key rule
             self.data["display_name"] = fields["display_name"]
 
+
     def expand_openapi_spec(self, page_data):
         """Expand OpenAPI Spec placeholders into a full page list"""
         assert OPENAPI_SPEC_KEY in page_data.keys()
@@ -169,8 +171,16 @@ def expand_openapi_spec(self, page_data):
         swagger = ApiDef.from_path(page_data[OPENAPI_SPEC_KEY], api_slug,
                                        extra_fields, template_path)
         skip_pp = self.config.get("skip_preprocessor", False)
-        return [DactylPage(self.config, p, skip_pp)
-                for p in swagger.create_pagelist()]
+        made_pages = []
+        for p in swagger.create_pagelist():
+            more_filters = self.data.get("filters", [])
+            po = DactylPage(self.config, p, skip_pp, more_filters)
+            # Special case for filters; concatenate filter lists,
+            # with target's filters first.
+            if "filters" in self.data:
+                po.gain_filters(self.data["filters"])
+            made_pages.append(po)
+        return made_pages
 
     def load_pages(self):
         """
@@ -215,6 +225,10 @@ def load_pages(self):
             # then add it to the list
             else:
                 merge_dicts(self.data, page_data, RESERVED_KEYS_TARGET)
+                # Special case for filters; concatenate filter lists,
+                # with target's filters first.
+                if "filters" in self.data:
+                    page_candidate.gain_filters(self.data["filters"])
                 pages.append(page_candidate)
 
         # Check for pages that would overwrite each other

dactyl/version.py

@@ -1 +1 @@
-__version__ = '0.10.0-a120'
+__version__ = '0.10.0-a123'