merge conflicts fixed

.gitignore

@@ -55,11 +55,11 @@ docs/_build/
 
 # PyBuilder
 target/
-microblog/migrations/
+django_blog_it/migrations/
 .idea/
 db.sqlite3
 media/
 *~
 *.swp
 *.swo
-micro_blog/awssettings.py
+django_blog_it/awssettings.py

.travis.yml

@@ -26,7 +26,7 @@ before_script:
 # command to run tests
 script:
   - python manage.py test
-  - coverage run --source=micro_blog.posts,micro_blog.microblog manage.py test
+  - coverage run --source=django_blog_it.posts,django_blog_it.django_blog_it manage.py test
 
 after_success:
   coveralls

MANIFEST.in

@@ -1,4 +1,4 @@
 include README.rst
-recursive-include micro_blog/microblog/templates *
-recursive-include micro_blog/microblog/static *
-recursive-include micro_blog/posts/templates *
+recursive-include django_blog_it/django_blog_it/templates *
+recursive-include django_blog_it/django_blog_it/static *
+recursive-include django_blog_it/posts/templates *

README.rst

@@ -1,17 +1,17 @@
-Micro Blog
+django-blog-it
 ------------
 
-.. image:: https://readthedocs.org/projects/micro-blog/badge/?version=latest
-   :target: http://micro-blog.readthedocs.org/en/latest/?badge=latest
+.. image:: https://readthedocs.org/projects/django-blog-it/badge/?version=latest
+   :target: http://django-blog-it.readthedocs.org/en/latest/?badge=latest
 
-.. image:: https://travis-ci.org/MicroPyramid/micro-blog.svg?branch=master
-   :target: https://travis-ci.org/MicroPyramid/micro-blog
+.. image:: https://travis-ci.org/MicroPyramid/django-blog-it.svg?branch=master
+   :target: https://travis-ci.org/MicroPyramid/django-blog-it
 
-.. image:: https://coveralls.io/repos/github/MicroPyramid/micro-blog/badge.svg?branch=master
-   :target: https://coveralls.io/github/MicroPyramid/micro-blog?branch=master
+.. image:: https://coveralls.io/repos/github/MicroPyramid/django-blog-it/badge.svg?branch=master
+   :target: https://coveralls.io/github/MicroPyramid/django-blog-it?branch=master
 
-.. image:: https://landscape.io/github/MicroPyramid/micro-blog/master/landscape.svg?style=flat
-   :target: https://landscape.io/github/MicroPyramid/micro-blog/master
+.. image:: https://landscape.io/github/MicroPyramid/django-blog-it/master/landscape.svg?style=flat
+   :target: https://landscape.io/github/MicroPyramid/django-blog-it/master
    :alt: Code Health
 
 Simple blog package developed with Django.
@@ -27,15 +27,16 @@ Features:
 Installation
 --------------
 
-1. Install microblog using the following command::
+1. Install django-blog-it using the following command::
+
+    pip install django-blog-it
 
-    pip install microblog
 
             (or)
 
-    git clone git://github.com/micropyramid/microblog.git
+    git clone git://github.com/micropyramid/django-blog-it.git
 
-    cd microblog
+    cd django-blog-it
 
     python setup.py install
 
@@ -59,11 +60,11 @@ You can try it by hosting on your own or deploy to Heroku with a button click.
 Deploy To Heroku:
 
 .. image:: https://www.herokucdn.com/deploy/button.svg
-   :target: https://heroku.com/deploy?template=https://github.com/MicroPyramid/micro-blog
+   :target: https://heroku.com/deploy?template=https://github.com/MicroPyramid/django-blog-it
 
-We welcome your feedback and support, raise issues if you want to see a new feature or report a bug.
+You can view the complete documentation at http://django-blog-it.readthedocs.org/en/latest/?badge=latest
 
-    https://github.com/MicroPyramid/micro-blog/issues
 
+We welcome your feedback and support, raise github ticket if you want to report a bug. Need new features? `Contact us here`_
 
-You can view the complete documentation at http://micro-blog.readthedocs.org/en/latest/?badge=latest
+.. _contact us here: https://micropyramid.com/contact-us/

micro_blog/microblog/migrations/0001_initial.py → django_blog_it/django_blog_it/migrations/0001_initial.py

@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
                 ('tags', models.TextField(null=True, blank=True)),
                 ('status', models.CharField(default=b'Drafted', max_length=10, choices=[(b'Drafted', b'Drafted'), (b'Published', b'Published'), (b'Rejected', b'Rejected')])),
                 ('keywords', models.TextField(max_length=500, blank=True)),
-                ('category', models.ForeignKey(to='microblog.Category')),
+                ('category', models.ForeignKey(to='django_blog_it.Category')),
                 ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
         ),

micro_blog/microblog/migrations/0002_auto_20160223_0521.py → django_blog_it/django_blog_it/migrations/0002_auto_20160223_0521.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('microblog', '0001_initial'),
+        ('django_blog_it', '0001_initial'),
     ]
 
     operations = [
@@ -18,6 +18,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='post',
             name='tags',
-            field=models.ManyToManyField(related_name='rel_posts', to='microblog.Tags'),
+            field=models.ManyToManyField(related_name='rel_posts', to='django_blog_it.Tags'),
         ),
     ]

micro_blog/microblog/migrations/0003_auto_20160224_0410.py → django_blog_it/django_blog_it/migrations/0003_auto_20160224_0410.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('microblog', '0002_auto_20160223_0521'),
+        ('django_blog_it', '0002_auto_20160223_0521'),
     ]
 
     operations = [

micro_blog/microblog/migrations/0004_posthistory.py → django_blog_it/django_blog_it/migrations/0004_posthistory.py

@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('microblog', '0003_auto_20160224_0410'),
+        ('django_blog_it', '0003_auto_20160224_0410'),
     ]
 
     operations = [
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('content', models.CharField(max_length=200)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('post', models.ForeignKey(related_name='history', to='microblog.Post')),
+                ('post', models.ForeignKey(related_name='history', to='django_blog_it.Post')),
                 ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
         ),

micro_blog/microblog/migrations/0005_auto_20160330_0539.py → django_blog_it/django_blog_it/migrations/0005_auto_20160330_0539.py

@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('microblog', '0004_posthistory'),
+        ('django_blog_it', '0004_posthistory'),
     ]
 
     operations = [

micro_blog/microblog/migrations/0006_page.py → django_blog_it/django_blog_it/migrations/0006_page.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-04-04 08:35
+# Generated by Django 1.9.4 on 2016-04-05 06:16
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('microblog', '0005_auto_20160330_0539'),
+        ('django_blog_it', '0005_auto_20160330_0539'),
     ]
 
     operations = [

micro_blog/microblog/models.py → django_blog_it/django_blog_it/models.py

@@ -168,5 +168,5 @@ def save(self, *args, **kwargs):
 
         super(Page, self).save(*args, **kwargs)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title

micro_blog/microblog/tests.py → django_blog_it/django_blog_it/tests.py

@@ -1,8 +1,8 @@
 from django.test import TestCase
 from django.test import Client
-from micro_blog.microblog.models import Category, Post, Tags, PostHistory, UserRole, Page
+from django_blog_it.django_blog_it.models import Category, Post, Tags, PostHistory, UserRole, Page
 from django.contrib.auth.models import User
-from micro_blog.microblog.forms import BlogCategoryForm, BlogPostForm, AdminLoginForm
+from django_blog_it.django_blog_it.forms import BlogCategoryForm, BlogPostForm, AdminLoginForm
 from django.core.urlresolvers import reverse
 
 
@@ -31,6 +31,18 @@ def test_category_creation(self):
         self.assertEqual(w.__str__(), w.name)
 
 
+# models test
+class pages_models_test(TestCase):
+
+    def create_pages(self, title="simple page", content="simple content", meta_description="meta description", meta_title="meta title"):
+        return Page.objects.create(title=title, content=content, meta_description=meta_description, meta_title=meta_title)
+
+    def test_page_creation(self):
+        w = self.create_pages()
+        self.assertTrue(isinstance(w, Page))
+        self.assertEqual(w.__str__(), w.title)
+
+
 # models test
 class post_models_test(TestCase):
 
@@ -72,7 +84,7 @@ def test_category_creation(self):
 # class image_file_models_test(TestCase):
 
 #     def create_image_file(self, content="simple content"):
-#         upload_file = open('/microblog/static/favicon.png', 'rb')
+#         upload_file = open('/django_blog_it/static/favicon.png', 'rb')
 #         return Image_File.objects.create(Image_File=upload_file, thumbnail=upload_file, upload=upload_file)
 
 #     def test_category_creation(self):
@@ -81,7 +93,7 @@ def test_category_creation(self):
 #         self.assertEqual(w.__str__(), str(w.date_created()))
 
 
-class micro_blog_forms_test(TestCase):
+class django_blog_it_forms_test(TestCase):
 
     def setUp(self):
         self.client = Client()
@@ -133,7 +145,7 @@ def test_AdminLoginForm(self):
         self.assertTrue(form.is_valid())
 
 
-class micro_blog_views_get(TestCase):
+class django_blog_it_views_get(TestCase):
 
     def setUp(self):
         self.client = Client()

micro_blog/microblog/views.py → django_blog_it/django_blog_it/views.py

@@ -13,7 +13,7 @@
 
 from .models import Post, PostHistory, Category, Tags, Image_File, STATUS_CHOICE, ROLE_CHOICE, UserRole, Page
 from .forms import BlogCategoryForm, BlogPostForm, AdminLoginForm, UserRoleForm, PageForm
-from micro_blog import settings
+from django_blog_it import settings
 try:
     from django.contrib.auth import get_user_model
     User = get_user_model()

micro_blog/docs/source/conf.py → django_blog_it/docs/source/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# MicroSite documentation build configuration file, created by
+# django-blog-it documentation build configuration file, created by
 # sphinx-quickstart on Mon Dec 29 20:41:44 2014.
 #
 # This file is execfile()d with the current directory set to its
@@ -43,17 +43,17 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'MicroBlog'
+project = u'django-blog-it'
 copyright = u'2016, MicroPyramid'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.2'
+version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.2'
+release = '0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -176,7 +176,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'MicroBlogdoc'
+htmlhelp_basename = 'djangoblogitdoc'
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -196,8 +196,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'MicroBlog.tex', u'MicroBlog Documentation',
-   u'MicroBlog', 'manual'),
+  ('index', 'django-blog-it.tex', u'django-blog-it Documentation',
+   u'django-blog-it', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -226,8 +226,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'microblog', u'MicroBlog Documentation',
-     [u'MicroBlog'], 1)
+    ('index', 'django-blog-it', u'django-blog-it Documentation',
+     [u'django-blog-it'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -240,8 +240,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'MicroBlog', u'MicroBlog Documentation',
-   u'MicroBlog', 'MicroBlog', 'One line description of project.',
+  ('index', 'django-blog-it', u'django-blog-it Documentation',
+   u'django-blog-it', 'django-blog-it', 'One line description of project.',
    'Miscellaneous'),
 ]
 

micro_blog/docs/source/index.rst → django_blog_it/docs/source/index.rst

@@ -1,12 +1,12 @@
-MicroBlog's documentation v0.1:
+django-blog-it's documentation v0.1:
 =====================================
 
 Introduction:
 =============
 
-Micro blog is simple and completely customizable blog application. You can integrate it into your project and customise the blog application or just host it to post your articles.
+django-blog-it is simple and completely customizable blog application. You can integrate it into your project and customise the blog application or just host it to post your articles.
 
-Source Code is available in Micropyramid Repository(https://github.com/MicroPyramid/micro-blog).
+Source Code is available in Micropyramid Repository(https://github.com/MicroPyramid/django-blog-it.git).
 
 Modules used:
 	* Pillow
@@ -25,15 +25,15 @@ jQuery  >= 1.7
 Installation Procedure
 ======================
 
-1. Install microblog using the following command::
+1. Install django-blog-it using the following command::
 
-    pip install microblog
+    pip install django-blog-it
 
     		(or)
 
-    git clone git://github.com/micropyramid/microblog.git
+    git clone git://github.com/micropyramid/django-blog-it.git
 
-    cd microblog
+    cd django_blog_it
 
     python setup.py install
 

micro_blog/posts/templatetags/blog_tags.py → django_blog_it/posts/templatetags/blog_tags.py

@@ -1,7 +1,7 @@
 import datetime
 from django import template
-from micro_blog.microblog.models import Post, Tags, UserRole
-from micro_blog.microblog.views import get_user_role
+from django_blog_it.django_blog_it.models import Post, Tags, UserRole
+from django_blog_it.django_blog_it.views import get_user_role
 
 register = template.Library()
 

micro_blog/posts/tests.py → django_blog_it/posts/tests.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 from django.test import Client
-from micro_blog.microblog.models import Category, Post, Tags
+from django_blog_it.django_blog_it.models import Category, Post, Tags
 from django.contrib.auth.models import User
 
 

micro_blog/posts/views.py → django_blog_it/posts/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render, get_list_or_404
-from micro_blog.microblog.models import Post, Category, Tags, Page
+from django_blog_it.django_blog_it.models import Post, Category, Tags, Page
 from django.db.models import Count
 from django.conf import settings