Clean up the architecture

Purposes :
- isolate the plugins calls
- distinction between parsing the web request and running the search (Search class). To be able to test code easily, to run searx code outside a web server, to filter the search query parameters with plugins more easily, etc...

Details :
- request.request_data contains request.form or request.args (initialize inside pre_request() function)
- Query class is renamed RawTextQuery
- SearchQuery class defines all search parameters
- get_search_query_from_webapp create a SearchQuery instance (basically the previous Search.__init__ code)
- Search class and SearchWithPlugins class takes a SearchQuery instance as class constructor parameter
- SearchWithPlugins class inherites from Search class, and run plugins
- A dedicated function search_with_plugins executes plugins to have a well define locals() (which is used by the plugins code).
- All plugins code is executed inside the try...except block (webapp.py, index function)
- advanced_search HTTP parameter value stays in webapp.py (it is only part of UI)
- multiple calls to result_container.get_ordered_results() doesn't compute the order multiple time (note : this method was call only once before)
- paging value is stored in the result_container class (compute in the extend method)
- test about engine.suspend_end_time is done during search method call (instead of __init__)
- check that the format parameter value is one of these : html, rss, json, rss (before the html value was assumed but some text formatting wasn't not done)

1 files changed, 10 insertions, 11 deletions

diff --git a/tests/unit/test_plugins.py b/tests/unit/test_plugins.py
index b8a8980cf..9ba6fcdd2 100644
--- a/tests/unit/test_plugins.py
+++ b/tests/unit/test_plugins.py
@@ -6,9 +6,8 @@ from mock import Mock
 
 
 def get_search_mock(query, **kwargs):
-    return {'search': Mock(query=query,
-                           result_container=Mock(answers=set()),
-                           **kwargs)}
+    return {'search': Mock(query=query, **kwargs),
+            'result_container': Mock(answers=set())}
 
 
 class PluginStoreTest(SearxTestCase):
@@ -54,11 +53,11 @@ class SelfIPTest(SearxTestCase):
         request.headers.getlist.return_value = []
         ctx = get_search_mock(query='ip', pageno=1)
         store.call('post_search', request, ctx)
-        self.assertTrue('127.0.0.1' in ctx['search'].result_container.answers)
+        self.assertTrue('127.0.0.1' in ctx['result_container'].answers)
 
         ctx = get_search_mock(query='ip', pageno=2)
         store.call('post_search', request, ctx)
-        self.assertFalse('127.0.0.1' in ctx['search'].result_container.answers)
+        self.assertFalse('127.0.0.1' in ctx['result_container'].answers)
 
         # User agent test
         request = Mock(user_plugins=store.plugins,
@@ -67,24 +66,24 @@ class SelfIPTest(SearxTestCase):
 
         ctx = get_search_mock(query='user-agent', pageno=1)
         store.call('post_search', request, ctx)
-        self.assertTrue('Mock' in ctx['search'].result_container.answers)
+        self.assertTrue('Mock' in ctx['result_container'].answers)
 
         ctx = get_search_mock(query='user-agent', pageno=2)
         store.call('post_search', request, ctx)
-        self.assertFalse('Mock' in ctx['search'].result_container.answers)
+        self.assertFalse('Mock' in ctx['result_container'].answers)
 
         ctx = get_search_mock(query='user-agent', pageno=1)
         store.call('post_search', request, ctx)
-        self.assertTrue('Mock' in ctx['search'].result_container.answers)
+        self.assertTrue('Mock' in ctx['result_container'].answers)
 
         ctx = get_search_mock(query='user-agent', pageno=2)
         store.call('post_search', request, ctx)
-        self.assertFalse('Mock' in ctx['search'].result_container.answers)
+        self.assertFalse('Mock' in ctx['result_container'].answers)
 
         ctx = get_search_mock(query='What is my User-Agent?', pageno=1)
         store.call('post_search', request, ctx)
-        self.assertTrue('Mock' in ctx['search'].result_container.answers)
+        self.assertTrue('Mock' in ctx['result_container'].answers)
 
         ctx = get_search_mock(query='What is my User-Agent?', pageno=2)
         store.call('post_search', request, ctx)
-        self.assertFalse('Mock' in ctx['search'].result_container.answers)
+        self.assertFalse('Mock' in ctx['result_container'].answers)