diff --git a/examples/concept_v1.py b/examples/concept_v1.py index 6f6567aa..1c8faed5 100644 --- a/examples/concept_v1.py +++ b/examples/concept_v1.py @@ -2,7 +2,7 @@ Concept example of objects catalogs. """ -import objects +from objects import Catalog, Singleton, NewInstance, KwArg, Attribute import sqlite3 @@ -19,30 +19,30 @@ class B(object): # Catalog of objects providers. -class Catalog(objects.Catalog): +class AppCatalog(Catalog): """ Objects catalog. """ - database = objects.Singleton(provides=sqlite3.Connection, - database=objects.KwArg('example.db'), - row_factory=objects.Attribute(sqlite3.Row)) - """ :type: (objects.Provider) -> sqlite3.Connection """ + database = Singleton(provides=sqlite3.Connection, + database=KwArg('example.db'), + row_factory=Attribute(sqlite3.Row)) + """ :type: (Provider) -> sqlite3.Connection """ - object_a = objects.NewInstance(provides=A, - db=objects.KwArg(database)) - """ :type: (objects.Provider) -> A """ + object_a = NewInstance(provides=A, + db=KwArg(database)) + """ :type: (Provider) -> A """ - object_b = objects.NewInstance(provides=B, - a=objects.KwArg(object_a), - db=objects.KwArg(database)) - """ :type: (objects.Provider) -> B """ + object_b = NewInstance(provides=B, + a=KwArg(object_a), + db=KwArg(database)) + """ :type: (Provider) -> B """ # Catalog injection into consumer class. class Consumer(object): - catalog = Catalog(Catalog.object_a, - Catalog.object_b) + catalog = AppCatalog(AppCatalog.object_a, + AppCatalog.object_b) def return_a_b(self): return (self.catalog.object_a(), @@ -52,8 +52,8 @@ a1, b1 = Consumer().return_a_b() # Catalog static provides. -a2 = Catalog.object_a() -b2 = Catalog.object_b() +a2 = AppCatalog.object_a() +b2 = AppCatalog.object_b() # Some asserts. assert a1 is not a2 diff --git a/examples/concept_v2.py b/examples/concept_v2.py index 6af27742..d7b23240 100644 --- a/examples/concept_v2.py +++ b/examples/concept_v2.py @@ -2,7 +2,7 @@ Concept example of objects catalogs. """ -import objects +from objects import Catalog, Singleton, NewInstance, KwArg, Attribute import sqlite3 @@ -19,30 +19,30 @@ class B(object): # Catalog of objects providers. -class Catalog(objects.Catalog): +class AppCatalog(Catalog): """ Objects catalog. """ - database = objects.Singleton(sqlite3.Connection, - objects.KwArg('database', ':memory:'), - objects.Attribute('row_factory', sqlite3.Row)) + database = Singleton(sqlite3.Connection, + KwArg('database', ':memory:'), + Attribute('row_factory', sqlite3.Row)) """ :type: (objects.Provider) -> sqlite3.Connection """ - object_a = objects.NewInstance(A, - objects.KwArg('db', database)) + object_a = NewInstance(A, + KwArg('db', database)) """ :type: (objects.Provider) -> A """ - object_b = objects.NewInstance(B, - objects.KwArg('a', object_a), - objects.KwArg('db', database)) + object_b = NewInstance(B, + KwArg('a', object_a), + KwArg('db', database)) """ :type: (objects.Provider) -> B """ # Catalog injection into consumer class. class Consumer(object): - catalog = Catalog(Catalog.object_a, - Catalog.object_b) + catalog = AppCatalog(AppCatalog.object_a, + AppCatalog.object_b) def return_a_b(self): return (self.catalog.object_a(), @@ -52,8 +52,8 @@ a1, b1 = Consumer().return_a_b() # Catalog static provides. -a2 = Catalog.object_a() -b2 = Catalog.object_b() +a2 = AppCatalog.object_a() +b2 = AppCatalog.object_b() # Some asserts. assert a1 is not a2