add info about django 1.8 support; add additional helpers scripts for…

… django 1.8; minor fixes; docs updated

CHANGELOG.rst

@@ -21,6 +21,8 @@ yyyy-mm-dd (unreleased)
 
 - A new theme ``djangocms_admin_style_theme`` added.
 - Making ``fobi.fields.NoneField`` always valid.
+- Initial work on Django 1.8 and 1.9 support.
+- Minor fixes.
 
 0.4.15
 -------------------------------------

QUICK_START.rst

@@ -80,7 +80,7 @@ Putting all together, you would have something like this.
     INSTALLED_APPS = (
         # ...
         # Core
-        'fobi.contrib.themes.bootstrap3',
+        'fobi',
 
         # Theme
         'fobi.contrib.themes.bootstrap3',

README.rst

@@ -9,10 +9,13 @@ form handlers (mechanisms for handling the submitted form data).
 
 Prerequisites
 ===============================================
-- Django 1.5, 1.6, 1.7
-- Python >= 2.6.8, 2.7.*, 3.3.*
+- Django 1.5, 1.6, 1.7, 1.8
+- Python >= 2.6.8, >= 2.7, >= 3.3
 
-Note, that Django 1.7 is not yet proclaimed to be flawlessly supported!
+Note, that Django 1.8 is not yet proclaimed to be flawlessly supported. The
+core and contrib packages (with no dependencies) have been tested against
+the latest development release of Django 1.8. All tests have successfully
+passed, although it's yet too early to claim that Django 1.8 is supported.
 
 Key concepts
 ===============================================

TODOS.rst

@@ -200,6 +200,7 @@ Must haves
   plugin. Make sure it doesn't.
 + Make sure empty lines are not treated as options in the radio or list
   plugins.
+- Django 1.8 support.
 - Add a quickstart documentation.
 - Make a Django-CMS dedicated theme (for the admin) using `djangocms-admin-style
   <https://github.com/divio/djangocms-admin-style>`_.

docs/index.rst

@@ -9,10 +9,13 @@ form handlers (mechanisms for handling the submitted form data).
 
 Prerequisites
 ===============================================
-- Django 1.5, 1.6, 1.7
-- Python >= 2.6.8, 2.7.*, 3.3.*
+- Django 1.5, 1.6, 1.7, 1.8
+- Python >= 2.6.8, >= 2.7, >= 3.3
 
-Note, that Django 1.7 is not yet proclaimed to be flawlessly supported!
+Note, that Django 1.8 is not yet proclaimed to be flawlessly supported. The
+core and contrib packages (with no dependencies) have been tested against
+the latest development release of Django 1.8. All tests have successfully
+passed, although it's yet too early to claim that Django 1.8 is supported.
 
 Key concepts
 ===============================================

docs/quickstart.rst

@@ -80,7 +80,7 @@ Putting all together, you would have something like this.
     INSTALLED_APPS = (
         # ...
         # Core
-        'fobi.contrib.themes.bootstrap3',
+        'fobi',
 
         # Theme
         'fobi.contrib.themes.bootstrap3',

examples/requirements_django18.txt

@@ -0,0 +1,17 @@
+https://www.djangoproject.com/download/1.8a1/tarball/
+
+Jinja2
+MarkupSafe
+MySQL-python
+Sphinx
+django-autoslug==1.7.1
+django-debug-toolbar==0.11.0
+django-registration-redux>=1.1
+docutils
+ipdb
+ipython
+ordereddict>=1.1
+# Selenium shall always be upgraded
+selenium
+simple-timer>=0.2
+tox

examples/simple/runserver-bootstrap3-theme-django18.sh

@@ -0,0 +1,2 @@
+#workon fobi
+./manage.py runserver 0.0.0.0:8000 --traceback -v 3 --settings=settings_bootstrap3_theme_django18 --traceback -v 3

examples/simple/settings_bootstrap3_theme_django18.py

@@ -0,0 +1,21 @@
+from settings import *
+
+INSTALLED_APPS = list(INSTALLED_APPS)
+
+try:
+    INSTALLED_APPS.remove('south') if 'south' in INSTALLED_APPS else None
+    INSTALLED_APPS.remove('tinymce') if 'tinymce' in INSTALLED_APPS else None
+except Exception as e:
+    pass
+
+try:
+    INSTALLED_APPS.remove('admin_tools') \
+        if 'admin_tools' in INSTALLED_APPS else None
+    INSTALLED_APPS.remove('admin_tools.menu') \
+        if 'admin_tools.menu' in INSTALLED_APPS else None
+    INSTALLED_APPS.remove('admin_tools.dashboard') \
+        if 'admin_tools.dashboard' in INSTALLED_APPS else None
+except Exception as e:
+    pass
+
+SOUTH_DATABASE_ADAPTER = ''

scripts/install_django18.sh

@@ -0,0 +1,12 @@
+#pip install -r examples/requirements.txt --allow-all-external --allow-unverified django-admin-tools
+#cd ..
+pip uninstall south -y
+pip install -r examples/requirements_django18.txt
+python setup.py install
+mkdir -p examples/logs examples/db examples/media examples/media/static examples/media/fobi_plugins/content_image
+mkdir -p examples/media/fobi_plugins/file
+python examples/simple/manage.py collectstatic --noinput --settings=settings_bootstrap3_theme_django17 --traceback -v 3
+python examples/simple/manage.py syncdb --noinput --settings=settings_bootstrap3_theme_django17 --traceback -v 3
+python examples/simple/manage.py migrate --noinput --settings=settings_bootstrap3_theme_django17 --traceback -v 3
+python examples/simple/manage.py fobi_create_test_data --settings=settings_bootstrap3_theme_django17 --traceback -v 3
+#cd scripts

scripts/reinstall_django18.sh

@@ -0,0 +1,3 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_django18.sh

scripts/test_django17.sh

@@ -1,6 +1,6 @@
 reset
 ./scripts/uninstall.sh
-./scripts/install.sh
+./scripts/install_django17.sh
 #cd ..
 python examples/simple/manage.py test fobi --settings=settings_bootstrap3_theme_django17 --traceback -v 3
 #cd scripts

scripts/test_django18.sh

@@ -0,0 +1,6 @@
+reset
+./scripts/uninstall.sh
+./scripts/install_django18.sh
+#cd ..
+python examples/simple/manage.py test fobi --settings=settings_bootstrap3_theme_django18 --traceback -v 3
+#cd scripts

src/fobi/base.py

@@ -1955,7 +1955,7 @@ def get_field_name_to_label_map(form, keys_to_remove=[], values_to_remove=[]):
     :return dict:
     """
     if not keys_to_remove:
-        keys_to_remove = get_ignorable_form_fields()
+        keys_to_remove = get_ignorable_form_fields([])
 
     if not values_to_remove:
         values_to_remove = get_ignorable_form_values()

src/fobi/urls/edit.py

@@ -1,12 +1,19 @@
 __title__ = 'fobi.urls.edit'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = 'Copyright (c) 2014 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2014-2015 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('urlpatterns',)
 
-from django.conf.urls import patterns, url #include
+from django.conf.urls import url #patterns, include
 
-urlpatterns = patterns('fobi.views',
+from fobi.views import (
+    dashboard, create_form_entry, edit_form_entry, delete_form_entry,
+    add_form_element_entry, edit_form_element_entry, delete_form_element_entry,
+    add_form_handler_entry, edit_form_handler_entry, delete_form_handler_entry,
+)
+
+#urlpatterns = patterns('fobi.views',
+urlpatterns = [
     # Form submitted success page
     #url(r'^view/submitted/$', view='form_entry_submitted', name='fobi.form_entry_submitted'),
 
@@ -17,38 +24,39 @@
     #url(r'^view/(?P<form_entry_slug>[\w_\-]+)/submitted/$', view='form_entry_submitted', name='fobi.form_entry_submitted'),
 
     # Create form entry
-    url(r'^forms/create/$', view='create_form_entry', name='fobi.create_form_entry'),
+    url(r'^forms/create/$', view=create_form_entry, name='fobi.create_form_entry'),
 
     # Edit form entry
-    url(r'^forms/edit/(?P<form_entry_id>\d+)/$', 'edit_form_entry', name='fobi.edit_form_entry'),
+    url(r'^forms/edit/(?P<form_entry_id>\d+)/$', edit_form_entry, name='fobi.edit_form_entry'),
 
     # Delete form entry
-    url(r'^forms/delete/(?P<form_entry_id>\d+)/$', 'delete_form_entry', name='fobi.delete_form_entry'),
+    url(r'^forms/delete/(?P<form_entry_id>\d+)/$', delete_form_entry, name='fobi.delete_form_entry'),
 
     # Add form element entry
     url(r'^forms/elements/add/(?P<form_entry_id>\d+)/(?P<form_element_plugin_uid>[\w_\-]+)/$',
-        'add_form_element_entry', name='fobi.add_form_element_entry'),
+        add_form_element_entry, name='fobi.add_form_element_entry'),
 
     # Edit form element entry
-    url(r'^forms/elements/edit/(?P<form_element_entry_id>\d+)/$', 'edit_form_element_entry',
-        name='fobi.edit_form_element_entry'),
+    url(r'^forms/elements/edit/(?P<form_element_entry_id>\d+)/$',
+        edit_form_element_entry, name='fobi.edit_form_element_entry'),
 
     # Delete form element entry
-    url(r'^forms/elements/delete/(?P<form_element_entry_id>\d+)/$', 'delete_form_element_entry',
-        name='fobi.delete_form_element_entry'),
+    url(r'^forms/elements/delete/(?P<form_element_entry_id>\d+)/$',
+        delete_form_element_entry, name='fobi.delete_form_element_entry'),
 
     # Add form handler entry
     url(r'^forms/handlers/add/(?P<form_entry_id>\d+)/(?P<form_handler_plugin_uid>[\w_\-]+)/$',
-        'add_form_handler_entry', name='fobi.add_form_handler_entry'),
+        add_form_handler_entry, name='fobi.add_form_handler_entry'),
 
     # Edit form handler entry
-    url(r'^forms/handlers/edit/(?P<form_handler_entry_id>\d+)/$', 'edit_form_handler_entry',
-        name='fobi.edit_form_handler_entry'),
+    url(r'^forms/handlers/edit/(?P<form_handler_entry_id>\d+)/$',
+        edit_form_handler_entry, name='fobi.edit_form_handler_entry'),
 
     # Delete form handler entry
-    url(r'^forms/handlers/delete/(?P<form_handler_entry_id>\d+)/$', 'delete_form_handler_entry',
-        name='fobi.delete_form_handler_entry'),
+    url(r'^forms/handlers/delete/(?P<form_handler_entry_id>\d+)/$',
+        delete_form_handler_entry, name='fobi.delete_form_handler_entry'),
 
     # Dashboard
-    url(r'^$', view='dashboard', name='fobi.dashboard'),
-)
+    url(r'^$', view=dashboard, name='fobi.dashboard'),
+#)
+]

src/fobi/urls/view.py

@@ -4,18 +4,24 @@
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('urlpatterns',)
 
-from django.conf.urls import patterns, url #include
-
+from django.conf.urls import url #patterns, include
+from fobi.views import (
+    form_entry_submitted, view_form_entry, form_entry_submitted
+)
 
-urlpatterns = patterns('fobi.views',
+#urlpatterns = patterns('fobi.views',
+urlpatterns = [
     # Form submitted success page
-    url(r'^view/submitted/$', view='form_entry_submitted', name='fobi.form_entry_submitted'),
+    url(r'^view/submitted/$', view=form_entry_submitted,
+        name='fobi.form_entry_submitted'),
 
     # View form entry
-    url(r'^view/(?P<form_entry_slug>[\w_\-]+)/$', 'view_form_entry', name='fobi.view_form_entry'),
+    url(r'^view/(?P<form_entry_slug>[\w_\-]+)/$', view_form_entry,
+        name='fobi.view_form_entry'),
 
     # Form submitted success page
-    url(r'^view/(?P<form_entry_slug>[\w_\-]+)/submitted/$', view='form_entry_submitted', name='fobi.form_entry_submitted'),
+    url(r'^view/(?P<form_entry_slug>[\w_\-]+)/submitted/$',
+        view=form_entry_submitted, name='fobi.form_entry_submitted'),
 
     # Create form entry
     #url(r'^forms/create/$', view='create_form_entry', name='fobi.create_form_entry'),
@@ -52,4 +58,5 @@
 
     # Dashboard
     #url(r'^$', view='dashboard', name='fobi.dashboard'),
-)
+#)
+]