prepare 0.5

CHANGELOG.rst

@@ -15,6 +15,22 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.5
+-------------------------------------
+2015-04-06
+
+Note, that this release contains minor backwards incompatible changes. The
+changes may affect your existing forms and data. Read the notes below
+carefully.
+
+- Fixed previously wronlgy labeled (in `AppConf`) add-ons/plugins (
+  `fobi.contrib.plugins.form_handlers.db_store`,
+  `fobi.contrib.apps.feincms_integration`,
+  `fobi.contrib.apps.djangocms_integration`,
+  `fobi.contrib.apps.mezzanine_integration`). Due to the change, you would
+  likely have to to rename a couple of database tables and update referencies
+  accordingly. No migrations to solve the issue are included at the moment.
+
 0.4.36
 -------------------------------------
 2015-04-03

ROADMAP.rst

@@ -1,12 +1,12 @@
 Changelog for upcoming releases
 =====================================
-0.6
+0.7
 -------------------------------------
 yyyy-mm-ddd (upcoming).
 
 - Fieldsets.
 
-0.5
+0.6
 -------------------------------------
 yyyy-mm-ddd (upcoming).
 

examples/requirements.txt

@@ -3,7 +3,7 @@ Django
 Jinja2
 MarkupSafe
 MySQL-python
-South
+#South
 Sphinx
 django-admin-tools>=0.5.2
 django-autoslug>=1.7.1

examples/requirements_feincms.txt

@@ -1,2 +1,2 @@
-FeinCMS>=1.9,<1.10
+FeinCMS>=1.9,<1.11
 django-tinymce>=1.5.3

examples/simple/foreign_key_to_saved_form_data_entry/models.py

@@ -2,13 +2,14 @@
 
 from django.db import models
 
-from fobi.contrib.plugins.form_handlers.db_store.models import (
-    SavedFormDataEntry
-    )
+#from fobi.contrib.plugins.form_handlers.db_store.models import (
+#    SavedFormDataEntry
+#    )
 
 class SavedFormDataEntryReference(models.Model):
     """
     Model which references the
     `fobi.contrib.plugins.form_handlers.db_store.models.SavedFormDataEntry`.
     """
-    form = models.ForeignKey(SavedFormDataEntry)
+    #form = models.ForeignKey(SavedFormDataEntry)
+    form = models.ForeignKey('fobi_contrib_plugins_form_handlers_db_store.SavedFormDataEntry')

examples/simple/runserver-bootstrap3-theme-django-1-7-djangocms_integration.sh

@@ -0,0 +1 @@
+./manage.py runserver 0.0.0.0:8000 --traceback -v 3 --settings=settings_bootstrap3_theme_django_1_7_djangocms --traceback -v 3

examples/simple/runserver-bootstrap3-theme-django-1-7-feincms_integration.sh

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

examples/simple/settings.py

@@ -297,6 +297,12 @@
 PACKAGE_NAME_FILEBROWSER = "filebrowser_safe" # Just for tests
 PACKAGE_NAME_GRAPPELLI = "grappelli_safe" # Just for tests
 
+#MIGRATION_MODULES = {
+#    'fobi': 'migrations',
+#    'db_store': 'fobi.contrib.plugins.form_handlers.db_store.migrations'
+#}
+#SOUTH_MIGRATION_MODULES = 'south_migrations'
+
 # **************************************************************
 # ************************ Fobi settings ***********************
 # **************************************************************

examples/simple/settings_bootstrap3_theme_django_1_7_djangocms.py

@@ -0,0 +1,68 @@
+from settings import *
+
+INSTALLED_APPS = list(INSTALLED_APPS)
+INSTALLED_APPS += [
+    'cms', # DjangoCMS
+    'mptt',
+    'menus',
+    'sekizai',
+    #'djangocms_admin_style',
+
+    # Some plugins
+    'djangocms_picture',
+    'djangocms_snippet',
+
+    'fobi.contrib.apps.djangocms_integration', # Fobi DjangoCMS app
+
+    #'djangocms_page', # Example
+]
+
+try:
+    INSTALLED_APPS.remove('south') if 'south' in INSTALLED_APPS else None
+    #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
+
+MIDDLEWARE_CLASSES = list(MIDDLEWARE_CLASSES)
+MIDDLEWARE_CLASSES += [
+    #'django.middleware.cache.UpdateCacheMiddleware',
+    'cms.middleware.page.CurrentPageMiddleware',
+    'cms.middleware.user.CurrentUserMiddleware',
+    'cms.middleware.toolbar.ToolbarMiddleware',
+    'cms.middleware.language.LanguageCookieMiddleware',
+    #'django.middleware.cache.FetchFromCacheMiddleware',
+]
+
+TEMPLATE_CONTEXT_PROCESSORS = list(TEMPLATE_CONTEXT_PROCESSORS)
+TEMPLATE_CONTEXT_PROCESSORS += [
+    'cms.context_processors.media',
+    'sekizai.context_processors.sekizai',
+    'cms.context_processors.cms_settings',
+]
+
+FOBI_DEFAULT_THEME = 'bootstrap3'
+#FOBI_DEFAULT_THEME = 'foundation5'
+#FOBI_DEFAULT_THEME = 'simple'
+
+CMS_TEMPLATES = (
+    ('cms_page/{0}/page_with_sidebar.html'.format(FOBI_DEFAULT_THEME),
+     'General template with sidebar for {0}'.format(FOBI_DEFAULT_THEME)),
+    ('cms_page/{0}/page_without_sidebar.html'.format(FOBI_DEFAULT_THEME),
+     'General template without sidebar for {0}'.format(FOBI_DEFAULT_THEME)),
+)
+
+MIGRATION_MODULES = {
+    'cms': 'cms.migrations_django',
+    'menus': 'menus.migrations_django',
+}
+
+LANGUAGE_CODE = 'en'
+
+#FEINCMS_RICHTEXT_INIT_CONTEXT = {
+#    'TINYMCE_JS_URL': STATIC_URL + 'tiny_mce/tiny_mce.js',
+#}

scripts/install_django_1_7_djangocms.sh

@@ -0,0 +1,9 @@
+pip install -r examples/requirements_django_1_7.txt
+pip install -r examples/requirements_djangocms.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_django_1_7_djangocms --traceback -v 3
+python examples/simple/manage.py syncdb --noinput --settings=settings_bootstrap3_theme_django_1_7_djangocms --traceback -v 3
+python examples/simple/manage.py migrate --noinput --settings=settings_bootstrap3_theme_django_1_7_djangocms --traceback -v 3
+python examples/simple/manage.py fobi_create_test_data --settings=settings_bootstrap3_theme_django_1_7_djangocms --traceback -v 3

scripts/install_django_1_7_feincms.sh

@@ -0,0 +1,9 @@
+pip install -r examples/requirements_django_1_7.txt
+pip install -r examples/requirements_feincms.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_django_1_7_feincms --traceback -v 3
+python examples/simple/manage.py syncdb --noinput --settings=settings_bootstrap3_theme_django_1_7_feincms --traceback -v 3
+python examples/simple/manage.py migrate --noinput --settings=settings_bootstrap3_theme_django_1_7_feincms --traceback -v 3
+python examples/simple/manage.py fobi_create_test_data --settings=settings_bootstrap3_theme_django_1_7_feincms --traceback -v 3

scripts/reinstall_django_1_7_djangocms.sh

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

scripts/reinstall_django_1_7_feincms.sh

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

setup.py

@@ -63,7 +63,7 @@
 for locale_dir in locale_dirs:
     locale_files += [os.path.join(locale_dir, f) for f in os.listdir(locale_dir)]
 
-version = '0.4.36'
+version = '0.5'
 
 install_requires = [
     'Pillow>=2.0.0',
@@ -76,7 +76,6 @@
     'vishap>=0.1.3,<2.0',
     'Unidecode>=0.04.1',
     'django-nine>=0.1.1',
-    #'Django<=1.6.5'
 ]
 
 tests_require = [

src/fobi/__init__.py

@@ -1,6 +1,6 @@
 __title__ = 'django-fobi'
-__version__ = '0.4.36'
-__build__ = 0x000039
+__version__ = '0.5'
+__build__ = 0x000035
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2015 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

src/fobi/contrib/apps/djangocms_integration/apps.py

@@ -1,14 +1,15 @@
 __title__ = 'fobi.contrib.apps.djangocms_integration.apps'
 __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__ = ('Config',)
 
 try:
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.apps.djangocms_integration'
+        name = 'fobi.contrib.apps.djangocms_integration'
+        label = 'fobi_contrib_apps_djangocms_integration'
 
 except ImportError:
     pass

src/fobi/contrib/apps/djangocms_integration/models.py

@@ -1,6 +1,6 @@
 __title__ = 'fobi.contrib.apps.djangocms_integration.models'
 __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__ = ('FobiFormWidget',)
 
@@ -67,7 +67,11 @@ class FobiFormWidget(CMSPlugin):
         help_text=_("Overrides the default success page text.")
         )
 
+    search_fields = ('form_entry__name',)
+
+    class Meta:
+        app_label = 'cms'
+        #db_table = 'djangocms_integration_fobiformwidget'
+
     def __str__(self):
         return self.form_entry.name
-
-    search_fields = ('form_entry__name',)

src/fobi/contrib/apps/feincms_integration/apps.py

@@ -1,14 +1,15 @@
 __title__ = 'fobi.contrib.apps.feincms_integration.apps'
 __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__ = ('Config',)
 
 try:
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.apps.feincms_integration'
+        name = 'fobi.contrib.apps.feincms_integration'
+        label = 'fobi_contrib_apps_feincms_integration'
 
 except ImportError:
     pass

src/fobi/contrib/apps/feincms_integration/widgets.py

@@ -74,6 +74,7 @@ class FobiFormWidget(models.Model, IntegrationProcessor):
     class Meta:
         abstract = True
         app_label = 'fobi'
+        #db_table = 'page_page_fobiformwidget'
 
     def __unicode__(self):
         return ugettext('Fobi form')

src/fobi/contrib/apps/mezzanine_integration/apps.py

@@ -1,14 +1,15 @@
 __title__ = 'fobi.contrib.apps.mezzanine_integration.apps'
 __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__ = ('Config',)
 
 try:
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.apps.mezzanine_integration'
+        name = 'fobi.contrib.apps.mezzanine_integration'
+        label = 'fobi_contrib_apps_mezzanine_integration'
 
 except ImportError:
     pass

src/fobi/contrib/apps/mezzanine_integration/models.py

@@ -1,6 +1,6 @@
 __title__ = 'fobi.contrib.apps.mezzanine_integration.models'
 __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__ = ('FobiFormPage',)
 
@@ -69,6 +69,7 @@ class Meta:
         app_label = 'fobi'
         verbose_name = _("Fobi form")
         verbose_name_plural = _("Fobi forms")
+        #db_table = 'fobi_fobiformpage'
 
     def __unicode__(self):
         return _('Fobi form')

src/fobi/contrib/plugins/form_elements/content/content_image/apps.py

@@ -8,7 +8,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.content.content_image'
+        name = 'fobi.contrib.plugins.form_elements.content.content_image'
+        label = 'fobi_contrib_plugins_form_elements_content_content_image'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/content/content_text/apps.py

@@ -8,7 +8,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.content.content_text'
+        name = 'fobi.contrib.plugins.form_elements.content.content_text'
+        label = 'fobi_contrib_plugins_form_elements_content_content_text'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/content/content_video/apps.py

@@ -8,7 +8,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.content.content_video'
+        name = 'fobi.contrib.plugins.form_elements.content.content_video'
+        label = 'fobi_contrib_plugins_form_elements_content_content_video'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/fields/boolean/apps.py

@@ -8,7 +8,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.fields.boolean'
+        name = 'fobi.contrib.plugins.form_elements.fields.boolean'
+        label = 'fobi_contrib_plugins_form_elements_fields_boolean'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/apps.py

@@ -8,7 +8,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.fields.checkbox_select_multiple'
+        name = 'fobi.contrib.plugins.form_elements.fields.checkbox_select_multiple'
+        label = 'fobi_contrib_plugins_form_elements_fields_checkbox_select_multiple'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/fields/date/apps.py

@@ -10,7 +10,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.fields.date'
+        name = 'fobi.contrib.plugins.form_elements.fields.date'
+        label = 'fobi_contrib_plugins_form_elements_fields_date'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/fields/date_drop_down/apps.py

@@ -8,7 +8,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.fields.date_drop_down'
+        name = 'fobi.contrib.plugins.form_elements.fields.date_drop_down'
+        label = 'fobi_contrib_plugins_form_elements_fields_date_drop_down'
 
 except ImportError:
     pass

src/fobi/contrib/plugins/form_elements/fields/datetime/apps.py

@@ -10,7 +10,8 @@
     from django.apps import AppConfig
 
     class Config(AppConfig):
-        name = label = 'fobi.contrib.plugins.form_elements.fields.datetime'
+        name = 'fobi.contrib.plugins.form_elements.fields.datetime'
+        label = 'fobi_contrib_plugins_form_elements_fields_datetime'
 
 except ImportError:
     pass