From ebde527ae957b9ee224c5c35726f11e46fb27b55 Mon Sep 17 00:00:00 2001 From: Jasper Berghoef Date: Fri, 26 May 2017 16:18:17 +0200 Subject: [PATCH] =?UTF-8?q?Renames=20the=20module=20from=20=E2=80=98person?= =?UTF-8?q?alisation=E2=80=99=20to=20=E2=80=98wagtail=5Fpersonalisation?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sandbox/apps/home/migrations/0001_initial.py | 6 +++--- sandbox/sandbox/apps/home/models.py | 2 +- sandbox/sandbox/settings.py | 2 +- setup.py | 2 +- .../__init__.py | 0 .../adapters.py | 6 +++--- .../admin.py | 2 +- .../admin_urls.py | 2 +- .../app_settings.py | 2 +- .../blocks.py | 2 +- .../forms.py | 0 .../migrations/0001_initial.py | 10 +++++----- .../migrations/0002_auto_20161205_1623.py | 4 ++-- .../migrations/0003_auto_20161206_1005.py | 2 +- .../migrations/0004_segment_persistent.py | 2 +- .../migrations/0005_userisloggedinrule.py | 4 ++-- .../migrations/0006_segment_match_any.py | 2 +- .../migrations/0007_dayrule.py | 4 ++-- .../migrations/0008_devicerule.py | 4 ++-- .../migrations/__init__.py | 0 .../models.py | 4 ++-- .../rules.py | 2 +- .../static/css/form.css | 0 .../static/css/form.css.map | 0 .../static/css/index.css | 0 .../static/css/index.css.map | 0 .../static/img/calendar_icon.png | Bin .../static/img/key_icon.png | Bin .../static/img/persistent_icon.png | Bin .../static/img/referral_icon.png | Bin .../static/img/rocket_icon.png | Bin .../static/img/ruler_icon.png | Bin .../static/img/time_icon.png | Bin .../static/img/visit_count_icon.png | Bin .../static/js/commons.js | 0 .../static/js/commons.js.map | 0 .../static/js/form.js | 0 .../static/js/form.js.map | 0 .../static/js/index.js | 0 .../static/js/index.js.map | 0 .../wagtail_personalisation}/segment/index.html | 0 .../wagtail_personalisation}/tags/datalayer.html | 0 .../templatetags/__init__.py | 0 .../templatetags/datalayer_tags.py | 4 ++-- .../templatetags/personalisation_filters.py | 0 .../utils.py | 0 .../views.py | 2 +- .../wagtail_hooks.py | 14 +++++++------- tests/factories/page.py | 2 +- tests/factories/rule.py | 2 +- tests/factories/segment.py | 2 +- tests/sandbox/pages/models.py | 2 +- tests/sandbox/settings/base.py | 2 +- tests/unit/test_factories.py | 4 ++-- tests/unit/test_models.py | 2 +- tests/unit/test_utils.py | 2 +- 56 files changed, 51 insertions(+), 51 deletions(-) rename src/{personalisation => wagtail_personalisation}/__init__.py (100%) rename src/{personalisation => wagtail_personalisation}/adapters.py (96%) rename src/{personalisation => wagtail_personalisation}/admin.py (95%) rename src/{personalisation => wagtail_personalisation}/admin_urls.py (88%) rename src/{personalisation => wagtail_personalisation}/app_settings.py (81%) rename src/{personalisation => wagtail_personalisation}/blocks.py (96%) rename src/{personalisation => wagtail_personalisation}/forms.py (100%) rename src/{personalisation => wagtail_personalisation}/migrations/0001_initial.py (85%) rename src/{personalisation => wagtail_personalisation}/migrations/0002_auto_20161205_1623.py (82%) rename src/{personalisation => wagtail_personalisation}/migrations/0003_auto_20161206_1005.py (93%) rename src/{personalisation => wagtail_personalisation}/migrations/0004_segment_persistent.py (87%) rename src/{personalisation => wagtail_personalisation}/migrations/0005_userisloggedinrule.py (72%) rename src/{personalisation => wagtail_personalisation}/migrations/0006_segment_match_any.py (88%) rename src/{personalisation => wagtail_personalisation}/migrations/0007_dayrule.py (83%) rename src/{personalisation => wagtail_personalisation}/migrations/0008_devicerule.py (78%) rename src/{personalisation => wagtail_personalisation}/migrations/__init__.py (100%) rename src/{personalisation => wagtail_personalisation}/models.py (97%) rename src/{personalisation => wagtail_personalisation}/rules.py (99%) rename src/{personalisation => wagtail_personalisation}/static/css/form.css (100%) rename src/{personalisation => wagtail_personalisation}/static/css/form.css.map (100%) rename src/{personalisation => wagtail_personalisation}/static/css/index.css (100%) rename src/{personalisation => wagtail_personalisation}/static/css/index.css.map (100%) rename src/{personalisation => wagtail_personalisation}/static/img/calendar_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/key_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/persistent_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/referral_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/rocket_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/ruler_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/time_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/img/visit_count_icon.png (100%) rename src/{personalisation => wagtail_personalisation}/static/js/commons.js (100%) rename src/{personalisation => wagtail_personalisation}/static/js/commons.js.map (100%) rename src/{personalisation => wagtail_personalisation}/static/js/form.js (100%) rename src/{personalisation => wagtail_personalisation}/static/js/form.js.map (100%) rename src/{personalisation => wagtail_personalisation}/static/js/index.js (100%) rename src/{personalisation => wagtail_personalisation}/static/js/index.js.map (100%) rename src/{personalisation/templates/modeladmin/personalisation => wagtail_personalisation/templates/modeladmin/wagtail_personalisation}/segment/index.html (100%) rename src/{personalisation/templates/personalisation => wagtail_personalisation/templates/wagtail_personalisation}/tags/datalayer.html (100%) rename src/{personalisation => wagtail_personalisation}/templatetags/__init__.py (100%) rename src/{personalisation => wagtail_personalisation}/templatetags/datalayer_tags.py (70%) rename src/{personalisation => wagtail_personalisation}/templatetags/personalisation_filters.py (100%) rename src/{personalisation => wagtail_personalisation}/utils.py (100%) rename src/{personalisation => wagtail_personalisation}/views.py (97%) rename src/{personalisation => wagtail_personalisation}/wagtail_hooks.py (94%) diff --git a/sandbox/sandbox/apps/home/migrations/0001_initial.py b/sandbox/sandbox/apps/home/migrations/0001_initial.py index 0126fbb..0fc2a40 100644 --- a/sandbox/sandbox/apps/home/migrations/0001_initial.py +++ b/sandbox/sandbox/apps/home/migrations/0001_initial.py @@ -11,18 +11,18 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('personalisation', '0008_devicerule'), + ('wagtail_personalisation', '0008_devicerule'), ] operations = [ migrations.CreateModel( name='HomePage', fields=[ - ('personalisablepage_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='personalisation.PersonalisablePage')), + ('personalisablepage_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtail_personalisation.PersonalisablePage')), ], options={ 'abstract': False, }, - bases=('personalisation.personalisablepage',), + bases=('wagtail_personalisation.personalisablepage',), ), ] diff --git a/sandbox/sandbox/apps/home/models.py b/sandbox/sandbox/apps/home/models.py index cb2611b..b206eb9 100644 --- a/sandbox/sandbox/apps/home/models.py +++ b/sandbox/sandbox/apps/home/models.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from personalisation.models import PersonalisablePage +from wagtail_personalisation.models import PersonalisablePage class HomePage(PersonalisablePage): diff --git a/sandbox/sandbox/settings.py b/sandbox/sandbox/settings.py index bc9365e..15f5e0e 100644 --- a/sandbox/sandbox/settings.py +++ b/sandbox/sandbox/settings.py @@ -60,7 +60,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', - 'personalisation', + 'wagtail_personalisation', ] diff --git a/setup.py b/setup.py index 65c5f94..36e8c54 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ docs_require = [ ] setup( - name='wagtail-personalisation', + name='wagtail_personalisation', version='0.1.0', description='A Wagtail add-on for showing personalized content', author='Lab Digital BV', diff --git a/src/personalisation/__init__.py b/src/wagtail_personalisation/__init__.py similarity index 100% rename from src/personalisation/__init__.py rename to src/wagtail_personalisation/__init__.py diff --git a/src/personalisation/adapters.py b/src/wagtail_personalisation/adapters.py similarity index 96% rename from src/personalisation/adapters.py rename to src/wagtail_personalisation/adapters.py index 907af69..409b7d6 100644 --- a/src/personalisation/adapters.py +++ b/src/wagtail_personalisation/adapters.py @@ -1,9 +1,9 @@ from __future__ import absolute_import, unicode_literals from django.db.models import F -from personalisation.models import Segment -from personalisation.rules import AbstractBaseRule -from personalisation.utils import create_segment_dictionary +from wagtail_personalisation.models import Segment +from wagtail_personalisation.rules import AbstractBaseRule +from wagtail_personalisation.utils import create_segment_dictionary class BaseSegmentsAdapter(object): diff --git a/src/personalisation/admin.py b/src/wagtail_personalisation/admin.py similarity index 95% rename from src/personalisation/admin.py rename to src/wagtail_personalisation/admin.py index a121dab..8afe1e9 100644 --- a/src/personalisation/admin.py +++ b/src/wagtail_personalisation/admin.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib import admin -from personalisation import models, rules +from wagtail_personalisation import models, rules class UserIsLoggedInRuleAdminInline(admin.TabularInline): diff --git a/src/personalisation/admin_urls.py b/src/wagtail_personalisation/admin_urls.py similarity index 88% rename from src/personalisation/admin_urls.py rename to src/wagtail_personalisation/admin_urls.py index 7816b7e..1c0f54e 100644 --- a/src/personalisation/admin_urls.py +++ b/src/wagtail_personalisation/admin_urls.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from personalisation import views +from wagtail_personalisation import views app_name = 'segment' diff --git a/src/personalisation/app_settings.py b/src/wagtail_personalisation/app_settings.py similarity index 81% rename from src/personalisation/app_settings.py rename to src/wagtail_personalisation/app_settings.py index 85c1d19..cfcf84d 100644 --- a/src/personalisation/app_settings.py +++ b/src/wagtail_personalisation/app_settings.py @@ -6,4 +6,4 @@ from django.utils.module_loading import import_string segments_adapter = import_string(getattr( settings, 'PERSONALISATION_SEGMENTS_ADAPTER', - 'personalisation.adapters.SessionSegmentsAdapter'))() + 'wagtail_personalisation.adapters.SessionSegmentsAdapter'))() diff --git a/src/personalisation/blocks.py b/src/wagtail_personalisation/blocks.py similarity index 96% rename from src/personalisation/blocks.py rename to src/wagtail_personalisation/blocks.py index ddff14e..925330c 100644 --- a/src/personalisation/blocks.py +++ b/src/wagtail_personalisation/blocks.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from personalisation.models import Segment +from wagtail_personalisation.models import Segment from wagtail.wagtailcore import blocks diff --git a/src/personalisation/forms.py b/src/wagtail_personalisation/forms.py similarity index 100% rename from src/personalisation/forms.py rename to src/wagtail_personalisation/forms.py diff --git a/src/personalisation/migrations/0001_initial.py b/src/wagtail_personalisation/migrations/0001_initial.py similarity index 85% rename from src/personalisation/migrations/0001_initial.py rename to src/wagtail_personalisation/migrations/0001_initial.py index 8e11e2c..82dad6a 100644 --- a/src/personalisation/migrations/0001_initial.py +++ b/src/wagtail_personalisation/migrations/0001_initial.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), ('is_segmented', models.BooleanField(default=False)), - ('canonical_page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='variations', to='personalisation.PersonalisablePage')), + ('canonical_page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='variations', to='wagtail_personalisation.PersonalisablePage')), ], options={ 'abstract': False, @@ -60,7 +60,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('start_time', models.TimeField(verbose_name='Starting time')), ('end_time', models.TimeField(verbose_name='Ending time')), - ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_timerule_related', related_query_name='personalisation_timerules', to='personalisation.Segment')), + ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_timerule_related', related_query_name='wagtail_personalisation_timerules', to='wagtail_personalisation.Segment')), ], options={ 'abstract': False, @@ -73,7 +73,7 @@ class Migration(migrations.Migration): ('operator', models.CharField(choices=[('more_than', 'More than'), ('less_than', 'Less than'), ('equal_to', 'Equal to')], default='ht', max_length=20)), ('count', models.PositiveSmallIntegerField(default=0, null=True)), ('counted_page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Page')), - ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_visitcountrule_related', related_query_name='personalisation_visitcountrules', to='personalisation.Segment')), + ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_visitcountrule_related', related_query_name='wagtail_personalisation_visitcountrules', to='wagtail_personalisation.Segment')), ], options={ 'abstract': False, @@ -82,11 +82,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='referralrule', name='segment', - field=modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_referralrule_related', related_query_name='personalisation_referralrules', to='personalisation.Segment'), + field=modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_referralrule_related', related_query_name='wagtail_personalisation_referralrules', to='wagtail_personalisation.Segment'), ), migrations.AddField( model_name='personalisablepage', name='segment', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='segments', to='personalisation.Segment'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='segments', to='wagtail_personalisation.Segment'), ), ] diff --git a/src/personalisation/migrations/0002_auto_20161205_1623.py b/src/wagtail_personalisation/migrations/0002_auto_20161205_1623.py similarity index 82% rename from src/personalisation/migrations/0002_auto_20161205_1623.py rename to src/wagtail_personalisation/migrations/0002_auto_20161205_1623.py index 893d647..3142269 100644 --- a/src/personalisation/migrations/0002_auto_20161205_1623.py +++ b/src/wagtail_personalisation/migrations/0002_auto_20161205_1623.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0001_initial'), + ('wagtail_personalisation', '0001_initial'), ] operations = [ @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('query_parameter', models.TextField(verbose_name='The query parameter to search for')), ('query_value', models.TextField(verbose_name='The value of the parameter to match')), - ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_queryrule_related', related_query_name='personalisation_queryrules', to='personalisation.Segment')), + ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_queryrule_related', related_query_name='wagtail_personalisation_queryrules', to='wagtail_personalisation.Segment')), ], options={ 'abstract': False, diff --git a/src/personalisation/migrations/0003_auto_20161206_1005.py b/src/wagtail_personalisation/migrations/0003_auto_20161206_1005.py similarity index 93% rename from src/personalisation/migrations/0003_auto_20161206_1005.py rename to src/wagtail_personalisation/migrations/0003_auto_20161206_1005.py index f9f8392..e0933c0 100644 --- a/src/personalisation/migrations/0003_auto_20161206_1005.py +++ b/src/wagtail_personalisation/migrations/0003_auto_20161206_1005.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0002_auto_20161205_1623'), + ('wagtail_personalisation', '0002_auto_20161205_1623'), ] operations = [ diff --git a/src/personalisation/migrations/0004_segment_persistent.py b/src/wagtail_personalisation/migrations/0004_segment_persistent.py similarity index 87% rename from src/personalisation/migrations/0004_segment_persistent.py rename to src/wagtail_personalisation/migrations/0004_segment_persistent.py index e2fa581..a4f89f8 100644 --- a/src/personalisation/migrations/0004_segment_persistent.py +++ b/src/wagtail_personalisation/migrations/0004_segment_persistent.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0003_auto_20161206_1005'), + ('wagtail_personalisation', '0003_auto_20161206_1005'), ] operations = [ diff --git a/src/personalisation/migrations/0005_userisloggedinrule.py b/src/wagtail_personalisation/migrations/0005_userisloggedinrule.py similarity index 72% rename from src/personalisation/migrations/0005_userisloggedinrule.py rename to src/wagtail_personalisation/migrations/0005_userisloggedinrule.py index ae75e96..b361d18 100644 --- a/src/personalisation/migrations/0005_userisloggedinrule.py +++ b/src/wagtail_personalisation/migrations/0005_userisloggedinrule.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0004_segment_persistent'), + ('wagtail_personalisation', '0004_segment_persistent'), ] operations = [ @@ -19,7 +19,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('is_logged_in', models.BooleanField(default=False)), - ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_userisloggedinrule_related', related_query_name='personalisation_userisloggedinrules', to='personalisation.Segment')), + ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_userisloggedinrule_related', related_query_name='wagtail_personalisation_userisloggedinrules', to='wagtail_personalisation.Segment')), ], options={ 'abstract': False, diff --git a/src/personalisation/migrations/0006_segment_match_any.py b/src/wagtail_personalisation/migrations/0006_segment_match_any.py similarity index 88% rename from src/personalisation/migrations/0006_segment_match_any.py rename to src/wagtail_personalisation/migrations/0006_segment_match_any.py index 4ffdc76..99bd98f 100644 --- a/src/personalisation/migrations/0006_segment_match_any.py +++ b/src/wagtail_personalisation/migrations/0006_segment_match_any.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0005_userisloggedinrule'), + ('wagtail_personalisation', '0005_userisloggedinrule'), ] operations = [ diff --git a/src/personalisation/migrations/0007_dayrule.py b/src/wagtail_personalisation/migrations/0007_dayrule.py similarity index 83% rename from src/personalisation/migrations/0007_dayrule.py rename to src/wagtail_personalisation/migrations/0007_dayrule.py index 7d40cfb..7bfa79f 100644 --- a/src/personalisation/migrations/0007_dayrule.py +++ b/src/wagtail_personalisation/migrations/0007_dayrule.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0006_segment_match_any'), + ('wagtail_personalisation', '0006_segment_match_any'), ] operations = [ @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('fri', models.BooleanField(default=False, verbose_name='Friday')), ('sat', models.BooleanField(default=False, verbose_name='Saturday')), ('sun', models.BooleanField(default=False, verbose_name='Sunday')), - ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_dayrule_related', related_query_name='personalisation_dayrules', to='personalisation.Segment')), + ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_dayrule_related', related_query_name='wagtail_personalisation_dayrules', to='wagtail_personalisation.Segment')), ], options={ 'abstract': False, diff --git a/src/personalisation/migrations/0008_devicerule.py b/src/wagtail_personalisation/migrations/0008_devicerule.py similarity index 78% rename from src/personalisation/migrations/0008_devicerule.py rename to src/wagtail_personalisation/migrations/0008_devicerule.py index 8f79c9b..448985b 100644 --- a/src/personalisation/migrations/0008_devicerule.py +++ b/src/wagtail_personalisation/migrations/0008_devicerule.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('personalisation', '0007_dayrule'), + ('wagtail_personalisation', '0007_dayrule'), ] operations = [ @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('mobile', models.BooleanField(default=False, verbose_name='Mobile phone')), ('tablet', models.BooleanField(default=False, verbose_name='Tablet')), ('desktop', models.BooleanField(default=False, verbose_name='Desktop')), - ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='personalisation_devicerule_related', related_query_name='personalisation_devicerules', to='personalisation.Segment')), + ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='wagtail_personalisation_devicerule_related', related_query_name='wagtail_personalisation_devicerules', to='wagtail_personalisation.Segment')), ], options={ 'abstract': False, diff --git a/src/personalisation/migrations/__init__.py b/src/wagtail_personalisation/migrations/__init__.py similarity index 100% rename from src/personalisation/migrations/__init__.py rename to src/wagtail_personalisation/migrations/__init__.py diff --git a/src/personalisation/models.py b/src/wagtail_personalisation/models.py similarity index 97% rename from src/personalisation/models.py rename to src/wagtail_personalisation/models.py index 3fc5962..b33b054 100644 --- a/src/personalisation/models.py +++ b/src/wagtail_personalisation/models.py @@ -14,8 +14,8 @@ from wagtail.wagtailadmin.edit_handlers import ( PageChooserPanel, TabbedInterface) from wagtail.wagtailcore.models import Page -from personalisation.forms import AdminPersonalisablePageForm -from personalisation.rules import AbstractBaseRule +from wagtail_personalisation.forms import AdminPersonalisablePageForm +from wagtail_personalisation.rules import AbstractBaseRule @python_2_unicode_compatible diff --git a/src/personalisation/rules.py b/src/wagtail_personalisation/rules.py similarity index 99% rename from src/personalisation/rules.py rename to src/wagtail_personalisation/rules.py index 20e48d1..6e35c62 100644 --- a/src/personalisation/rules.py +++ b/src/wagtail_personalisation/rules.py @@ -17,7 +17,7 @@ from wagtail.wagtailadmin.edit_handlers import ( class AbstractBaseRule(models.Model): """Base for creating rules to segment users with.""" segment = ParentalKey( - 'personalisation.Segment', + 'wagtail_personalisation.Segment', related_name="%(app_label)s_%(class)s_related", related_query_name="%(app_label)s_%(class)ss" ) diff --git a/src/personalisation/static/css/form.css b/src/wagtail_personalisation/static/css/form.css similarity index 100% rename from src/personalisation/static/css/form.css rename to src/wagtail_personalisation/static/css/form.css diff --git a/src/personalisation/static/css/form.css.map b/src/wagtail_personalisation/static/css/form.css.map similarity index 100% rename from src/personalisation/static/css/form.css.map rename to src/wagtail_personalisation/static/css/form.css.map diff --git a/src/personalisation/static/css/index.css b/src/wagtail_personalisation/static/css/index.css similarity index 100% rename from src/personalisation/static/css/index.css rename to src/wagtail_personalisation/static/css/index.css diff --git a/src/personalisation/static/css/index.css.map b/src/wagtail_personalisation/static/css/index.css.map similarity index 100% rename from src/personalisation/static/css/index.css.map rename to src/wagtail_personalisation/static/css/index.css.map diff --git a/src/personalisation/static/img/calendar_icon.png b/src/wagtail_personalisation/static/img/calendar_icon.png similarity index 100% rename from src/personalisation/static/img/calendar_icon.png rename to src/wagtail_personalisation/static/img/calendar_icon.png diff --git a/src/personalisation/static/img/key_icon.png b/src/wagtail_personalisation/static/img/key_icon.png similarity index 100% rename from src/personalisation/static/img/key_icon.png rename to src/wagtail_personalisation/static/img/key_icon.png diff --git a/src/personalisation/static/img/persistent_icon.png b/src/wagtail_personalisation/static/img/persistent_icon.png similarity index 100% rename from src/personalisation/static/img/persistent_icon.png rename to src/wagtail_personalisation/static/img/persistent_icon.png diff --git a/src/personalisation/static/img/referral_icon.png b/src/wagtail_personalisation/static/img/referral_icon.png similarity index 100% rename from src/personalisation/static/img/referral_icon.png rename to src/wagtail_personalisation/static/img/referral_icon.png diff --git a/src/personalisation/static/img/rocket_icon.png b/src/wagtail_personalisation/static/img/rocket_icon.png similarity index 100% rename from src/personalisation/static/img/rocket_icon.png rename to src/wagtail_personalisation/static/img/rocket_icon.png diff --git a/src/personalisation/static/img/ruler_icon.png b/src/wagtail_personalisation/static/img/ruler_icon.png similarity index 100% rename from src/personalisation/static/img/ruler_icon.png rename to src/wagtail_personalisation/static/img/ruler_icon.png diff --git a/src/personalisation/static/img/time_icon.png b/src/wagtail_personalisation/static/img/time_icon.png similarity index 100% rename from src/personalisation/static/img/time_icon.png rename to src/wagtail_personalisation/static/img/time_icon.png diff --git a/src/personalisation/static/img/visit_count_icon.png b/src/wagtail_personalisation/static/img/visit_count_icon.png similarity index 100% rename from src/personalisation/static/img/visit_count_icon.png rename to src/wagtail_personalisation/static/img/visit_count_icon.png diff --git a/src/personalisation/static/js/commons.js b/src/wagtail_personalisation/static/js/commons.js similarity index 100% rename from src/personalisation/static/js/commons.js rename to src/wagtail_personalisation/static/js/commons.js diff --git a/src/personalisation/static/js/commons.js.map b/src/wagtail_personalisation/static/js/commons.js.map similarity index 100% rename from src/personalisation/static/js/commons.js.map rename to src/wagtail_personalisation/static/js/commons.js.map diff --git a/src/personalisation/static/js/form.js b/src/wagtail_personalisation/static/js/form.js similarity index 100% rename from src/personalisation/static/js/form.js rename to src/wagtail_personalisation/static/js/form.js diff --git a/src/personalisation/static/js/form.js.map b/src/wagtail_personalisation/static/js/form.js.map similarity index 100% rename from src/personalisation/static/js/form.js.map rename to src/wagtail_personalisation/static/js/form.js.map diff --git a/src/personalisation/static/js/index.js b/src/wagtail_personalisation/static/js/index.js similarity index 100% rename from src/personalisation/static/js/index.js rename to src/wagtail_personalisation/static/js/index.js diff --git a/src/personalisation/static/js/index.js.map b/src/wagtail_personalisation/static/js/index.js.map similarity index 100% rename from src/personalisation/static/js/index.js.map rename to src/wagtail_personalisation/static/js/index.js.map diff --git a/src/personalisation/templates/modeladmin/personalisation/segment/index.html b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/index.html similarity index 100% rename from src/personalisation/templates/modeladmin/personalisation/segment/index.html rename to src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/index.html diff --git a/src/personalisation/templates/personalisation/tags/datalayer.html b/src/wagtail_personalisation/templates/wagtail_personalisation/tags/datalayer.html similarity index 100% rename from src/personalisation/templates/personalisation/tags/datalayer.html rename to src/wagtail_personalisation/templates/wagtail_personalisation/tags/datalayer.html diff --git a/src/personalisation/templatetags/__init__.py b/src/wagtail_personalisation/templatetags/__init__.py similarity index 100% rename from src/personalisation/templatetags/__init__.py rename to src/wagtail_personalisation/templatetags/__init__.py diff --git a/src/personalisation/templatetags/datalayer_tags.py b/src/wagtail_personalisation/templatetags/datalayer_tags.py similarity index 70% rename from src/personalisation/templatetags/datalayer_tags.py rename to src/wagtail_personalisation/templatetags/datalayer_tags.py index b1325c6..220fccc 100644 --- a/src/personalisation/templatetags/datalayer_tags.py +++ b/src/wagtail_personalisation/templatetags/datalayer_tags.py @@ -1,10 +1,10 @@ from django.template import Library -from personalisation.app_settings import segments_adapter +from wagtail_personalisation.app_settings import segments_adapter register = Library() -@register.inclusion_tag('personalisation/tags/datalayer.html') +@register.inclusion_tag('wagtail_personalisation/tags/datalayer.html') def render_datalayer(): """Render the sessions active segments in a data layer script tag.""" segments = segments_adapter.get_all_segments() diff --git a/src/personalisation/templatetags/personalisation_filters.py b/src/wagtail_personalisation/templatetags/personalisation_filters.py similarity index 100% rename from src/personalisation/templatetags/personalisation_filters.py rename to src/wagtail_personalisation/templatetags/personalisation_filters.py diff --git a/src/personalisation/utils.py b/src/wagtail_personalisation/utils.py similarity index 100% rename from src/personalisation/utils.py rename to src/wagtail_personalisation/utils.py diff --git a/src/personalisation/views.py b/src/wagtail_personalisation/views.py similarity index 97% rename from src/personalisation/views.py rename to src/wagtail_personalisation/views.py index 98811d3..ca2c79f 100644 --- a/src/personalisation/views.py +++ b/src/wagtail_personalisation/views.py @@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404, reverse from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.contrib.modeladmin.views import IndexView -from personalisation.models import PersonalisablePage, Segment +from wagtail_personalisation.models import PersonalisablePage, Segment class SegmentModelIndexView(IndexView): diff --git a/src/personalisation/wagtail_hooks.py b/src/wagtail_personalisation/wagtail_hooks.py similarity index 94% rename from src/personalisation/wagtail_hooks.py rename to src/wagtail_personalisation/wagtail_hooks.py index eef0317..e3e5f49 100644 --- a/src/personalisation/wagtail_hooks.py +++ b/src/wagtail_personalisation/wagtail_hooks.py @@ -10,10 +10,10 @@ from wagtail.wagtailadmin.site_summary import SummaryItem from wagtail.wagtailadmin.widgets import Button, ButtonWithDropdownFromHook from wagtail.wagtailcore import hooks -from personalisation import admin_urls -from personalisation.app_settings import segments_adapter -from personalisation.models import PersonalisablePage, Segment -from personalisation.utils import impersonate_other_page +from wagtail_personalisation import admin_urls +from wagtail_personalisation.app_settings import segments_adapter +from wagtail_personalisation.models import PersonalisablePage, Segment +from wagtail_personalisation.utils import impersonate_other_page logger = logging.getLogger(__name__) @@ -24,8 +24,8 @@ def register_admin_urls(): return [ url(r'^personalisation/', include( admin_urls, - app_name='personalisation', - namespace='personalisation')), + app_name='wagtail_personalisation', + namespace='wagtail_personalisation')), ] @@ -200,7 +200,7 @@ class SegmentSummaryPanel(SummaryItem): def render(self): segment_count = Segment.objects.count() - target_url = reverse('personalisation_segment_modeladmin_index') + target_url = reverse('wagtail_personalisation_segment_modeladmin_index') title = _("Segments") return mark_safe("""
  • diff --git a/tests/factories/page.py b/tests/factories/page.py index b9bc2c1..f4dfeb9 100644 --- a/tests/factories/page.py +++ b/tests/factories/page.py @@ -4,7 +4,7 @@ import factory from wagtail.wagtailcore.models import Page from wagtail_factories import PageFactory -from personalisation.models import PersonalisablePage +from wagtail_personalisation.models import PersonalisablePage from tests.sandbox.pages.models import HomePage diff --git a/tests/factories/rule.py b/tests/factories/rule.py index b4afe87..5d602d0 100644 --- a/tests/factories/rule.py +++ b/tests/factories/rule.py @@ -4,7 +4,7 @@ import datetime import factory -from personalisation import rules +from wagtail_personalisation import rules class DayRuleFactory(factory.DjangoModelFactory): diff --git a/tests/factories/segment.py b/tests/factories/segment.py index c9a7667..5ea0b6c 100644 --- a/tests/factories/segment.py +++ b/tests/factories/segment.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals import factory -from personalisation import models +from wagtail_personalisation import models class SegmentFactory(factory.DjangoModelFactory): diff --git a/tests/sandbox/pages/models.py b/tests/sandbox/pages/models.py index 622a1f8..df654d4 100644 --- a/tests/sandbox/pages/models.py +++ b/tests/sandbox/pages/models.py @@ -4,7 +4,7 @@ from django.db import models from wagtail.wagtailadmin.edit_handlers import FieldPanel from wagtail.wagtailcore.fields import RichTextField -from personalisation.models import PersonalisablePage +from wagtail_personalisation.models import PersonalisablePage class HomePage(PersonalisablePage): diff --git a/tests/sandbox/settings/base.py b/tests/sandbox/settings/base.py index 9fc60d8..1591812 100644 --- a/tests/sandbox/settings/base.py +++ b/tests/sandbox/settings/base.py @@ -64,7 +64,7 @@ MIDDLEWARE = ( ) INSTALLED_APPS = ( - 'personalisation', + 'wagtail_personalisation', 'tests', 'wagtail.contrib.modeladmin', diff --git a/tests/unit/test_factories.py b/tests/unit/test_factories.py index 4c79088..374b7fc 100644 --- a/tests/unit/test_factories.py +++ b/tests/unit/test_factories.py @@ -4,8 +4,8 @@ import datetime import pytest -from personalisation.models import Segment -from personalisation.rules import TimeRule +from wagtail_personalisation.models import Segment +from wagtail_personalisation.rules import TimeRule from tests.factories.rule import ( DayRuleFactory, DeviceRuleFactory, QueryRuleFactory, ReferralRuleFactory, TimeRuleFactory, VisitCountRuleFactory) diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py index d6a9e91..81f6c8e 100644 --- a/tests/unit/test_models.py +++ b/tests/unit/test_models.py @@ -8,7 +8,7 @@ from freezegun import freeze_time from wagtail.wagtailcore.models import Site from wagtail_factories import SiteFactory -from personalisation import rules +from wagtail_personalisation import rules """Time Rule tests""" @freeze_time("10:00:00") diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 9bcb959..0810a03 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,6 +1,6 @@ import pytest -from personalisation.utils import impersonate_other_page +from wagtail_personalisation.utils import impersonate_other_page class Page(object):