From f593f5922eaf348252091fdf887b309fd1a634fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=C3=A9rigot?= <nicolas.merigot@gmail.com>
Date: Thu, 22 Nov 2018 17:58:03 +0100
Subject: [PATCH] fix: renaming
---
djangoldp-directory/__init__.py | 1 -
djangoldp-directory/admin.py | 4 ----
djangoldp-directory/apps.py | 5 -----
djangoldp-directory/urls.py | 9 ---------
djangoldp-profile/__init__.py | 1 +
djangoldp-profile/admin.py | 4 ++++
djangoldp-profile/apps.py | 5 +++++
.../migrations/0001_initial.py | 2 +-
.../migrations/__init__.py | 0
{djangoldp-directory => djangoldp-profile}/models.py | 6 +++---
djangoldp-profile/urls.py | 8 ++++++++
setup.py | 6 +++---
12 files changed, 25 insertions(+), 26 deletions(-)
delete mode 100644 djangoldp-directory/__init__.py
delete mode 100644 djangoldp-directory/admin.py
delete mode 100644 djangoldp-directory/apps.py
delete mode 100644 djangoldp-directory/urls.py
create mode 100644 djangoldp-profile/__init__.py
create mode 100644 djangoldp-profile/admin.py
create mode 100644 djangoldp-profile/apps.py
rename {djangoldp-directory => djangoldp-profile}/migrations/0001_initial.py (97%)
rename {djangoldp-directory => djangoldp-profile}/migrations/__init__.py (100%)
rename {djangoldp-directory => djangoldp-profile}/models.py (88%)
create mode 100644 djangoldp-profile/urls.py
diff --git a/djangoldp-directory/__init__.py b/djangoldp-directory/__init__.py
deleted file mode 100644
index 7f74cee..0000000
--- a/djangoldp-directory/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-name = "djangoldp-directory"
diff --git a/djangoldp-directory/admin.py b/djangoldp-directory/admin.py
deleted file mode 100644
index bcc65ba..0000000
--- a/djangoldp-directory/admin.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.contrib import admin
-from .models import DirectoryProfile
-
-admin.site.register(DirectoryProfile)
diff --git a/djangoldp-directory/apps.py b/djangoldp-directory/apps.py
deleted file mode 100644
index 7ebbeda..0000000
--- a/djangoldp-directory/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DjangoldpDirectoryConfig(AppConfig):
- name = 'djangoldp-directory'
diff --git a/djangoldp-directory/urls.py b/djangoldp-directory/urls.py
deleted file mode 100644
index cc82918..0000000
--- a/djangoldp-directory/urls.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""djangoldp directory URL Configuration"""
-from django.conf.urls import url, include
-from django.conf import settings
-from djangoldp.views import LDPViewSet
-from .models import DirectoryProfile
-
-urlpatterns = [
- url(r'^members/', LDPViewSet.urls(model=DirectoryProfile, lookup_field="pseudo", permission_classes=())),
-]
diff --git a/djangoldp-profile/__init__.py b/djangoldp-profile/__init__.py
new file mode 100644
index 0000000..cb3a0c9
--- /dev/null
+++ b/djangoldp-profile/__init__.py
@@ -0,0 +1 @@
+name = "djangoldp_profile"
diff --git a/djangoldp-profile/admin.py b/djangoldp-profile/admin.py
new file mode 100644
index 0000000..d914f1f
--- /dev/null
+++ b/djangoldp-profile/admin.py
@@ -0,0 +1,4 @@
+from django.contrib import admin
+from .models import Profile
+
+admin.site.register(Profile)
diff --git a/djangoldp-profile/apps.py b/djangoldp-profile/apps.py
new file mode 100644
index 0000000..5c801a6
--- /dev/null
+++ b/djangoldp-profile/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class DjangoldpProfileConfig(AppConfig):
+ name = 'djangoldp_profile'
diff --git a/djangoldp-directory/migrations/0001_initial.py b/djangoldp-profile/migrations/0001_initial.py
similarity index 97%
rename from djangoldp-directory/migrations/0001_initial.py
rename to djangoldp-profile/migrations/0001_initial.py
index e0d55d1..c66b411 100644
--- a/djangoldp-directory/migrations/0001_initial.py
+++ b/djangoldp-profile/migrations/0001_initial.py
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
- name='DirectoryProfile',
+ name='Profile',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('picture', models.URLField(blank=True, null=True)),
diff --git a/djangoldp-directory/migrations/__init__.py b/djangoldp-profile/migrations/__init__.py
similarity index 100%
rename from djangoldp-directory/migrations/__init__.py
rename to djangoldp-profile/migrations/__init__.py
diff --git a/djangoldp-directory/models.py b/djangoldp-profile/models.py
similarity index 88%
rename from djangoldp-directory/models.py
rename to djangoldp-profile/models.py
index 834157d..17c2b82 100644
--- a/djangoldp-directory/models.py
+++ b/djangoldp-profile/models.py
@@ -3,7 +3,7 @@ from django.contrib.auth.models import User
from django.db.models.signals import post_save
from django.dispatch import receiver
-class DirectoryProfile(models.Model):
+class Profile(models.Model):
user = models.OneToOneField(User, on_delete=models.CASCADE)
picture = models.URLField(blank=True, null=True)
available = models.NullBooleanField(blank=True)
@@ -26,6 +26,6 @@ class DirectoryProfile(models.Model):
@receiver(post_save, sender=User)
def create_user_profile(sender, instance, created, **kwargs):
if created:
- DirectoryProfile.objects.create(user=instance)
+ Profile.objects.create(user=instance)
else:
- instance.directoryprofile.save()
+ instance.profile.save()
diff --git a/djangoldp-profile/urls.py b/djangoldp-profile/urls.py
new file mode 100644
index 0000000..cd64854
--- /dev/null
+++ b/djangoldp-profile/urls.py
@@ -0,0 +1,8 @@
+"""djangoldp profile URL Configuration"""
+from django.conf.urls import url, include
+from djangoldp.views import LDPViewSet
+from .models import Profile
+
+urlpatterns = [
+ url(r'^members/', LDPViewSet.urls(model=Profile, lookup_field="pseudo", permission_classes=())),
+]
diff --git a/setup.py b/setup.py
index 3f6f021..1a22c87 100644
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,10 @@ from setuptools import setup, find_packages
# allow setup.py to be run from any path
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
-setup(name='djangoldp-directory',
+setup(name='djangoldp_profile',
version='0.0.1',
- description='djangoldp package for directory data models',
- url='http://git.happy-dev.fr/startinblox/djangoldp-directory',
+ description='djangoldp package for profile data models',
+ url='http://git.happy-dev.fr/startinblox/djangoldp_profile',
author="Startin'blox",
author_email='nicolas@happy-dev.fr',
license='MIT',
--
GitLab