Merge pull request #194 from vindevoy/develop

Version 1.6.0

.gitignore

@@ -5,4 +5,5 @@ tmp/
 download/
 log/
 
-production.yml
+production.yml
+sitemap.xml

HISTORY.md

@@ -1,3 +1,64 @@
+# Release v1.6.0
+
+
+- author: Yves Vindevogel (vindevoy)
+- date: 2020-05-17
+
+## New Features
+
+- URL rerouting has been implemented on the level of the posts, pages and tags.  This means that you can change the URL of the publication and through the rerouting, it will map the correct document(s).  This can be used to make URLs more readable.
+- Support for draft pages has been included.  If you are writing a new post or page, but you don't want it to be published yet, you can put it as draft in the meta data.  You can decide through the environment.yml if you want to show drafts or not (development vs. production).  
+
+## Enhancements
+
+- A sitemap.xml file can be generated from the Makefile.  This allows Google to crawl the website better.
+- The application controller class now uses htmlmin to remove all the comment in the HTML, remove double spaces and so on.  This results in a smaller HTML going over the wire, but it also results in a better memory footprint for caching.
+
+## Other
+
+- A Facebook page has been created for marketing reasons.  Why else ?
+
+### Github 
+
+For more information on this release, see the issues for this milestone:
+
+- [https://github.com/vindevoy/cherryblog/milestone/15](https://github.com/vindevoy/cherryblog/milestone/15)
+
+
+# Release v1.5.2
+
+
+- author: Yves Vindevogel (vindevoy)
+- date: 2020-05-08
+
+## Hotfix
+
+- There was a runtime-error on the posts and pages if they had to tags. This resulted in a TypeError, and in code the KeyError was captured.  
+
+### Github 
+
+For more information on this release, see the issues for this milestone:
+
+- [https://github.com/vindevoy/cherryblog/milestone/15](https://github.com/vindevoy/cherryblog/milestone/15)
+
+
+# Release v1.5.1
+
+
+- author: Yves Vindevogel (vindevoy)
+- date: 2020-05-07
+
+## Bug Fixes
+
+- There was a problem with the search results. The font weight (bold) of found text in the search results is now case-insensitive.  
+
+### Github 
+
+For more information on this release, see the issues for this milestone:
+
+- [https://github.com/vindevoy/cherryblog/milestone/14](https://github.com/vindevoy/cherryblog/milestone/14)
+
+
 # Release v1.5.0
 
 

Makefile

@@ -1,12 +1,12 @@
 ###
 #
-#   Version: 1.2.1
-#   Date: 2020-04-25
+#   Version: 1.3.0
+#   Date: 2020-05-07
 #   Author: Yves Vindevogel (vindevoy)
 #
-#   Fixes:
-#       - all logging is now in application.log instead of ENVIRONMENT.log (settings determine it for the run)
-#       - better history generation
+#   Features:
+#       - dependency for django-htmlmin
+#       - create sitemap.xml
 #
 ###
 
@@ -59,6 +59,8 @@ dependencies:
 	@pip3 install jinja2
 	@pip3 install pyyaml
 	@pip3 install markdown
+	@pip3 install django-htmlmin
+
 
 	@echo '[OK] Dependencies in Python installed'
 
@@ -99,11 +101,21 @@ history:
 
 	@echo '[OK] history copied to pages'
 
-develop:
+sitemap:
+	@mkdir -p ./src/data/sitemap
+	@python3 ./src/application/sitemap.py
+
+
+	@echo '[OK] sitemap.xml created'
+
+google: sitemap
+	@curl http://www.google.com/ping?sitemap=https://cherryblog.org/sitemap.xml > /dev/null
+
+develop: sitemap
 	@mkdir -p ./log
 	@python3 ./src/application/main.py 2>&1 | tee ./log/application.log
 
-production:
+production: sitemap
 	@mkdir -p /var/log/cherryblog
 	@python3 ./src/application/main.py --env production 2>&1 | tee /var/log/cherryblog/application.log &
 
@@ -113,6 +125,14 @@ stop:
 
 ###
 #
+#   Version: 1.2.1
+#   Date: 2020-04-25
+#   Author: Yves Vindevogel (vindevoy)
+#
+#   Fixes:
+#       - all logging is now in application.log instead of ENVIRONMENT.log (settings determine it for the run)
+#       - better history generation
+#
 #   Version: 1.2.0
 #   Date: 2020-04-11
 #   Author: Yves Vindevogel (vindevoy)

README.md

@@ -9,6 +9,9 @@ CherryBlog implements a very simple blogging website.
 - Pages: the extra static pages like the 'about'
 - Tags: each post has one or multiple tags
 - Search: word based search in posts and pages
+- Caching: in memory caching of data and content
+- Drafts: drafts are pages that are not published yet, only visible in development
+- URL rewriting: the final URL is not necessarily the path to the file 
 
 At this moment, it has the basic news of the project where each article is a post about the new version that was released.
 

src/application/common/options.py

@@ -2,11 +2,12 @@
 #
 #   Full history: see below
 #
-#   Version: 2.2.0
-#   Date: 2020-04-26
+#   Version: 2.3.0
+#   Date: 2020-05-07
 #   Author: Yves Vindevogel (vindevoy)
 #
-#   Caching enabled or not
+#   Features:
+#       - Support for drafts
 #
 ###
 
@@ -29,6 +30,7 @@ class Options(metaclass=Singleton):
     daemon = False
     caching = True
     meta_content_separator = ''
+    include_drafts = False
 
     # SSL settings (for instance for LetsEncrypt)
     use_ssl = False
@@ -46,6 +48,12 @@ class Options(metaclass=Singleton):
 
 ###
 #
+#   Version: 2.2.0
+#   Date: 2020-04-26
+#   Author: Yves Vindevogel (vindevoy)
+#
+#   Caching enabled or not
+#
 #   Version: 2.1.0
 #   Date: 2020-04-23
 #   Author: Yves Vindevogel (vindevoy)