package restructuring: base

* Reader and Extractor to respective reader/extractor modules
* ReaderBuilder to reader module
* ExtractorBuilder to extractor module
* Loading module in utils (safe_load, unpack_name)
* Pipeline and PipelineBuilder to lib module
* errors to utils
* documentation: "standard import" and "external import"

1 files changed, 13 insertions, 11 deletions

diff --git a/test/lib/test_bsie.py b/test/lib/test_bsie.py
index 771a0c2..52f1d44 100644
--- a/test/lib/test_bsie.py
+++ b/test/lib/test_bsie.py
@@ -4,13 +4,15 @@ Part of the bsie test suite.
 A copy of the license is provided with the project.
 Author: Matthias Baumgartner, 2022
 """
-# imports
+# standard imports
 import os
 import unittest
 
 # bsie imports
-from bsie.base import extractor
-from bsie.tools import builder
+from bsie.extractor import ExtractorBuilder
+from bsie.extractor.base import SCHEMA_PREAMBLE
+from bsie.lib import PipelineBuilder
+from bsie.reader import ReaderBuilder
 from bsie.utils import bsfs, node, ns
 
 # objects to test
@@ -22,9 +24,9 @@ from bsie.lib.bsie import BSIE
 class TestBSIE(unittest.TestCase):
     def setUp(self):
         # reader builder
-        rbuild = builder.ReaderBuilder({})
+        rbuild = ReaderBuilder({})
         # extractor builder
-        ebuild = builder.ExtractorBuilder([
+        ebuild = ExtractorBuilder([
             {'bsie.extractor.generic.path.Path': {}},
             {'bsie.extractor.generic.stat.Stat': {}},
             {'bsie.extractor.generic.constant.Constant': dict(
@@ -39,7 +41,7 @@ class TestBSIE(unittest.TestCase):
             ])
         # build pipeline
         self.prefix = bsfs.Namespace('http://example.com/local/')
-        pbuild = builder.PipelineBuilder(self.prefix, rbuild, ebuild)
+        pbuild = PipelineBuilder(self.prefix, rbuild, ebuild)
         self.pipeline = pbuild.build()
 
     def test_construction(self):
@@ -50,7 +52,7 @@ class TestBSIE(unittest.TestCase):
             ns.bse.filesize,
             ns.bse.author,
             })
-        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(SCHEMA_PREAMBLE + '''
             bse:filename rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:File ;
                 rdfs:range xsd:string ;
@@ -77,7 +79,7 @@ class TestBSIE(unittest.TestCase):
             ns.bse.filesize,
             ns.bse.author,
             })
-        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(SCHEMA_PREAMBLE + '''
             bse:filesize rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:File ;
                 rdfs:range xsd:integer;
@@ -95,7 +97,7 @@ class TestBSIE(unittest.TestCase):
             ns.bse.filesize,
             ns.bse.author,
             })
-        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(SCHEMA_PREAMBLE + '''
             bse:filename rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:File ;
                 rdfs:range xsd:string ;
@@ -122,7 +124,7 @@ class TestBSIE(unittest.TestCase):
         self.assertSetEqual(set(lib.principals), {
             ns.bse.author,
             })
-        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(SCHEMA_PREAMBLE + '''
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
@@ -137,7 +139,7 @@ class TestBSIE(unittest.TestCase):
         self.assertSetEqual(set(lib.principals), {
             ns.bse.filesize,
             })
-        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        self.assertEqual(lib.schema, bsfs.schema.Schema.from_string(SCHEMA_PREAMBLE + '''
             bse:filesize rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:File ;
                 rdfs:range xsd:integer;