Merge branch 'master' into releases

Author: mox1

README.md

@@ -3,48 +3,49 @@ blogstrap.py
 
 Author: [mox1](http://moxone.me)
 
-blogstrap.py is a simple, no frills blog system, powered by Bootstrap and web.py
+blogstrap.py is a simple, no frills blog content management system, powered by Bootstrap and web.py
 In its default configruation the full software stack consists of: 
 * Bootstrap3 (http://getbootstrap.com/)
 * web.py (http://webpy.org/)
 * Peewee ORM (https://github.com/coleifer/peewee)
 * sqlite (http://www.sqlite.org/)
 
-
 blogstrap.py has been designed to be simple and "just work", if you experience problems please create an issue on github!
 
+Blogstrap.py includes an awesome default theme written by [HackerThemes](http://www.hackerthemes.com). Any of HackerThemes "Tales" themes
+will work by default with blogstrap.py.
+
 Example
 ==============
-[My Blog](http://moxone.me) - Consider this site a real world example / demo of blogstrap.py
-
-While blogstrap.py is open-source, my blog does include a copyrighted bootstrap template, called [Tales](https://wrapbootstrap.com/theme/tales-responsive-blog-theme-WB034M8P5). 
-Tales is not required, but you will notice the default blogstrap.py is different from the example above. Please don't steal this guys hard work! (I am not affiliated with him) 
+[mox1's Blog](http://moxone.me) - A live real world example / demo of blogstrap.py
 
 Setup / Initial Config
 ==============
     mkdir my_blog
     cd my_blog
     git clone https://github.com/mox1/webpy-bootstrap-blog .
-    pip install -r requirements.txt (or you can do this through apt/rpm etc.)
-    (Optional) open config.py with your favorite editor and edit a few config settings
+    pip install -r requirements.txt
+    vim config.py
     python ./app.py 
-    In your favorite browser navigate to localhost:8080/admin/admin
-    Create A User
-    Modify the Global Settings
+    
+In your favorite browser navigate to localhost:8080/admin/admin
 
+Usage
+==============
+Have a look at the [QuickStart guide](http://www.moxone.me/post?pid=2)
 
 
 Running with apache / lighttpd / nginx
-====
-While the Usage instruction above will get you up and running with a quick site (via CherryPi), for production / real-world environemnts, 
-you will probably want to run web.py under apache or lighttpd. google "web.py + " your desired web server for instruction. 
+==============
+While the usage instructions above will get you up and running with a quick site for production / real-world environemnts, 
+you will probably want to run web.py under apache or lighttpd. Google "web.py + " your desired web server for instruction. 
 For apache mod_wsgi see: http://webpy.org/cookbook/mod_wsgi-apache 
 For lighttpd mod_fastcgi see: http://webpy.org/cookbook/fastcgi-lighttpd
 
-Running the tests
-====
-There aren't any tests yet, eventually some will be here.
-    python test.py
+Getting Involed
+==============
+It is my goal to eventually turn blogstrap.py into a fully functional, feature complete Blogging platform. But, I can't do all of that by myself!
+Anyone wishing to get involed into the project should join the mailing list at [blogstrap-py@googlegroups.com](blogstrap-py@googlegroups.com)
 
 
 Copyright

app.py

@@ -23,7 +23,7 @@
 import model as m
 import hashlib
 
-VERSION = "0.9.5-BETA"
+VERSION = "0.9.6-BETA"
 
 logger.info("You are running version %s" % VERSION)
 
@@ -61,18 +61,19 @@
 
 def update_db():
     global t_globals
-    logger.debug("Start updating blog data")
+    logger.info("Start updating blog data")
     m.BlogData.update_stats()
-    logger.debug("Finish updating blog data")
+    logger.info("Finish updating blog data")
 
 
 #this function allows us to do periodic things
 #not perfect, but eh. 
 #for now this simply updates the statistics
 #but could easily be used to do more "cron" like things
+#this gets called for EVERY page, so don't do any heavy lifting
 next_cron_run = 0
 def my_processor(handler): 
-    global next_cron_run,td_next
+    global next_cron_run
     if (time.time() > next_cron_run):
         logger.debug("DOING CRON RUN")
         thr = threading.Thread(target=update_db)
@@ -148,7 +149,7 @@ def blog_data(update = False):
 t_globals["dt_as_ago"] = m.datetime_ago
 t_globals["hashlib"] = hashlib
 t_globals["csrf_token"] = csrf_token
-
+t_globals["max_comment"] = config.MAX_COMMENT
 
 #get statistics
 #This is now updated in the Admin class, method globalsettings
@@ -379,14 +380,14 @@ def GET(self):
         query = websafe(data["q"])
         #short querys are a heachache, lets avoid them
         if len(query) < 3:
-            flash("error","Search string \"%s\" is too short." % q)
+            flash("error","Search string \"%s\" is too short." % query)
             return web.seeother(urls[0])
         prev,next = calcprevnext(data)
         #if we drop in here, qo query
         posts = m.Post.search(query,page=next,max=10)
         content = render.blog_teasers(posts,"search?q=%s&n=%s" % (query,(prev-1)),
                                             "search?q=%s&n=%s" % (query,(next+1)))
-        return render.index("Search results for %s" % query, content, "Search Results",query)
+        return render.index("Search results for \"%s\"" % query, content, "Search Results","\"%s\""% query)
 
 class IndexFull:
     def GET(self):
@@ -472,15 +473,15 @@ def POST(self):
             print "New comment SPAM test failed by %s" % ip 
             return web.seeother(url[0])
 
-        postid = websafe(int(data.get("pid",-1)))
+        postid = websafe(int(data.get("pid","-1")))
         text = websafe(data.get("message",None))
-        if text == None:
+        if text == None or len(text) < 1:
             flash("error","Please add some text to that comment!")
             #TODO: can we use web.py to get the url referrer and send them back there?
-            return web.seeother("post?pid=%d" % postid)
+            return web.seeother("post?pid=%s" % postid)
         if len(text) > config.MAX_COMMENT:
-            flash("error","Comment too large, max %d characters" % config.MAX_COMMENT)
-            return web.seeother("post?pid=%d" % postid)
+            flash("error","Comment length of %d too large, max %d characters" % (len(text),config.MAX_COMMENT))
+            return web.seeother("post?pid=%s" % postid)
 
 
         #spam check passed, continue
@@ -525,13 +526,21 @@ def calcprevnext(data):
 def internalerror():
     logger.error("Internal error:",exc_info=True)
     msg = """
-    An internal server error occurred. Please try your request again by
+    We're sorry, an internal error occurred has. Please try your request again by
     hitting back on your web browser. You can also <a href="/"> go back
      to the main page.</a>
     """
     return web.internalerror(msg)
 
-
+def notfound():
+    logger.error("404 Not found error has occurred")
+    #return the homepage with not found
+    
+    return web.notfound(render.fullpageindex("404 Error Not Found","<p>404 Error: The page you have requested was not found!</p>",""))
+ 
+#add our 404 handler
+app.notfound = notfound 
+   
 # Setup the application's error handler
 app.internalerror = web.debugerror if web.config.debug else internalerror
 

config.py

@@ -14,9 +14,10 @@
 TIME_FORMAT = "%a, %d %b %Y" # %H:%M:%S
 #double %% required
 LONG_TIME_FORMAT = "%%A, %%b %s %%Y"
+#The Database limit for this field is 16656, values larger than that will error out.
 MAX_COMMENT = 4096
 #how often to update stats (in seconds)
-STAT_UPDATES = 60 * 60
+STAT_UPDATES = 60 * 60 #every hour by default
 ####END USER EDITABLE####
 
 valid_upload_ext = [".png",".jpg",".jpeg",".gif",".ico"]

model.py

@@ -152,6 +152,8 @@ class User(BaseModel):
     crypted_password = pw.CharField(max_length=40, null=False)
     salt = pw.CharField(max_length=40, null=False)
     remember_token = pw.CharField(max_length=64, null=True)
+    #for future use
+    sm_links = pw.TextField(null=True)
 
     @staticmethod
     def is_setup():
@@ -298,6 +300,7 @@ class Post(BaseModel):
     #1 = moderated (admin must approve comments)
     #2 = disabled (no new comments allowed)
     moderate = pw.IntegerField(null=False,default=0)
+    teaser_txt = pw.TextField(null=False)
 
     #data is web.input, mapping is
     # title = data.nptitle
@@ -322,6 +325,7 @@ def update_from_input(data,userid):
             tags = data["uptags"]
             cat = data["upcat"]
             scat = data["upsubcat"]
+            teaser_txt = data["uptease"]
             html = data["uphtml"]
             mod = int(data["upmod"])
             if data.get("upfav","false") == "true":
@@ -353,6 +357,7 @@ def update_from_input(data,userid):
         post.public = public
         post.updated = datetime.now()
         post.moderate = mod
+        post.teaser_txt = teaser_txt
         post.save()
         return (post,"Successfully updated post!")
 
@@ -442,6 +447,7 @@ def new_from_input(data,userid):
             cat = data["npcat"]
             scat = data["npsubcat"]
             html = data["nphtml"]
+            teaser_txt = data["nptease"]
             mod = int(data["npmod"])
             if data.get("npfav","false") == "true":
                 fav = True
@@ -459,17 +465,19 @@ def new_from_input(data,userid):
             return (None,"Sorry there was an error: %s" % e.message)
 
         post = Post.new(title=title,tags=tags,author_id=userid,image=image,
-                        small_image=small_image,html=html,cat=cat,subcat=scat,fav=fav,public=public,moderate=mod)
+                        small_image=small_image,html=html,cat=cat,subcat=scat,
+                        fav=fav,public=public,moderate=mod,teaser_txt=teaser_txt)
+        
         return (post,"Successfully created new post!")
 
 
     @staticmethod
-    def new(title,tags,author_id,html,image,small_image,cat=None,subcat=None,fav = False,public=True,moderate=0):
+    def new(title,tags,author_id,html,image,small_image,cat=None,subcat=None,fav=False,public=True,moderate=0,teaser_txt=""):
         #get user by id
         user = User.by_id(author_id)
         p = Post.create(title=title,tags=tags,author=user,html=html,
                         image=image,small_image=small_image,created_at=datetime.now(),
-                        favorite=fav,category=cat,subcategory=subcat,moderate=moderate)
+                        favorite=fav,category=cat,subcategory=subcat,moderate=moderate,teaser_txt=teaser_txt)
         return p
 
     #every time this is called, a pageview count is updated"
@@ -512,7 +520,7 @@ class Comment(BaseModel):
     ip = pw.CharField(max_length=20,null=True)
     post = pw.ForeignKeyField(Post,null=False)
     text = pw.TextField(max_length=16656,null=False)
-    email = pw.CharField(max_length=1024,null=False,default="none@none.net")
+    email = pw.CharField(max_length=512,null=False,default="none@none.net")
     parent = pw.ForeignKeyField('self',related_name='children',null=True)
     rank = pw.IntegerField(null=False,default=0)
     indent = pw.IntegerField(null=False,default=0)
@@ -608,11 +616,19 @@ def get_comments(postid,show_mod):
 
     @staticmethod
     def new(postid,parentid,title,author,text,email="none@none.net",admin=False,ip=None):
-        #1st get post, check if comments are allowed
+        #check for size violations
+        if (len(text) > config.MAX_COMMENT) or \
+           (len(text) < 1) or \
+           (len(email) > 512) or \
+           (len(author) > 512) or \
+           (len(title) > 512):
+            return None
+        
+        #2nd get post, check if comments are allowed
         post = Post.by_id(postid)
         if (post == None) or (post.moderate == 2):
             return None
-        #put this post into a "review by admin state"
+        #If moderation is turned on for this post,put this comment into a "review by admin state"
         if post.moderate ==1:
             status = 5
         else:
@@ -623,6 +639,8 @@ def new(postid,parentid,title,author,text,email="none@none.net",admin=False,ip=N
             status = 0
         #we need to convert \n into <br>
         text = newline_to_break(text)
+        #now, actually create and insert comment
+        ##see :http://evolt.org/node/4047/ for algorithm
         rank = 0
         indent = 0
         lastcomment = None
@@ -647,10 +665,10 @@ def new(postid,parentid,title,author,text,email="none@none.net",admin=False,ip=N
             new_comment = Comment.create(email=email,parent=parent,title=title,
                                          author=author,post=postid,text=text,rank=start_rank+1,indent=parent.indent+1,
                                          created_at=datetime.now(),from_admin=admin,status=status,ip=ip)
-            
-
             return new_comment
 
+
+
 #this class / table performs 2 function
 # 1. it is used as an optimization
 #    holding the results of other queries that rarely change

static/css/app.css

@@ -1,3 +1,4 @@
+
 body {
     padding-top: 0px; /* 50px to make the container go all the way to the bottom of the topbar */
 }

static/css/hackertheme-tales-bluered.css

@@ -8,18 +8,20 @@ <h2><i class="icon-heart"></i> Add Comment</h2>
 			$if logged_in == False:
 				<div class="row">
 					<div class="col-md-6">
-						<input type="text" name="name" id="comment-name" placeholder="Name" class="form-control input-lg">
+						<input type="text" name="name" id="comment-name" placeholder="Name" class="form-control input-lg"
+							rel="tooltip" data-original-title="This will be shown as your username with this post. Minimum 3 characters."
+							pattern=".{3,}" title="At least 3 characters please.">
 					</div>
 					<div class="col-md-6">
-						<input type="email" name="e" id="comment-email" placeholder="Email" class="form-control input-lg">
+						<input type="email" name="e" id="comment-email" placeholder="Email" class="form-control input-lg"
+						rel="tooltip" data-original-title="This is only used to fetch your gravatar. It is *NOT* shown publically. Leave blank for a default gravatar.">
 					</div>
 				</div>
 			$else:
 				<p>You are logged in, your current username and e-mail will be used for this post.</p>
-	
 			<input type="text" name="title" id="input-comment-title" placeholder="Title..." class="form-control input-lg">
-			<textarea rows="10" name="message" id="comment-body" placeholder="Your thoughts..." class="form-control input-lg" maxlength="4096"></textarea>
-	
+			<p> HTML not allowed. Maximum length is $max_comment characters. </p>
+			<textarea rows="10" name="message" id="comment-body" placeholder="Your thoughts..." class="form-control input-lg" maxlength="$max_comment"></textarea>
 			<input type="hidden" name="pid" id="input-pid" value="$(cur_post.id)">
 			<input type="hidden" name="replyto" id="input-replyto" value="-1">
 			<input type="hidden" name="email" id="input-email" value="">

templates/add_comment.html

@@ -80,9 +80,17 @@ <h3 class="panel-title"> New Post </h3>
 										</div>
 										</div>
 										<div class="row">
+										<div class="col-md-12">
+											<label class="control-label" for="nptease">Leading Text / Teaser</label>
+											<textarea class="form-control" id="nptease" name="nptease" style="height: 100px: width: 100%;"
+											placeholder="A short description of this post. Displayed before showing the full blog post."></textarea>
+										</div>	
+										</div>
+										<div class="row">
 										<div class="col-md-12">
 											<label class="control-label" for="nphtml">Blog post/html:</label>
-											<textarea class="form-control" id="nphtml" name="nphtml" style="height: 300px; width:100%;" placeholder="Blog post goes here, HTML is allowed."> </textarea>
+											<textarea class="form-control" id="nphtml" name="nphtml" style="height: 300px; width:100%;" 
+											placeholder="Blog post goes here, HTML is allowed."></textarea>
 										</div>
 										</div>
 										<div class="row">

templates/admin.html

@@ -53,6 +53,12 @@ <h4 class="modal-title" id="myModalLabel">Editing Post #$(post.id) - "$(post.tit
 			</div>
 			</div>
 			<div class="row">
+			<div class="col-md-12">
+				<label class="control-label" for="uptease">Leading Text / Teaser</label>
+				<textarea class="form-control" id="uptease" name="uptease" style="height: 100px: width: 100%;">$(post.teaser_txt)</textarea>
+			</div>	
+			</div>
+			<div class="row">
 			<div class="col-md-12">
 				<label class="control-label" for="uphtml">Blog post/html:</label>
 				<textarea class="form-control" id="uphtml" name="uphtml" style="height: 300px; width:100%;">$(post.html)</textarea>

templates/adminsinglepost.html

@@ -1,3 +1,3 @@
 $def with()
 
-<p>powered by blogstrap.py - <a href="https://github.com/mox1/webpy-bootstrap-blog"> Fork me on GitHub</a></p>
+<p><a href="http://hackerthemes.com/">designed by HackerThemes</a> - <a href="https://github.com/mox1/webpy-bootstrap-blog">powered by blogstrap.py</a></p>

templates/copyright.html

@@ -1,5 +1,4 @@
 $def with(blogpost)
-$ preview_text = blogpost.html[0:128] + "..."
 <div class="col-md-6 col-sm-6">
 	<article class=" blog-teaser">
 	    <header>
@@ -12,7 +11,7 @@ <h3><a href="/post?pid=$(blogpost.id)">$:(blogpost.title)</a></h3>
 	        <hr>
 	    </header>
 	    <div class="body">
-	    	$:preview_text
+	    	$:(blogpost.teaser_txt)
 	    </div>
 	    <div class="clearfix">
 	        <a href="/post?pid=$:(blogpost.id)" class="btn btn-tales-one">Read more</a>

templates/singleteaser.html

@@ -22,7 +22,7 @@
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600|PT+Serif:400,400italic' rel='stylesheet' type='text/css'>
 
     <!-- Styles -->
-    <link rel="stylesheet" href="/static/css/styles-basic.css" id="theme-styles">
+    <link rel="stylesheet" href="/static/css/hackertheme-tales-bluered.css" id="theme-styles">
 
     <!--[if lt IE 9]>
         <link rel="stylesheet" href="css/ie8.css">