major bug fix, new feature for forms:

 - test config
 - moonsheep token - templatetag that needs to be included by apps using
 moonsheep so sent form was aware of resolved task
 - resolves #95
 - resolves #101

.gitignore

@@ -1,6 +1,10 @@
 .idea/
 __pycache__/
 node_modules/
+
+*.pyc
 .tox/
 .coverage
-*.egg-info/
+*.egg-info
+.eggs/
+build/

.travis.yml

@@ -0,0 +1,37 @@
+language: python
+matrix:
+  include:
+    - python: 3.3
+      env: TOXENV=py33-18
+    - python: 3.4
+      env: TOXENV=py34-18
+    - python: 3.4
+      env: TOXENV=py34-19
+    - python: 3.4
+      env: TOXENV=py34-110
+    - python: 3.4
+      env: TOXENV=py34-111
+    - python: 3.4
+      env: TOXENV=py34-20
+    - python: 3.5
+      env: TOXENV=py35-18
+    - python: 3.5
+      env: TOXENV=py35-19
+    - python: 3.5
+      env: TOXENV=py35-110
+    - python: 3.5
+      env: TOXENV=py35-111
+    - python: 3.5
+      env: TOXENV=py35-20
+    - python: 3.6
+      env: TOXENV=py36-111
+    - python: 3.6
+      env: TOXENV=py36-20
+# command to install dependencies
+install:
+  - pip install tox
+# command to run tests
+script:
+  - tox -e $TOXENV
+# containers
+sudo: false

moonsheep/forms.py

@@ -14,7 +14,7 @@ def decompress(self, value):
         return value
 
     def format_output(self, rendered_widgets):
-        widget_context = {'min': rendered_widgets[0], 'max': rendered_widgets[1],}
+        widget_context = {'min': rendered_widgets[0], 'max': rendered_widgets[1]}
         return render_to_string('widgets/range_widget.html', widget_context)
 
 
@@ -25,8 +25,8 @@ class RangeField(forms.MultiValueField):
     }
 
     def __init__(self, field_class, widget=forms.TextInput, *args, **kwargs):
-        if not 'initial' in kwargs:
-            kwargs['initial'] = ['','']
+        if 'initial' not in kwargs:
+            kwargs['initial'] = ['', '']
 
         fields = (field_class(), field_class())
 
@@ -38,6 +38,6 @@ def __init__(self, field_class, widget=forms.TextInput, *args, **kwargs):
 
     def compress(self, data_list):
         if data_list:
-            return [self.fields[0].clean(data_list[0]),self.fields[1].clean(data_list[1])]
+            return [self.fields[0].clean(data_list[0]), self.fields[1].clean(data_list[1])]
 
         return None

moonsheep/tasks.py

@@ -1,5 +1,6 @@
 import importlib
 import pbclient
+
 from .verifiers import MIN_CONFIDENCE, DEFAULT_DICT_VERIFIER
 
 

moonsheep/templates/token.html

@@ -0,0 +1,2 @@
+<input type="hidden" name="_task_id" value="{{ task_id }}" />
+<input type="hidden" name="_project_id" value="{{ project_id }}" />

moonsheep/templatetags/moonsheep_token.py

@@ -0,0 +1,11 @@
+from django.template import Library
+
+register = Library()
+
+
+@register.inclusion_tag('token.html')
+def moonsheep_token(task):
+    return {
+        'task_id': task.id,
+        'project_id': task.project_id
+    }

moonsheep/tests/test_settings.py

@@ -1,10 +1,12 @@
 SECRET_KEY = 'fake-key'
+
 INSTALLED_APPS = [
     "moonsheep",
 ]
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': ':memory:',
     }
-}
+}

moonsheep/views.py

@@ -42,28 +42,10 @@ class TaskView(FormView):
     # TODO either we should have full template in Moonsheep or have that template in project_template
     template_name = 'task.html'
     form_template_name = None
+    task = None
+    form_class = None
 
-    def __init__(self, *args, **kwargs):
-        # TODO: don't get task for each creation
-        self.task = self._get_task()
-
-        # Template showing a task: presenter and the form, can be overridden by setting task_template in your Task
-        # By default it uses moonsheep/templates/task.html
-        if hasattr(self.task, 'task_template'):
-            self.template_name = self.task.task_template
-
-        if hasattr(self.task, 'task_form_template'):
-            self.form_template_name = self.task.task_form_template
-        if hasattr(self.task, 'task_form'):
-            self.form_class = self.task.task_form
-
-        if self.form_class is None and self.form_template_name is None:
-            raise TaskWithNoTemplateNorForm(self.task.__class__)
-
-        super(TaskView, self).__init__(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        # TODO: update docstring
+    def get(self, request, *args, **kwargs):
         """
         Returns form for a this task
 
@@ -74,29 +56,12 @@ def get_context_data(self, **kwargs):
         4. Otherwise return error suggesting to implement 2 or 3
         :return: path to the template (string) or Django's Form class
         """
-        context = super(TaskView, self).get_context_data(**kwargs)
-        context.update({
-            'presenter': self.task.get_presenter(),
-            'task': self.task,
-        })
-        return context
+        self.task = self._get_task()
 
-    # =====================
-    # Override FormView to adapt for a case when user hasn't defined form for a given task
-    # and to process form in our own manner
+        self._get_form_class_data()
 
-    def get_form(self, form_class=None):
-        """Return an instance of the form to be used in this view.
-
-        Overrides django.views.generic.edit.FormMixin to adapt for a case
-        when user hasn't defined form for a given task.
-        """
-        if form_class is None:
-            form_class = self.get_form_class()
-
-        if form_class is None:
-            return None
-        return form_class(**self.get_form_kwargs())
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
 
     def post(self, request, *args, **kwargs):
         """
@@ -106,11 +71,19 @@ def post(self, request, *args, **kwargs):
         Overrides django.views.generic.edit.ProcessFormView to adapt for a case
         when user hasn't defined form for a given task.
         """
-        if '_task_type_' not in request.POST:
-            # TODO handle specific task generation, ask @ppeczek if it's right
-            # we would also need task id! and maybe project id!
-            # return HttpResponseBadRequest('Missing _task_type field')
-            pass
+        if '_task_id' not in request.POST:
+            return HttpResponseBadRequest('Missing _task_id field. Include moonsheep_token template tag!')
+
+        if '_project_id' not in request.POST:
+            return HttpResponseBadRequest('Missing _project_id field. Include moonsheep_token template tag!')
+
+        self.task = self._get_task(
+            new=False,
+            project_id=request.POST['_project_id'],
+            task_id=request.POST['_task_id']
+        )
+
+        self._get_form_class_data()
         form = self.get_form()
 
         # no form defined in the task
@@ -127,6 +100,48 @@ def post(self, request, *args, **kwargs):
         else:
             return self.form_invalid(form)
 
+    def get_context_data(self, **kwargs):
+        context = super(TaskView, self).get_context_data(**kwargs)
+        context.update({
+            'presenter': self.task.get_presenter(),
+            'task': self.task,
+        })
+        return context
+
+    def _get_form_class_data(self):
+        # Template showing a task: presenter and the form, can be overridden by setting task_template in your Task
+        # By default it uses moonsheep/templates/task.html
+        if hasattr(self.task, 'task_template'):
+            self.template_name = self.task.task_template
+
+        if hasattr(self.task, 'task_form_template'):
+            self.form_template_name = self.task.task_form_template
+        if hasattr(self.task, 'task_form'):
+            self.form_class = self.task.task_form
+
+        if self.form_class is None and self.form_template_name is None:
+            raise TaskWithNoTemplateNorForm(self.task.__class__)
+
+    # =====================
+    # Override FormView to adapt for a case when user hasn't defined form for a given task
+    # and to process form in our own manner
+
+    def get_form_class(self):
+        return self.task.task_form if hasattr(self.task, 'task_form') else None
+
+    def get_form(self, form_class=None):
+        """Return an instance of the form to be used in this view.
+
+        Overrides django.views.generic.edit.FormMixin to adapt for a case
+        when user hasn't defined form for a given task.
+        """
+        if form_class is None:
+            form_class = self.get_form_class()
+
+        if form_class is None:
+            return None
+        return form_class(**self.get_form_kwargs())
+
     def form_valid(self, form):
         self._send_task(form.cleaned_data)
         return super(TaskView, self).form_valid(form)
@@ -139,7 +154,18 @@ def form_invalid(self, form):
     # End of FormView override
     # ========================
 
-    def _get_task(self):
+    def _get_task(self, new=True, project_id=None, task_id=None):
+        if new:
+            task_data = self._get_new_task()
+        else:
+            task_data = pbclient.get_task(
+                project_id=project_id,
+                task_id=task_id
+            )[0]
+
+        return AbstractTask.create_task_instance(task_data['info']['type'], **task_data)
+
+    def _get_new_task(self):
         """
         Mechanism responsible for getting tasks. Points to PyBossa API and collects task.
         Task structure contains type, url and metadata that might be displayed in template.
@@ -150,14 +176,14 @@ def _get_task(self):
         if TASK_SOURCE == RANDOM_SOURCE:
             task = self.get_random_mocked_task()
         elif TASK_SOURCE == PYBOSSA_SOURCE:
-            task = self.get_pybossa_task()
+            task = self.get_random_pybossa_task()
         else:
             raise TaskSourceNotDefined
 
         if not task:
             raise NoTasksLeft
 
-        return AbstractTask.create_task_instance(task['info']['type'], **task)
+        return task
 
     __mocked_task_counter = 0
 
@@ -193,7 +219,7 @@ def get_random_mocked_task(self):
         else:
             return default_params
 
-    def get_pybossa_task(self):
+    def get_random_pybossa_task(self):
         """
         Method for obtaining task structure from distant source, i.e. PyBossa
 
@@ -232,7 +258,7 @@ def dispatch(self, request, *args, **kwargs):
 
     def get(self, request):
         # empty response so pybossa can set webhook to this endpoint
-        return HttpResponse()
+        return HttpResponse(status=201)
 
     def post(self, request):
         """

runtests.py

@@ -1,15 +1,19 @@
-#!/usr/bin/env python
 import os
 import sys
-
 import django
+
 from django.conf import settings
 from django.test.utils import get_runner
 
-if __name__ == "__main__":
+
+def runtests():
     os.environ['DJANGO_SETTINGS_MODULE'] = 'moonsheep.tests.test_settings'
     django.setup()
     TestRunner = get_runner(settings)
     test_runner = TestRunner()
     failures = test_runner.run_tests(["moonsheep.tests"])
-    sys.exit(bool(failures))
+    sys.exit(bool(failures))
+
+
+if __name__ == "__main__":
+    runtests()

setup.py

@@ -19,6 +19,7 @@
     author_email='[email protected]',
     url='https://github.com/TransparenCEE/moonsheep/',
     download_url='',
+    test_suite='runtests.runtests',
     license='AGPL-3.0',
     install_requires=[
         'Django>=1.11',

tox.ini

@@ -1,7 +1,16 @@
 [tox]
-envlist = py27, py33, flake8
+envlist =
+    py33-{18}
+    py34-{18,19,110,111,20}
+    py35-{18,19,110,111,20}
+    py36-{111,20}
 
 [testenv]
-commands =
-    pip install -e .
-    django-admin.py test --settings=test_settings
+deps =
+    18: Django >= 1.8, < 1.9
+    19: Django >= 1.9, < 1.10
+    110: Django >= 1.10, < 1.11
+    111: Django >= 1.11, < 2.0
+    20: Django >= 2.0, < 2.1
+commands = python setup.py test
+skip_missing_interpreters = true