added test_project

raagin · raagin · commit f52d44ed9795 · 2019-08-12T19:22:33.000+03:00
diff --git a/setup.py b/setup.py
@@ -5,14 +5,14 @@
 
 setuptools.setup(
     name="django-streamfield",
-    version="1.0.6",
+    version="1.0.7",
     author="Yury Lapshinov",
     author_email="y.raagin@gmail.com",
     description="StreamField for native Django Admin or with Grappelli",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/raagin/django-streamfield",
-    packages=setuptools.find_packages(),
+    packages=setuptools.find_packages(exclude=['test_project']),
     include_package_data=True,
     zip_safe=False,
     classifiers=[
diff --git a/streamfield/__init__.py b/streamfield/__init__.py
@@ -1,2 +1,2 @@
 name = "streamfield"
-VERSION = '1.0.6'
+VERSION = '1.0.7'
diff --git a/streamfield/locale/en/LC_MESSAGES/django.po b/streamfield/locale/en/LC_MESSAGES/django.po
@@ -23,7 +23,7 @@ msgstr ""
 msgid ""
 "\n"
 "<ul> \n"
-"    <li>THe blocks are moving by drag-and-drop.</li>\n"
+"    <li>The blocks are moving by drag-and-drop.</li>\n"
 "    <li>After moving, adding or deleting blocks you need to save entire "
 "object.</li>\n"
 "    <li>if you had deleted, accidentally, some blocks.<br>You may get back "
diff --git a/streamfield/templates/streamfield/streamfield_admin_help.html b/streamfield/templates/streamfield/streamfield_admin_help.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% blocktrans %}
 <ul> 
-    <li>THe blocks are moving by drag-and-drop.</li>
+    <li>The blocks are moving by drag-and-drop.</li>
     <li>After moving, adding or deleting blocks you need to save entire object.</li>
     <li>if you had deleted, accidentally, some blocks.<br>You may get back it,
         by reload the page. At the same time, all edited blocks will remain, but sorting will get from saved version. New, added blocks, 
diff --git a/test_project/db.sqlite3 b/test_project/db.sqlite3
diff --git a/test_project/manage.py b/test_project/manage.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == '__main__':
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'test_project.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
diff --git a/test_project/pages/__init__.py b/test_project/pages/__init__.py
diff --git a/test_project/pages/admin.py b/test_project/pages/admin.py
@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from .models import Page
+
+@admin.register(Page)
+class PageAdmin(admin.ModelAdmin):
+    pass
diff --git a/test_project/pages/migrations/0001_initial.py b/test_project/pages/migrations/0001_initial.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.4 on 2019-08-12 15:46
+
+from django.db import migrations, models
+import streamfield.fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Page',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('stream', streamfield.fields.StreamField(blank=True, default='[]', null=True, verbose_name='Page blocks')),
+            ],
+        ),
+    ]
diff --git a/test_project/pages/migrations/__init__.py b/test_project/pages/migrations/__init__.py
diff --git a/test_project/pages/models.py b/test_project/pages/models.py
@@ -0,0 +1,14 @@
+from django.db import models
+
+from streamfield.fields import StreamField
+from streamblocks.models import RichText, Column
+
+class Page(models.Model):
+    title = models.CharField(max_length=255)
+    stream = StreamField(
+        model_list=[ 
+            RichText,
+            Column
+        ],
+        verbose_name="Page blocks"
+        )
diff --git a/test_project/pages/templates/pages/page_detail.html b/test_project/pages/templates/pages/page_detail.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>{{ page.title }}</title>
+    <style type="text/css">
+        .columns {
+            padding: 0;
+            display: flex;
+            justify-content: space-around;
+        }
+        .columns li {
+            background-color: #faebd7;
+            width: 100%;
+            list-style: none;
+            margin: 5px;
+            padding: 15px;
+        }
+        .rich-text-block {
+            background-color: #dfeefb;
+            padding: 15px;
+        }
+    </style>
+</head>
+<body>
+<h1>{{ page.title }}</h1>
+<div class="content">
+    {{ page.stream.render }}
+</div>
+</body>
+</html>
diff --git a/test_project/pages/tests.py b/test_project/pages/tests.py
@@ -0,0 +1,23 @@
+"""
+This file demonstrates two different styles of tests (one doctest and one
+unittest). These will both pass when you run "manage.py test".
+
+Replace these with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.failUnlessEqual(1 + 1, 2)
+
+__test__ = {"doctest": """
+Another way to test that 1 + 1 is equal to 2.
+
+>>> 1 + 1 == 2
+True
+"""}
+
diff --git a/test_project/pages/views.py b/test_project/pages/views.py
@@ -0,0 +1,6 @@
+from django.views.generic.detail import DetailView
+from .models import Page
+
+class PageView(DetailView):
+    model = Page
+    
diff --git a/test_project/streamblocks/__init__.py b/test_project/streamblocks/__init__.py
diff --git a/test_project/streamblocks/migrations/0001_initial.py b/test_project/streamblocks/migrations/0001_initial.py
@@ -0,0 +1,35 @@
+# Generated by Django 2.2.4 on 2019-08-12 15:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Column',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField(blank=True, null=True)),
+            ],
+            options={
+                'verbose_name': 'Column',
+                'verbose_name_plural': 'Columns',
+            },
+        ),
+        migrations.CreateModel(
+            name='RichText',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField(blank=True, null=True)),
+            ],
+            options={
+                'verbose_name': 'Text',
+            },
+        ),
+    ]
diff --git a/test_project/streamblocks/migrations/__init__.py b/test_project/streamblocks/migrations/__init__.py
diff --git a/test_project/streamblocks/models.py b/test_project/streamblocks/models.py
@@ -0,0 +1,25 @@
+from django.db import models
+
+class RichText(models.Model):
+    text = models.TextField(blank=True, null=True)   
+
+    class Meta:
+        # This will use as name of block in admin
+        verbose_name="Text"
+
+# list of objects
+class Column(models.Model):
+    text = models.TextField(null=True, blank=True)
+    
+    # StreamField option for list of objects
+    as_list = True
+
+    class Meta:
+        verbose_name="Column"
+        verbose_name_plural="Columns"
+
+# Register blocks for StreamField as list of models
+STREAMBLOCKS_MODELS = [
+    RichText,
+    Column
+]
diff --git a/test_project/streamblocks/templates/streamblocks/column.html b/test_project/streamblocks/templates/streamblocks/column.html
@@ -0,0 +1,7 @@
+<ul class="columns">
+    {% for block in block_content %}
+    <li>
+        <p>{{ block.text }}</p>
+    </li>
+    {% endfor %}
+</ul>
diff --git a/test_project/streamblocks/templates/streamblocks/richtext.html b/test_project/streamblocks/templates/streamblocks/richtext.html
@@ -0,0 +1,4 @@
+<!--richtext.html-->
+<div class="rich-text-block">
+    {{ block_content.text|safe }}
+</div>
diff --git a/test_project/streamblocks/tests.py b/test_project/streamblocks/tests.py
@@ -0,0 +1,23 @@
+"""
+This file demonstrates two different styles of tests (one doctest and one
+unittest). These will both pass when you run "manage.py test".
+
+Replace these with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.failUnlessEqual(1 + 1, 2)
+
+__test__ = {"doctest": """
+Another way to test that 1 + 1 is equal to 2.
+
+>>> 1 + 1 == 2
+True
+"""}
+
diff --git a/test_project/streamblocks/views.py b/test_project/streamblocks/views.py
@@ -0,0 +1 @@
+# Create your views here.
diff --git a/test_project/test_project/__init__.py b/test_project/test_project/__init__.py
diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py
@@ -0,0 +1,125 @@
+"""
+Django settings for test_project project.
+
+Generated by 'django-admin startproject' using Django 2.1.8.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.1/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/2.1/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'v%)sakq72iafbjw6ysh3#xjr*)jb=t2^xzigcks3sp&h3e@7yx'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+
+    'streamblocks',
+    'streamfield',
+    'pages',
+
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'test_project.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'test_project.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/2.1/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/2.1/howto/static-files/
+
+STATIC_URL = '/static/'
diff --git a/test_project/test_project/urls.py b/test_project/test_project/urls.py
diff --git a/test_project/test_project/wsgi.py b/test_project/test_project/wsgi.py

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`name = "streamfield"`
`2`		`-VERSION = '1.0.6'`
	`2`	`+VERSION = '1.0.7'`