Skip to content

Commit f78d20e

Browse files
author
Sean Casey
committed
Merge branch 'release-0.1'
2 parents c72678c + 094d006 commit f78d20e

15 files changed

Lines changed: 204 additions & 5 deletions

fabfile.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,9 @@ def make_migrations():
1515
run_manage('makemigrations')
1616

1717
def requirements():
18-
local('/home/vagrant/.virtualenvs/le-code-test/bin/pip install -r requirements.txt ')
18+
local('/home/vagrant/.virtualenvs/le-code-test/bin/pip install -r requirements.txt ')
19+
20+
# clear down DB and load sample fixtures
21+
def load_sample_data():
22+
run_manage('flush') # prompts for confirmation
23+
run_manage('loaddata fixtures/test_fixtures.json')

testsite/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pyc

testsite/dog-aromatherapy.jpg

27.8 KB
Loading
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}, "model": "contenttypes.contenttype", "pk": 1}, {"fields": {"model": "permission", "name": "permission", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 2}, {"fields": {"model": "group", "name": "group", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 3}, {"fields": {"model": "user", "name": "user", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 4}, {"fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}, "model": "contenttypes.contenttype", "pk": 5}, {"fields": {"model": "session", "name": "session", "app_label": "sessions"}, "model": "contenttypes.contenttype", "pk": 6}, {"fields": {"model": "stream", "name": "stream", "app_label": "stream"}, "model": "contenttypes.contenttype", "pk": 7}, {"fields": {"model": "photoitem", "name": "photo item", "app_label": "items"}, "model": "contenttypes.contenttype", "pk": 8}, {"fields": {"model": "tweetitem", "name": "tweet item", "app_label": "items"}, "model": "contenttypes.contenttype", "pk": 9}, {"fields": {"expire_date": "2016-04-21T18:18:19.227Z", "session_data": "MzkwYTA0MGZmMDBjMTUyY2NiOWRjNDlkY2ZmOTI4N2ExNTMxNjhkYzp7Il9hdXRoX3VzZXJfaGFzaCI6IjEwMjE5NTgwNDY5MDYwNWU0NWQzMmU4YjdjODhmZmIyM2VhNTVhOGYiLCJfYXV0aF91c2VyX2JhY2tlbmQiOiJkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZCIsIl9hdXRoX3VzZXJfaWQiOjF9"}, "model": "sessions.session", "pk": "x1su0hhwo5dh54f92e0jcykkf6qi8qlc"}, {"fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 1}, "model": "auth.permission", "pk": 1}, {"fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 1}, "model": "auth.permission", "pk": 2}, {"fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 1}, "model": "auth.permission", "pk": 3}, {"fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 2}, "model": "auth.permission", "pk": 4}, {"fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 2}, "model": "auth.permission", "pk": 5}, {"fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 2}, "model": "auth.permission", "pk": 6}, {"fields": {"codename": "add_group", "name": "Can add group", "content_type": 3}, "model": "auth.permission", "pk": 7}, {"fields": {"codename": "change_group", "name": "Can change group", "content_type": 3}, "model": "auth.permission", "pk": 8}, {"fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 3}, "model": "auth.permission", "pk": 9}, {"fields": {"codename": "add_user", "name": "Can add user", "content_type": 4}, "model": "auth.permission", "pk": 10}, {"fields": {"codename": "change_user", "name": "Can change user", "content_type": 4}, "model": "auth.permission", "pk": 11}, {"fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 4}, "model": "auth.permission", "pk": 12}, {"fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 5}, "model": "auth.permission", "pk": 13}, {"fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 5}, "model": "auth.permission", "pk": 14}, {"fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 5}, "model": "auth.permission", "pk": 15}, {"fields": {"codename": "add_session", "name": "Can add session", "content_type": 6}, "model": "auth.permission", "pk": 16}, {"fields": {"codename": "change_session", "name": "Can change session", "content_type": 6}, "model": "auth.permission", "pk": 17}, {"fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 6}, "model": "auth.permission", "pk": 18}, {"fields": {"codename": "add_stream", "name": "Can add stream", "content_type": 7}, "model": "auth.permission", "pk": 19}, {"fields": {"codename": "change_stream", "name": "Can change stream", "content_type": 7}, "model": "auth.permission", "pk": 20}, {"fields": {"codename": "delete_stream", "name": "Can delete stream", "content_type": 7}, "model": "auth.permission", "pk": 21}, {"fields": {"codename": "add_photoitem", "name": "Can add photo item", "content_type": 8}, "model": "auth.permission", "pk": 22}, {"fields": {"codename": "change_photoitem", "name": "Can change photo item", "content_type": 8}, "model": "auth.permission", "pk": 23}, {"fields": {"codename": "delete_photoitem", "name": "Can delete photo item", "content_type": 8}, "model": "auth.permission", "pk": 24}, {"fields": {"codename": "add_tweetitem", "name": "Can add tweet item", "content_type": 9}, "model": "auth.permission", "pk": 25}, {"fields": {"codename": "change_tweetitem", "name": "Can change tweet item", "content_type": 9}, "model": "auth.permission", "pk": 26}, {"fields": {"codename": "delete_tweetitem", "name": "Can delete tweet item", "content_type": 9}, "model": "auth.permission", "pk": 27}, {"fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2016-04-07T18:18:19.224Z", "groups": [], "user_permissions": [], "password": "pbkdf2_sha256$12000$3UcNRpsp3RRD$HU5Knq5ArCxeH6Wv8c8URAwGXY97LZNCuCO6NTzl6yo=", "email": "seantcasey@gmail.com", "date_joined": "2016-04-07T18:18:02.516Z"}, "model": "auth.user", "pk": 1}, {"fields": {"created_at": "2016-04-07T18:28:35Z", "photo_item": null, "user": 1, "tweet_item": 3}, "model": "stream.stream", "pk": 3}, {"fields": {"created_at": "2016-04-07T18:29:11Z", "photo_item": null, "user": 1, "tweet_item": 1}, "model": "stream.stream", "pk": 4}, {"fields": {"created_at": "2016-04-07T18:46:09Z", "photo_item": 3, "user": 1, "tweet_item": null}, "model": "stream.stream", "pk": 6}, {"fields": {"created_at": "2016-04-07T20:28:04Z", "photo_item": null, "user": 1, "tweet_item": 4}, "model": "stream.stream", "pk": 7}, {"fields": {"deleted": false, "created_at": "2016-04-07T18:50:23Z", "user": 1, "image": "./dog-aromatherapy.jpg"}, "model": "items.photoitem", "pk": 3}, {"fields": {"deleted": false, "text": "This is a tweet", "created_at": "2016-04-07T18:19:09Z", "user": 1}, "model": "items.tweetitem", "pk": 1}, {"fields": {"deleted": true, "text": "This is a tweet", "created_at": "2016-04-07T18:21:33Z", "user": 1}, "model": "items.tweetitem", "pk": 2}, {"fields": {"deleted": false, "text": "Another one", "created_at": "2016-04-07T18:21:40Z", "user": 1}, "model": "items.tweetitem", "pk": 3}, {"fields": {"deleted": false, "text": "Doing a coding test!", "created_at": "2016-04-07T20:27:37Z", "user": 1}, "model": "items.tweetitem", "pk": 4}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:19:10.484Z", "object_repr": "TweetItem object", "object_id": "1", "change_message": "", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 1}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:21:35.148Z", "object_repr": "TweetItem object", "object_id": "2", "change_message": "", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 2}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:21:45.396Z", "object_repr": "TweetItem object", "object_id": "3", "change_message": "", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 3}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:28:43.284Z", "object_repr": "Stream object", "object_id": "3", "change_message": "", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 4}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T18:29:08.073Z", "object_repr": "Stream object", "object_id": "3", "change_message": "Changed tweet_item.", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 5}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:29:13.999Z", "object_repr": "Stream object", "object_id": "4", "change_message": "", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 6}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:31:23.371Z", "object_repr": "PhotoItem object", "object_id": "1", "change_message": "", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 7}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:31:25.486Z", "object_repr": "Stream object", "object_id": "5", "change_message": "", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 8}, {"fields": {"action_flag": 3, "action_time": "2016-04-07T18:42:55.798Z", "object_repr": "PhotoItem object", "object_id": "1", "change_message": "", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 9}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:46:21.218Z", "object_repr": "PhotoItem object", "object_id": "2", "change_message": "", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 10}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:46:23.068Z", "object_repr": "Stream object", "object_id": "6", "change_message": "", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 11}, {"fields": {"action_flag": 3, "action_time": "2016-04-07T18:46:37.489Z", "object_repr": "PhotoItem object", "object_id": "2", "change_message": "", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 12}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T18:50:28.284Z", "object_repr": "PhotoItem object", "object_id": "3", "change_message": "", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 13}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T18:50:39.943Z", "object_repr": "Stream object", "object_id": "6", "change_message": "Changed photo_item.", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 14}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:09:09.302Z", "object_repr": "PhotoItem object", "object_id": "3", "change_message": "Changed deleted.", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 15}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:09:14.830Z", "object_repr": "PhotoItem object", "object_id": "3", "change_message": "Changed deleted.", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 16}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:09:29.844Z", "object_repr": "TweetItem object", "object_id": "2", "change_message": "Changed deleted.", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 17}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:10:12.245Z", "object_repr": "TweetItem object", "object_id": "3", "change_message": "Changed deleted.", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 18}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:10:17.465Z", "object_repr": "TweetItem object", "object_id": "3", "change_message": "Changed deleted.", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 19}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:13:43.505Z", "object_repr": "PhotoItem object", "object_id": "3", "change_message": "Changed image.", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 20}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:14:24.245Z", "object_repr": "PhotoItem object", "object_id": "3", "change_message": "Changed deleted.", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 21}, {"fields": {"action_flag": 2, "action_time": "2016-04-07T20:14:30.493Z", "object_repr": "PhotoItem object", "object_id": "3", "change_message": "Changed deleted.", "user": 1, "content_type": 8}, "model": "admin.logentry", "pk": 22}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T20:27:46.869Z", "object_repr": "TweetItem object", "object_id": "4", "change_message": "", "user": 1, "content_type": 9}, "model": "admin.logentry", "pk": 23}, {"fields": {"action_flag": 1, "action_time": "2016-04-07T20:28:08.373Z", "object_repr": "Stream object", "object_id": "7", "change_message": "", "user": 1, "content_type": 7}, "model": "admin.logentry", "pk": 24}]
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('items', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AddField(
15+
model_name='photoitem',
16+
name='deleted',
17+
field=models.BooleanField(default=False),
18+
preserve_default=True,
19+
),
20+
migrations.AddField(
21+
model_name='tweetitem',
22+
name='deleted',
23+
field=models.BooleanField(default=False),
24+
preserve_default=True,
25+
),
26+
]

testsite/items/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
class ItemAbstract(models.Model):
66
user = models.ForeignKey(User)
77
created_at = models.DateTimeField()
8+
deleted = models.BooleanField(default=False)
89

910
class Meta:
1011
abstract = True
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('items', '0001_initial'),
11+
('stream', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='stream',
17+
name='photo_item',
18+
field=models.OneToOneField(default=None, to='items.PhotoItem'),
19+
preserve_default=True,
20+
),
21+
migrations.AddField(
22+
model_name='stream',
23+
name='tweet_item',
24+
field=models.OneToOneField(default=None, to='items.TweetItem'),
25+
preserve_default=True,
26+
),
27+
]
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('stream', '0002_auto_20160407_1813'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='stream',
16+
name='photo_item',
17+
field=models.ForeignKey(to='items.PhotoItem'),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='stream',
22+
name='tweet_item',
23+
field=models.ForeignKey(to='items.TweetItem'),
24+
preserve_default=True,
25+
),
26+
]
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('stream', '0003_auto_20160407_1820'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='stream',
16+
name='photo_item',
17+
field=models.ForeignKey(blank=True, to='items.PhotoItem', null=True),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='stream',
22+
name='tweet_item',
23+
field=models.ForeignKey(blank=True, to='items.TweetItem', null=True),
24+
preserve_default=True,
25+
),
26+
]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
import django.db.models.deletion
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('stream', '0004_auto_20160407_1828'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='stream',
17+
name='photo_item',
18+
field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, blank=True, to='items.PhotoItem', null=True),
19+
preserve_default=True,
20+
),
21+
migrations.AlterField(
22+
model_name='stream',
23+
name='tweet_item',
24+
field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, blank=True, to='items.TweetItem', null=True),
25+
preserve_default=True,
26+
),
27+
]

0 commit comments

Comments
 (0)