diff options
| -rw-r--r-- | bsie/extractor/builder.py | 3 | ||||
| -rw-r--r-- | bsie/lib/naming_policy.py | 12 | ||||
| -rw-r--r-- | test/lib/test_naming_policy.py | 14 |
3 files changed, 15 insertions, 14 deletions
diff --git a/bsie/extractor/builder.py b/bsie/extractor/builder.py index d691b0e..8353a93 100644 --- a/bsie/extractor/builder.py +++ b/bsie/extractor/builder.py @@ -67,6 +67,7 @@ class ExtractorBuilder(): return cls(**kwargs) except Exception as err: - raise errors.BuilderError(f'failed to build extractor {name} due to {bsfs.typename(err)}: {err}') from err + raise errors.BuilderError( + f'failed to build extractor {name} due to {bsfs.typename(err)}: {err}') from err ## EOF ## diff --git a/bsie/lib/naming_policy.py b/bsie/lib/naming_policy.py index 3e7c940..ffef7d9 100644 --- a/bsie/lib/naming_policy.py +++ b/bsie/lib/naming_policy.py @@ -83,16 +83,16 @@ class DefaultNamingPolicy(NamingPolicy): def handle_node(self, node: Node) -> Node: if node.uri is not None: return node - if node.node_type == ns.bsn.Entity : - return self.name_file(node) + if node.node_type == ns.bsn.Entity: + return self.name_entity(node) if node.node_type == ns.bsn.Preview: return self.name_preview(node) if node.node_type == ns.bsn.Tag: return self.name_tag(node) - raise errors.ProgrammingError('no naming policy available for {node.node_type}') + raise errors.ProgrammingError(f'no naming policy available for {node.node_type}') - def name_file(self, node: Node) -> Node: - """Set a bsfs:File node's uri fragment to its ucid.""" + def name_entity(self, node: Node) -> Node: + """Set a bsn:Entity node's uri fragment to its ucid.""" if 'ucid' in node.hints: # content id fragment = node.hints['ucid'] else: # random name @@ -101,7 +101,7 @@ class DefaultNamingPolicy(NamingPolicy): return node def name_preview(self, node: Node) -> Node: - """Set a bsfs:Preview node's uri fragment to its ucid. + """Set a bsn:Preview node's uri fragment to its ucid. Uses its source fragment as fallback. Appends the size if provided. """ fragment = None diff --git a/test/lib/test_naming_policy.py b/test/lib/test_naming_policy.py index b284fc0..09fd6f6 100644 --- a/test/lib/test_naming_policy.py +++ b/test/lib/test_naming_policy.py @@ -23,11 +23,11 @@ class TestDefaultNamingPolicy(unittest.TestCase): self.assertEqual(policy.handle_node( Node(ns.bsn.Invalid, uri='http://example.com/you/foo#bar')).uri, URI('http://example.com/you/foo#bar')) - # processes bsfs:File + # processes bsn:Entity self.assertEqual(policy.handle_node( Node(ns.bsn.Entity, ucid='abc123cba')).uri, URI('http://example.com/me/file#abc123cba')) - # processes bsfs:Preview + # processes bsn:Preview self.assertEqual(policy.handle_node( Node(ns.bsn.Preview, ucid='abc123cba', size=123)).uri, URI('http://example.com/me/preview#abc123cba_s123')) @@ -39,15 +39,15 @@ class TestDefaultNamingPolicy(unittest.TestCase): self.assertRaises(errors.ProgrammingError, policy.handle_node, Node(ns.bsn.Invalid, ucid='abc123cba', size=123)) - def test_name_file(self): + def test_name_entity(self): # setup policy = DefaultNamingPolicy('http://example.com', 'me') - # name_file uses ucid - self.assertEqual(policy.name_file( + # name_entity uses ucid + self.assertEqual(policy.name_entity( Node(ns.bsn.Entity, ucid='123abc321')).uri, URI('http://example.com/me/file#123abc321')) - # name_file falls back to a random guid - self.assertTrue(policy.name_file( + # name_entity falls back to a random guid + self.assertTrue(policy.name_entity( Node(ns.bsn.Entity)).uri.startswith('http://example.com/me/file#')) def test_name_preview(self): |