Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

app name renamed to django-blog-it from micro-blog #50

Merged
merged 1 commit into from
Apr 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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 *
31 changes: 16 additions & 15 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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

Expand All @@ -59,9 +60,9 @@ 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

You can view the complete documentation at http://micro-blog.readthedocs.org/en/latest/?badge=latest
You can view the complete documentation at http://django-blog-it.readthedocs.org/en/latest/?badge=latest


We welcome your feedback and support, raise github ticket if you want to report a bug. Need new features? `Contact us here`_
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
],
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class Migration(migrations.Migration):

dependencies = [
('microblog', '0001_initial'),
('django_blog_it', '0001_initial'),
]

operations = [
Expand All @@ -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'),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class Migration(migrations.Migration):

dependencies = [
('microblog', '0002_auto_20160223_0521'),
('django_blog_it', '0002_auto_20160223_0521'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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)),
],
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
from django_blog_it.django_blog_it.models import Category, Post, Tags, PostHistory, UserRole
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


# models test
Expand Down Expand Up @@ -71,7 +71,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):
Expand All @@ -80,7 +80,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()
Expand Down Expand Up @@ -132,7 +132,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()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

from .models import Post, PostHistory, Category, Tags, Image_File, STATUS_CHOICE, ROLE_CHOICE, UserRole
from .forms import BlogCategoryForm, BlogPostForm, AdminLoginForm, UserRoleForm
from micro_blog import settings
from django_blog_it import settings
try:
from django.contrib.auth import get_user_model
User = get_user_model()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -43,7 +43,7 @@
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
Expand Down Expand Up @@ -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 ---------------------------------------------
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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'),
]

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
Original file line number Diff line number Diff line change
@@ -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


Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.shortcuts import render, get_list_or_404
from micro_blog.microblog.models import Post, Category, Tags
from django_blog_it.django_blog_it.models import Post, Category, Tags
from django.db.models import Count
from django.conf import settings

Expand Down
10 changes: 5 additions & 5 deletions micro_blog/settings.py → django_blog_it/settings.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Django settings for micro_blog project.
Django settings for django_blog_it project.

Generated by 'django-admin startproject' using Django 1.8.2.

Expand Down Expand Up @@ -41,8 +41,8 @@
'django.contrib.staticfiles',
# added for simple pagination
'simple_pagination',
'micro_blog.microblog',
'micro_blog.posts',
'django_blog_it.django_blog_it',
'django_blog_it.posts',
'storages'
)

Expand All @@ -57,7 +57,7 @@
'django.middleware.security.SecurityMiddleware',
)

ROOT_URLCONF = 'micro_blog.urls'
ROOT_URLCONF = 'django_blog_it.urls'

TEMPLATES = [
{
Expand All @@ -75,7 +75,7 @@
},
]

WSGI_APPLICATION = 'micro_blog.wsgi.application'
WSGI_APPLICATION = 'django_blog_it.wsgi.application'


# Database
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions micro_blog/urls.py → django_blog_it/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""micro_blog URL Configuration
"""django_blog_it URL Configuration

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/1.8/topics/http/urls/
Expand All @@ -16,7 +16,7 @@
from django.conf.urls import include, url
from django.contrib import admin
from django.conf.urls.static import static
from .microblog.views import *
from .django_blog_it.views import *
from .posts.views import *
from .settings import MEDIA_URL, MEDIA_ROOT

Expand Down
4 changes: 2 additions & 2 deletions micro_blog/wsgi.py → django_blog_it/wsgi.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
WSGI config for micro_blog project.
WSGI config for django_blog_it project.

It exposes the WSGI callable as a module-level variable named ``application``.

Expand All @@ -11,6 +11,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "micro_blog.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_blog_it.settings")

application = get_wsgi_application()
2 changes: 1 addition & 1 deletion manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys

if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "micro_blog.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_blog_it.settings")

from django.core.management import execute_from_command_line

Expand Down