rename view derivations to view derivers

4 files changed, 40 insertions, 44 deletions

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 621796552..553f32c9b 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -378,7 +378,7 @@ class Configurator(
         self.add_default_response_adapters()
         self.add_default_renderers()
         self.add_default_view_predicates()
-        self.add_default_view_derivations()
+        self.add_default_view_derivers()
         self.add_default_route_predicates()
 
         if exceptionresponse_view is not None:
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index ac95eaa59..918437f03 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1012,7 +1012,7 @@ class ViewsConfiguratorMixin(object):
             introspectables.append(perm_intr)
         self.action(discriminator, register, introspectables=introspectables)
 
-    def _apply_view_derivations(self, info):
+    def _apply_view_derivers(self, info):
         d = pyramid.config.derivations
         # These inner derivations have fixed order
         inner_derivers = [('mapped_view', d.mapped_view)]
@@ -1076,23 +1076,19 @@ class ViewsConfiguratorMixin(object):
             self.add_view_predicate(name, factory)
 
     @action_method
-    def add_view_derivation(self,
-                            name,
-                            factory,
-                            under=None,
-                            over=None):
+    def add_view_deriver(self, name, deriver, under=None, over=None):
         if under is None and over is None:
             over = 'decorated_view'
 
-        factory = self.maybe_dotted(factory)
-        discriminator = ('view option', name)
+        deriver = self.maybe_dotted(deriver)
+        discriminator = ('view deriver', name)
         intr = self.introspectable(
-            '%s derivation' % type,
-            discriminator,
-            '%s derivation named %s' % (type, name),
-            '%s derivation' % type)
+            'view derivers',
+            name,
+            name,
+            'view deriver')
         intr['name'] = name
-        intr['factory'] = factory
+        intr['deriver'] = deriver
         intr['under'] = under
         intr['over'] = over
         def register():
@@ -1100,11 +1096,11 @@ class ViewsConfiguratorMixin(object):
             if derivers is None:
                 derivers = TopologicalSorter()
                 self.registry.registerUtility(derivers, IViewDerivers)
-            derivers.add(name, factory, after=under, before=over)
+            derivers.add(name, deriver, after=under, before=over)
         self.action(discriminator, register, introspectables=(intr,),
                     order=PHASE1_CONFIG) # must be registered early
 
-    def add_default_view_derivations(self):
+    def add_default_view_derivers(self):
         d = pyramid.config.derivations
         derivers = [
             ('decorated_view', d.decorated_view),
@@ -1115,10 +1111,10 @@ class ViewsConfiguratorMixin(object):
         ]
         after = pyramid.util.FIRST
         for name, deriver in derivers:
-            self.add_view_derivation(name, deriver, under=after)
+            self.add_view_deriver(name, deriver, under=after)
             after = name
 
-        self.add_view_derivation(
+        self.add_view_deriver(
             'rendered_view',
             d.rendered_view,
             under=pyramid.util.FIRST,
@@ -1249,11 +1245,11 @@ class ViewsConfiguratorMixin(object):
         )
 
         # order and phash are only necessary for the predicated view and
-        # are not really view derivation options
+        # are not really view deriver options
         info.order = order
         info.phash = phash
 
-        return self._apply_view_derivations(info)
+        return self._apply_view_derivers(info)
 
     @viewdefaults
     @action_method
diff --git a/pyramid/testing.py b/pyramid/testing.py
index f1be04eec..c25105c6c 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -474,8 +474,8 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
         # method.
         config.add_default_renderers()
         config.add_default_view_predicates()
+        config.add_default_view_derivers()
         config.add_default_route_predicates()
-        config.add_default_view_derivations()
     config.commit()
     global have_zca
     try:
diff --git a/pyramid/tests/test_config/test_derivations.py b/pyramid/tests/test_config/test_derivations.py
index 1c7a0be07..9eb8598e4 100644
--- a/pyramid/tests/test_config/test_derivations.py
+++ b/pyramid/tests/test_config/test_derivations.py
@@ -1097,9 +1097,9 @@ class TestDerivationOrder(unittest.TestCase):
     def test_right_order_user_sorted(self):
         from pyramid.interfaces import IViewDerivers
 
-        self.config.add_view_derivation('deriv1', None)
-        self.config.add_view_derivation('deriv2', None, over='deriv1')
-        self.config.add_view_derivation('deriv3', None, under='deriv2')
+        self.config.add_view_deriver('deriv1', None)
+        self.config.add_view_deriver('deriv2', None, over='deriv1')
+        self.config.add_view_deriver('deriv3', None, under='deriv2')
 
         derivers = self.config.registry.queryUtility(IViewDerivers, default=[])
         derivers_sorted = derivers.sorted()
@@ -1119,9 +1119,9 @@ class TestDerivationOrder(unittest.TestCase):
     def test_right_order_implicit(self):
         from pyramid.interfaces import IViewDerivers
 
-        self.config.add_view_derivation('deriv1', None)
-        self.config.add_view_derivation('deriv2', None)
-        self.config.add_view_derivation('deriv3', None)
+        self.config.add_view_deriver('deriv1', None)
+        self.config.add_view_deriver('deriv2', None)
+        self.config.add_view_deriver('deriv3', None)
 
         derivers = self.config.registry.queryUtility(IViewDerivers, default=[])
         derivers_sorted = derivers.sorted()
@@ -1141,7 +1141,7 @@ class TestDerivationOrder(unittest.TestCase):
     def test_right_order_over_rendered_view(self):
         from pyramid.interfaces import IViewDerivers
 
-        self.config.add_view_derivation('deriv1', None, over='rendered_view')
+        self.config.add_view_deriver('deriv1', None, over='rendered_view')
 
         derivers = self.config.registry.queryUtility(IViewDerivers, default=[])
         derivers_sorted = derivers.sorted()
@@ -1159,9 +1159,9 @@ class TestDerivationOrder(unittest.TestCase):
     def test_right_order_over_rendered_view_others(self):
         from pyramid.interfaces import IViewDerivers
 
-        self.config.add_view_derivation('deriv1', None, over='rendered_view')
-        self.config.add_view_derivation('deriv2', None)
-        self.config.add_view_derivation('deriv3', None)
+        self.config.add_view_deriver('deriv1', None, over='rendered_view')
+        self.config.add_view_deriver('deriv2', None)
+        self.config.add_view_deriver('deriv3', None)
 
         derivers = self.config.registry.queryUtility(IViewDerivers, default=[])
         derivers_sorted = derivers.sorted()
@@ -1178,7 +1178,7 @@ class TestDerivationOrder(unittest.TestCase):
             ], dlist)
 
 
-class TestAddDerivation(unittest.TestCase):
+class TestAddDeriver(unittest.TestCase):
 
     def setUp(self):
         self.config = testing.setUp()
@@ -1187,7 +1187,7 @@ class TestAddDerivation(unittest.TestCase):
         self.config = None
         testing.tearDown()
 
-    def test_add_single_derivation(self):
+    def test_add_single_deriver(self):
         response = DummyResponse()
         response.deriv = False
         view = lambda *arg: response
@@ -1199,12 +1199,12 @@ class TestAddDerivation(unittest.TestCase):
 
         result = self.config._derive_view(view)
         self.assertFalse(response.deriv)
-        self.config.add_view_derivation('test_deriv', deriv)
+        self.config.add_view_deriver('test_deriv', deriv)
 
         result = self.config._derive_view(view)
         self.assertTrue(response.deriv)
 
-    def test_override_derivation(self):
+    def test_override_deriver(self):
         flags = {}
 
         class AView:
@@ -1220,19 +1220,19 @@ class TestAddDerivation(unittest.TestCase):
             return view
 
         view1 = AView()
-        self.config.add_view_derivation('test_deriv', deriv1)
+        self.config.add_view_deriver('test_deriv', deriv1)
         result = self.config._derive_view(view1)
         self.assertTrue(flags.get('deriv1'))
         self.assertFalse(flags.get('deriv2'))
 
         flags.clear()
         view2 = AView()
-        self.config.add_view_derivation('test_deriv', deriv2)
+        self.config.add_view_deriver('test_deriv', deriv2)
         result = self.config._derive_view(view2)
         self.assertFalse(flags.get('deriv1'))
         self.assertTrue(flags.get('deriv2'))
 
-    def test_add_multi_derivations_ordered(self):
+    def test_add_multi_derivers_ordered(self):
         response = DummyResponse()
         view = lambda *arg: response
         response.deriv = []
@@ -1249,14 +1249,14 @@ class TestAddDerivation(unittest.TestCase):
             response.deriv.append('deriv3')
             return view
 
-        self.config.add_view_derivation('deriv1', deriv1)
-        self.config.add_view_derivation('deriv2', deriv2, over='deriv1')
-        self.config.add_view_derivation('deriv3', deriv3, under='deriv2')
+        self.config.add_view_deriver('deriv1', deriv1)
+        self.config.add_view_deriver('deriv2', deriv2, over='deriv1')
+        self.config.add_view_deriver('deriv3', deriv3, under='deriv2')
         result = self.config._derive_view(view)
         self.assertEqual(response.deriv, ['deriv2', 'deriv3', 'deriv1'])
 
 
-class TestDerivationIntegration(unittest.TestCase):
+class TestDeriverIntegration(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
 
@@ -1298,8 +1298,8 @@ class TestDerivationIntegration(unittest.TestCase):
             response.deriv.append(info.options['deriv2'])
             return view
 
-        self.config.add_view_derivation('deriv1', deriv1)
-        self.config.add_view_derivation('deriv2', deriv2)
+        self.config.add_view_deriver('deriv1', deriv1)
+        self.config.add_view_deriver('deriv2', deriv2)
         self.config.add_view(view, deriv1='test1', deriv2='test2')
         self.config.commit()