Move activities into lib directory

src/kawaz/apps/events/activity.py

@@ -4,8 +4,8 @@
 __author__ = 'Alisue <lambdalisue@hashnote.net>'
 from django.contrib.contenttypes.models import ContentType
 from kawaz.core.personas.models import Persona
-from kawaz.apps.activities.models import Activity
-from kawaz.apps.activities.mediator import ActivityMediator
+from activities.models import Activity
+from activities.mediator import ActivityMediator
 
 
 class EventActivityMediator(ActivityMediator):

src/kawaz/apps/events/models.py

@@ -258,5 +258,5 @@ def join_organizer(**kwargs):
     author_field_name='organizer')),
 
 from .activity import EventActivityMediator
-from kawaz.apps.activities.registry import registry
+from activities.registry import registry
 registry.register(Event, EventActivityMediator())

src/kawaz/apps/activities/contrib/hatenablog/activity.py → src/kawaz/core/activities/hatenablog/activity.py

@@ -4,8 +4,8 @@
 __author__ = 'Alisue <lambdalisue@hashnote.net>'
 from django.contrib.contenttypes.models import ContentType
 from kawaz.core.personas.models import Persona
-from kawaz.apps.activities.models import Activity
-from kawaz.apps.activities.mediator import ActivityMediator
+from activities.models import Activity
+from activities.mediator import ActivityMediator
 
 
 class HatenablogEntryActivityMediator(ActivityMediator):

src/kawaz/apps/activities/contrib/hatenablog/migrations/0001_initial.py → src/kawaz/core/activities/hatenablog/migrations/0001_initial.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import kawaz.apps.activities.contrib.hatenablog.models
+import kawaz.core.activities.hatenablog.models
 
 
 class Migration(migrations.Migration):
@@ -17,7 +17,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
                 ('title', models.CharField(verbose_name='タイトル', max_length=128)),
                 ('url', models.URLField(verbose_name='URL', unique=True)),
-                ('thumbnail', models.ImageField(verbose_name='画像', upload_to=kawaz.apps.activities.contrib.hatenablog.models.HatenablogEntry._get_upload_path, default='')),
+                ('thumbnail', models.ImageField(verbose_name='画像',
+                                                upload_to=kawaz.core.activities.hatenablog.models.HatenablogEntry._get_upload_path, default='')),
                 ('created_at', models.DateTimeField(verbose_name='作成日時')),
             ],
             options={

src/kawaz/apps/activities/contrib/hatenablog/models.py → src/kawaz/core/activities/hatenablog/models.py

@@ -34,6 +34,6 @@ def get_absolute_url(self):
         return self.url
 
 from .activity import HatenablogEntryActivityMediator
-from kawaz.apps.activities.registry import registry
+from activities.registry import registry
 registry.register(HatenablogEntry,
                   HatenablogEntryActivityMediator())

src/kawaz/apps/activities/contrib/hatenablog/tests/test_scraper.py → src/kawaz/core/activities/hatenablog/tests/test_scraper.py

@@ -21,7 +21,7 @@ def get(url, **kwargs):
     return response
 
 
-@patch('kawaz.apps.activities.contrib.hatenablog.scraper.requests.get', get)
+@patch('kawaz.core.activities.hatenablog.scraper.requests.get', get)
 class HatenablogFeedScraperTestCase(TestCase):
     def setUp(self):
         self.url = 'feed_url'

src/kawaz/settings.py

@@ -12,6 +12,10 @@
 
 REPOSITORY_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
+# Add extra PYTHON_PATH
+LIB = os.path.join(REPOSITORY_ROOT, 'src', 'lib')
+sys.path.insert(0, os.path.join(LIB, 'django-activities'))
+
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'xd(wr812awpkuu4+7o)#ugb)*a0z!-m^an+m)%ly$l(ses8_g1'
 
@@ -46,6 +50,7 @@
     'registration',
     'crispy_forms',
     'compressor',
+    'activities',
     'kawaz.core.management',
     'kawaz.core.db',
     'kawaz.core.utils',
@@ -55,8 +60,7 @@
     'kawaz.core.forms',
     'kawaz.core.templatetags',
     'kawaz.core.gcal',
-    'kawaz.apps.activities',
-    'kawaz.apps.activities.contrib.hatenablog',
+    'kawaz.core.activities.hatenablog',
     'kawaz.apps.announcements',
     'kawaz.apps.attachments',
     'kawaz.apps.profiles',

src/lib/README.txt

@@ -0,0 +1,3 @@
+このディレクトリ内のアプリは今後外部プラグインとして開発する予定があるものなのでKawazのソースコードとは分離して管理している。
+
+All apps in this directory are planning to be published as django plugins. That's why these codes are separated from source codes of Kawaz.