More interactor stuff

aquarius/Aquarius.py

@@ -29,21 +29,23 @@ def main(self):
         self.__output.main()
 
     def search_books(self, search_term):
-        interactor = self.__interactor_factory.get_search_book_interactor(self.__persistence)
-        return interactor.execute(search_term)
+        i = self.__interactor_factory.get_search_book_interactor(self.__persistence)
+        return i.execute(search_term)
 
     def list_books_by_first_letter(self, first_letter):
-        return self.__persistence.list_books_by_first_letter(first_letter)
+        i = self.__interactor_factory.get_list_books_by_first_letter_interactor(self.__persistence)
+        return i.execute(first_letter)
 
     def get_book_details(self, book_id):
-        return self.__persistence.get_book_details(book_id)
+        i = self.__interactor_factory.get_book_details_interactor(self.__persistence)
+        return i.execute(book_id)
 
     def get_book_type(self, format_code):
         return self.__persistence.get_book_type(format_code)
 
     def add_book(self, book):
-        interactor = self.__interactor_factory.get_add_book_interactor(self.__persistence)
-        interactor.execute(book)
+        i = self.__interactor_factory.get_add_book_interactor(self.__persistence)
+        i.execute(book)
 
     def harvest_books(self):
         if not self.is_harvesting:

aquarius/InteractorFactory.py

@@ -7,4 +7,7 @@ def get_list_books_by_first_letter_interactor(self, persistence):
         raise NotImplementedError
 
     def get_search_book_interactor(self, persistence):
+        raise NotImplementedError
+
+    def get_book_details_interactor(self, param):
         raise NotImplementedError

aquarius/interactors/BasicInteractorFactory.py

@@ -1,5 +1,6 @@
 from aquarius.InteractorFactory import InteractorFactory
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
+from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
 from aquarius.interactors.ListBooksByFirstLetterInteractor import ListBooksByFirstLetterInteractor
 from aquarius.interactors.SearchBookInteractor import SearchBookInteractor
 
@@ -13,4 +14,7 @@ def get_list_books_by_first_letter_interactor(self, persistence):
         return ListBooksByFirstLetterInteractor(persistence)
 
     def get_search_book_interactor(self, persistence):
-        return SearchBookInteractor(persistence)
+        return SearchBookInteractor(persistence)
+
+    def get_book_details_interactor(self, persistence):
+        return GetBookDetailsInteractor(persistence)

aquarius/interactors/GetBookDetailsInteractor.py

@@ -0,0 +1,7 @@
+class GetBookDetailsInteractor(object):
+
+    def __init__(self, persistence):
+        self.__persistence = persistence
+
+    def execute(self, param):
+        self.__persistence.get_book_details(param)

tests/TestAquarius.py

@@ -6,6 +6,8 @@
 from aquarius.InteractorFactory import InteractorFactory
 from aquarius.bookharvesting.HardcodedHarvester import HardcodedHarvester
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
+from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
+from aquarius.interactors.ListBooksByFirstLetterInteractor import ListBooksByFirstLetterInteractor
 from aquarius.output.web.Web import Web
 from aquarius.persistence.hardcodedpersistence.HardcodedPersistence import HardcodedPersistence
 
@@ -22,9 +24,14 @@ def setUp(self):
     def setup_interactors(self):
         self.__search_book_interactor = Mock(Interactor)
         self.__add_book_interactor = Mock(AddBookInteractor)
+        self.__list_books_by_first_letter_interactor = Mock(ListBooksByFirstLetterInteractor)
+        self.__get_book_details_interactor = Mock(GetBookDetailsInteractor)
         self.__interactor_factory = InteractorFactory()
         self.__interactor_factory.get_search_book_interactor = Mock(return_value=self.__search_book_interactor)
         self.__interactor_factory.get_add_book_interactor = Mock(return_value=self.__add_book_interactor)
+        self.__interactor_factory.get_list_books_by_first_letter_interactor = \
+            Mock(return_value=self.__list_books_by_first_letter_interactor)
+        self.__interactor_factory.get_book_details_interactor = Mock(return_value=self.__get_book_details_interactor)
 
     def __setup_harvester_mock(self):
         self.__harvester = harvester = HardcodedHarvester(self.__app, None)
@@ -47,13 +54,21 @@ def test_search_books_calls_interactor(self):
         self.__app.search_books("")
         self.assertTrue(self.__search_book_interactor.execute.called)
 
-    def test_list_books_by_first_letter_calls_persistence(self):
+    def test_list_books_by_first_letter_uses_interactor_factory(self):
         self.__app.list_books_by_first_letter("b")
-        self.assertTrue(self.__persistence.list_books_by_first_letter.called)
+        self.assertTrue(self.__interactor_factory.get_list_books_by_first_letter_interactor.called)
 
-    def test_get_book_details_calls_persistence(self):
+    def test_list_books_by_first_letter_calls_interactor(self):
+        self.__app.list_books_by_first_letter("b")
+        self.assertTrue(self.__list_books_by_first_letter_interactor.execute.called)
+
+    def test_get_book_details_uses_interactor_factory(self):
+        self.__app.get_book_details(0)
+        self.assertTrue(self.__interactor_factory.get_book_details_interactor.called)
+
+    def test_get_book_details_calls_interactor(self):
         self.__app.get_book_details(0)
-        self.assertTrue(self.__persistence.get_book_details.called)
+        self.assertTrue(self.__get_book_details_interactor.execute.called)
 
     def test_get_book_type_calls_persistence(self):
         self.__app.get_book_type("EPUB")

tests/TestInteractorFactory.py

@@ -5,13 +5,19 @@
 class TestInteractorFactory(unittest.TestCase):
 
     def setUp(self):
-        self.__f = InteractorFactory()
+        self.__target = InteractorFactory()
 
     def test_get_add_book_interactor(self):
-        self.assertRaises(NotImplementedError, self.__f.get_add_book_interactor, "persistence")
+        self.__assertNotImplemented(self.__target.get_add_book_interactor)
 
     def test_get_list_books_by_first_letter_interactor(self):
-        self.assertRaises(NotImplementedError, self.__f.get_list_books_by_first_letter_interactor, "persistence")
+        self.__assertNotImplemented(self.__target.get_list_books_by_first_letter_interactor)
 
     def test_get_search_book_interactor(self):
-        self.assertRaises(NotImplementedError, self.__f.get_search_book_interactor, "persistence")
+        self.__assertNotImplemented(self.__target.get_search_book_interactor)
+
+    def test_get_book_details_interactor(self):
+        self.__assertNotImplemented(self.__target.get_book_details_interactor)
+
+    def __assertNotImplemented(self, method):
+        self.assertRaises(NotImplementedError, method, "persistence")

tests/interactors/TestBasicInteractorFactory.py

@@ -1,6 +1,6 @@
 import unittest
-from aquarius.InteractorFactory import InteractorFactory
 from aquarius.interactors.BasicInteractorFactory import BasicInteractorFactory
+from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
 from aquarius.interactors.SearchBookInteractor import SearchBookInteractor
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.interactors.ListBooksByFirstLetterInteractor import ListBooksByFirstLetterInteractor
@@ -9,16 +9,20 @@
 class TestBasicInteractorFactory(unittest.TestCase):
 
     def setUp(self):
-        self.__f = BasicInteractorFactory()
+        self.__target = BasicInteractorFactory()
 
     def test_get_add_book_interactor(self):
-        i = self.__f.get_add_book_interactor("persistence")
+        i = self.__target.get_add_book_interactor("persistence")
         self.assertIsInstance(i, AddBookInteractor)
 
     def test_get_list_books_by_first_letter_interactor(self):
-        i = self.__f.get_list_books_by_first_letter_interactor("persistence")
+        i = self.__target.get_list_books_by_first_letter_interactor("persistence")
         self.assertIsInstance(i, ListBooksByFirstLetterInteractor)
 
     def test_get_search_book_interactor(self):
-        i = self.__f.get_search_book_interactor("persistence")
+        i = self.__target.get_search_book_interactor("persistence")
         self.assertIsInstance(i, SearchBookInteractor)
+
+    def test_get_get_book_details_interactor(self):
+        i = self.__target.get_book_details_interactor("persistence")
+        self.assertIsInstance(i, GetBookDetailsInteractor)

tests/interactors/TestGetBookDetailsInteractor.py

@@ -0,0 +1,14 @@
+import unittest
+from unittest.mock import Mock
+from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
+from aquarius.persistence.sqlitepersistence import SqlitePersistence
+
+
+class TestGetBookDetailsInteractor(unittest.TestCase):
+
+    def test_execute_calls_persistence(self):
+        persistence = Mock(SqlitePersistence)
+        persistence.get_book_details = Mock()
+        target = GetBookDetailsInteractor(persistence)
+        target.execute("book_id")
+        self.assertTrue(persistence.get_book_details.called)