solutus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ecaee3a0a58a45099f3c7c431fabb0f15c4b347a27120d45abeaa5640a59172
-  data.tar.gz: fc5f357956eb4497b85b2aa54db9c70ff78fecbe08f9e84158008033d8617767
+  metadata.gz: 7de81fd93b57d53407c0e146559143c7ac95237bb21199afd0d3aeea017c5b94
+  data.tar.gz: 3dce67dce9f05d447159a53517311f1892efa92a719db866322fd055a6442920
 SHA512:
-  metadata.gz: 1f1e2c125d11296e8f8eff2589b74c8fa2f76082690c6589ea6e0995454400f31897cedacba57228840093a2cc751d2b13f2e1510c873501949af3c7f1a62ca2
-  data.tar.gz: 8715a7a6ee14eda0331261ef4a3c4745d721681ee6492a05b6cfe3cdb98119635b6caef17be9e41f27ac25f71cf6290e7f87d5e5444c414025dbf434e29832fb
+  metadata.gz: 4d9c10aa6739895a94e3949d123579393e3c38c4ef6f699f68479f2af6006dcde21a424b23d01c50e45a8e980568fa240e1df185fe786c354dd39efe71a3f340
+  data.tar.gz: 2664ed3b5e4c2c9edfe072cf2a9200173697d93154bc62ad5c47c6289df4d1d21641af1884178a526814c72ed3f9d3966d5f6a6983ae4ba6571d9d0977d74f0a

data/lib/solutus.rb

@@ -5,6 +5,11 @@ require 'mustache'
 require 'redcarpet'
 require 'json'
 require 'nokogiri'
+require 'digest'
+
+#TODO: Add support for tags
+#TODO: Make stress tests
+#TODO: Fix bug : day being off with time in file
 
 class Solutus
     ARCHIVE = "archive"
@@ -18,8 +23,10 @@ class Solutus
     SITE_PAGES_PATH = File.join("pages", "site-pages")
     POSTS_PATH = File.join("pages", "posts")
     BLOG_DATE_FORMAT = "%b %e, %Y"
+    BLOG_DATE_DATA = "%Y-%m-%e %I:%M:%S"
     SETTINGS_FILE = "settings.yml"
     CACHE = ".solutus-cache"
+    PASSWORD_FILE = "password.txt"
     DAY_ENDINGS = ["th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "st"]
 
     @@blog_urls = Hash.new
@@ -39,35 +46,70 @@ class Solutus
             YAML.load(yml_text)
         rescue
             puts "Not a Solutus Project (yet) --- settings.yml not found"
+            false
         end
     end
 
     class Solutus_Server < Sinatra::Base
+        enable :sessions
+
         set :public_folder, SITE_PATH
+        set :environment, :production
         
         configure do
             glob = Solutus.load_settings
             set :global_settings, glob
         end
 
+        class ServerStache < Mustache 
+        end
+
         get "/" do
             send_file File.join(settings.public_folder, 'index.html')
         end
 
+        post "/login" do
+            if !params["password"]
+                return 'no password'
+            end
+            given_password_hash = Digest::MD5.hexdigest params["password"]
+            password = File.read(PASSWORD_FILE)
+            puts given_password_hash.to_s
+            puts "password on file:" + password.to_s
+            if given_password_hash.to_s == password.to_s
+                session[:verified] = true
+                redirect "/edit"
+            else
+                render_login("Wrong password")
+            end
+        end
+
         get "/reset" do
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
             Solutus.command("build")
             redirect "/"
         end
     
         get "/edit" do
+            if !session[:verified]
+                return render_login()
+            end
             render_index
         end
 
         get "/editpage" do
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
             render_edit_page(params["page-path"])
         end
 
         post "/savepage" do
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
             path = params["path"]
 
             f = File.open(path, "r")
@@ -90,16 +132,29 @@ class Solutus
         end
 
         post "/newpost" do
-            path = Solutus.command("new", "post", params["post-title"])
-            Solutus.build
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
+            title = params["post-title"].gsub(/[^a-zA-Z0-9\-]/,"").strip
+            if title.empty?
+                return "Error"
+            end
+            path = Solutus.command("new", "post", title)
+            Solutus.command("build")
             render_edit_post(path)
         end
 
         get "/editpost" do
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
             render_edit_post(*params["post-path"].split(","))
         end
 
         post "/savepost" do
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
             path = params["path"]
             f = File.open(path, "r")
             yml_text = ""
@@ -109,6 +164,7 @@ class Solutus
             f.close
             data = YAML.load(yml_text)
             data["title"] = params["title"]
+            data["subtitle"] = params["subtitle"]
             new_contents = YAML.dump(data)
             new_contents += "---\n"
             new_contents += params["markdown"]
@@ -137,7 +193,7 @@ class Solutus
             else
                 send_404
             end
-        end
+        end            
 
         def send_404
             send_file File.join(path_to_resources, "404.html")
@@ -147,9 +203,6 @@ class Solutus
             File.join(File.dirname(File.expand_path(__FILE__)), '../resources')
         end
 
-        class ServerStache < Mustache 
-        end
-
         def render_edit_page(path)
             f = File.open(File.join(path_to_resources, "editPage.html"), "r")
             template = ""
@@ -170,6 +223,11 @@ class Solutus
 
             result[:title] = data["title"]
             result[:path] = path
+            link = path.split("/")[-1].split(".")[0]
+            if ["error", "index"].include?(link)
+                link = link + ".html"
+            end
+            result[:link] = link
             settings.global_settings.each do |key, val|
                 result[key.to_sym] = val
             end
@@ -200,10 +258,19 @@ class Solutus
             data = YAML.load(file_contents)
 
             result[:title] = data["title"]
+            result[:date] = data["date"].strftime(BLOG_DATE_FORMAT)
             result[:markdown] = file_contents.split("---")[-1]
             result[:link] = url
             result[:canview] = url != "/"
             result[:path] = path
+            result[:subtitle] = data["subtitle"]
+            result.render
+        end
+
+        def render_login(message="")
+            ServerStache.template = File.read(File.join(path_to_resources, "login.html"))
+            result = ServerStache.new
+            result[:message] = message
             result.render
         end
 
@@ -286,7 +353,9 @@ class Solutus
                 deploy
             else 
                 if args.length >= 2
-                    if args[0] == "create"
+                    if args[0] == "password"
+                        create_password(args[1])
+                    elsif args[0] == "create"
                         new_project(args[1])
                     else
                         if args.length >= 3
@@ -328,6 +397,9 @@ class Solutus
     def self.build
         puts "Solutus is building the static site"
         settings_data = load_settings
+        if settings_data == false
+            return
+        end
         
         if File.directory?(BUILD_PATH)
             FileUtils.remove_dir(BUILD_PATH)
@@ -367,6 +439,7 @@ class Solutus
             yaml_data[entry] = contents
             data = YAML.load(contents)
             date = data["date"]
+            subtitle = data.fetch("subtitle", "")
             relative_dir = File.join(date.year.to_s, date.month.to_s, date.day.to_s, entry.split(".")[0])
             year = date.year.to_s
             if !@@blog_urls.key?(year)
@@ -376,7 +449,8 @@ class Solutus
                 "title" => data["title"], 
                 "url" => File.join(ARCHIVE, relative_dir),
                 "file_path" => path,
-                "date" => date
+                "date" => date,
+                "subtitle" => subtitle
             })
         end
 
@@ -385,7 +459,16 @@ class Solutus
         get_recents(recents_count).reverse.each do |post|
             url = post["url"]
             title = post["title"]
-            recents += "<div class=\"solutus-recent-posts\"><a href=\"/#{url}\">#{title}</a></div>"
+            date = prettify_date(post["date"])
+            subtitle = post["subtitle"]
+
+            block = <<HERE
+<div class="solutus-recents-block">
+    <a class="solutus-blog-thumbnail" href="/#{url}">#{title}</a> - #{date}
+    <div class="solutus-blog-subtitle"><i>#{subtitle}</i></div>
+</div>
+HERE
+            recents += block
         end
 
         yaml_data.each do |entry, contents|
@@ -457,12 +540,13 @@ class Solutus
             sorted.each do |hash|
                 url = hash["url"]
                 title = hash["title"]
-                pretty_date = hash["date"].strftime("%b %e") + 
-                    DAY_ENDINGS[hash["date"].strftime("%e").to_i]
-                content += "<div class=\"solutus-blog-block\">"
-                content += "<div class=\"solutus-blog-title\"><a href=\"/#{url}\">#{title}</a></div>"
-                content += "<div>#{pretty_date}</div>"
-                content += "</div>"
+                pretty_date = prettify_date(hash["date"])
+                content += "<div class=\"solutus-blog-block\">\n"
+                content += "    <div class=\"solutus-blog-title\">\n"
+                content += "        <a href=\"/#{url}\">#{title}</a>\n"
+                content += "    </div>\n"
+                content += "    <div>#{pretty_date}</div>\n"
+                content += "</div>\n"
             end
         end
         path = File.join(SITE_PATH, ARCHIVE, "index.html")
@@ -507,8 +591,17 @@ class Solutus
     end
     
     def self.new_page(title)
-        file_title = title.gsub(/\s+/, "")
-        path = File.join(SITE_PAGES_PATH, file_title + ".yml")
+        title = title.gsub(/\s+/, "").gsub(/[^a-zA-Z0-9\-]/, "").strip
+        if title.empty?
+            puts "Bad name"
+            return
+        end
+        if ["edit"].include?(title)
+            puts "Can't use #{title} as a page name."
+            return
+        end
+    
+        path = File.join(SITE_PAGES_PATH, title + ".yml")
         if File.file?(path)
             puts "Page with that name already exists."
             return
@@ -531,7 +624,7 @@ HERE
 
     def self.new_post(title)
         i = 1
-        new_title = title.gsub(/\s+/, "")
+        new_title = title.gsub(/\s+/, "").gsub(/[^a-zA-Z0-9\-]/, "").strip
         if title.empty?
             puts "Empty title"
             return ""
@@ -545,11 +638,12 @@ HERE
                 break
             end
         end
-        date = Time.now.strftime("%Y-%m-%e %I:%M:%S")
+        date = Time.now.strftime(BLOG_DATE_DATA)
         text = <<HERE
 ---
 title: #{title}
 date: #{date}
+subtitle: Another new blog post
 ---
 *This is a temporary blog post page!*
 HERE
@@ -574,6 +668,10 @@ HERE
         end
     end
 
+    def self.prettify_date(date)
+        date.strftime("%b %e") + DAY_ENDINGS[date.strftime("%e").to_i]
+    end
+        
     def self.get_recents(count)
         res = Array.new
         @@blog_urls.each do |yr, arr|
@@ -601,7 +699,23 @@ HERE
         result
     end
 
+    def self.create_password(password)
+        content = Digest::MD5.hexdigest password
+        if File.file?(PASSWORD_FILE)
+            FileUtils.rm(PASSWORD_FILE)
+        end
+        f = File.new(PASSWORD_FILE, "w")
+        f.write(content)
+        f.close
+        puts "Wrote password to password.txt"
+    end
+
     def self.new_project(name)
+        name = name.gsub(/[^a-zA-Z0-9\-]/, "").strip
+        if name == ""
+            puts "Invalid name"
+            return
+        end
         if File.directory?(name)
             puts "Invalid name, already a folder with that name"
             print "Overwrite? [Y/n]"
@@ -664,6 +778,8 @@ HERE
             {{{date}}}
         {{/blog}}
         {{{content}}}
+        <h3>Recent Posts</h3>
+        {{{recents}}}
         <small style="display: block; text-align: center;">&copy; {{year}} {{author}}</small>
         {{{watermark}}}
     </div>
@@ -672,9 +788,11 @@ HERE
 </html>
 HERE
 
+        datetime = Time.now.strftime(BLOG_DATE_DATA)
         test_file = <<HERE
 title: Example Blog Post
-date: 2018-05-10 03:43:20
+date: #{datetime}
+subtitle: an example post...
 ---
 *This is an example blog post page!*
 HERE
@@ -692,6 +810,7 @@ HERE
 
         files = {
             File.join(name, "settings.yml") => settings_file,
+            File.join(name, ".gitignore") => PASSWORD_FILE + "\n",
             File.join(name, "static", "css", "styles.css") => styles_file,
             File.join(name, "templates", "default.html") => default_file,
             File.join(name, "pages", "posts", "test.md") => test_file,

data/resources/editBlog.html

@@ -16,6 +16,14 @@
         h1, h2, h3 {
             line-height:1.2
         }
+
+        input[type=text] {
+            width: 500px;
+        }
+        a {
+            text-decoration: none;
+            color: #4286f4;
+        }
     </style>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
     <script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
@@ -23,29 +31,51 @@
 </head>
 
 <body>
-    <h1>Editing <span style="border: 1px solid gray" id="title-input" contenteditable>{{title}}</span></h1>
-    ({{path}})
-    <p><a href="/edit">Back to Edit</a></p>
-    {{#canview}}
-    <p><a href="{{link}}">View on Site</a></p>
-    {{/canview}}
-    <p><button id="solutus-save-button" type="submit">Save</button></p>
-    <textarea id="solutus-mde">{{{markdown}}}</textarea>
+    <h1>Editing <span style="border: 1px dotted gray" id="title-input" contenteditable>{{title}}</span></h1>
+    <code>{{path}}</code> ({{date}})
+    <p>
+        [<a href="/edit">Back to Edit</a>]
+        {{#canview}}
+        [<a href="{{link}}">View on Site</a>]
+        {{/canview}}
+    </p>
+    <hr>
+    <p>
+        <button id="solutus-save-button" type="submit">Save</button>
+        <b><span id="solutus-status">Saved.</span></b>
+    </p>
+
+    <p>Subtitle: <input type="text" value="{{subtitle}}" placeholder="Subtitle text" id="solutus-subtitle-input"/></p>
 
+    <textarea id="solutus-mde">{{{markdown}}}</textarea>
+    <p style="text-align: center;">
+        <small>Powered by <a href="https://github.com/jeromew21/solutus">Solutus</a></small>
+    </p>
     <script>
         var simplemde = new SimpleMDE({ element: document.getElementById("solutus-mde") });
 
+        function updateStatus(status) {
+            $("#solutus-status").html(status);
+        }
+
         function save() {
+            updateStatus("Saving...")
             $.post("/savepost", {
                 "path": "{{path}}",
                 "title": $("#title-input").html(),
-                "markdown": simplemde.value()
+                "markdown": simplemde.value(),
+                "subtitle": $("#solutus-subtitle-input").val()
             }, function(response) {
                 console.log(response);
+                updateStatus("Saved.");
             });
         }
 
         $("#solutus-save-button").click(save);
+
+        $(document).keydown(function() {
+            updateStatus("Unsaved changes.")
+        })
     </script>
 </body>
 </html>

data/resources/editPage.html

@@ -4,36 +4,53 @@
 
     <style type="text/css">
         #solutus-editmenu {
-            width: 100%;
-            margin: 0;
-            padding: 15px;
+            font-family: "Segoe UI", sans-serif;
+            display: table-row;
             background-color: #eeeeee;
-            font-family: sans-serif;
+        }
+
+        .solutus-edit-block {
+            display: table-cell;
+            padding: 8px 12px 8px 12px;
         }
     </style>
     {{{stylesheets}}}
 </head>
 
 <body>
-    <div id="solutus-editmenu">
-        <a href="/edit">Back to Edit</a> &nbsp;&nbsp;&nbsp;&nbsp;
-        Editing <b>{{title}}</b> @ <code>{{path}}</code> &nbsp;&nbsp;&nbsp;&nbsp;
-        <button id="solutus-save-button">Save</button>
+    <div style="display: table;">
+        <div id="solutus-editmenu">
+            <div class="solutus-edit-block"><a href="/edit">Back to Edit</a></div>               
+            <div class="solutus-edit-block">Editing <a href="{{link}}"><b>{{title}}</b></a> @ <code>{{path}}</code></div>
+            <div class="solutus-edit-block"><button type="button" class="btn btn-primary" id="solutus-save-button">Save</button></div>   
+            <div class="solutus-edit-block"><b><span id="solutus-status"></span></b></div>
+        </div>
     </div>
     {{{everything}}}
     {{{scripts}}}
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
     <script>
+        function updateStatus(status) {
+            $("#solutus-status").html(status);
+        }
+
         function save() {
+            updateStatus("Saving...")
             $.post("/savepage", {
                 "path": "{{path}}",
                 "content": $("#solutus-content").html()
             }, function(response) {
                 console.log(response);
+                updateStatus("Saved.");
             });
         }
 
         $("#solutus-save-button").click(save);
+        $("#solutus-content").keydown(function() {
+            updateStatus("Unsaved changes.")
+        })
+
+        updateStatus("Saved.");
     </script>
 </body>
 </html>

data/resources/index.html

@@ -16,12 +16,17 @@
         h1, h2, h3 {
             line-height:1.2
         }
+
+        a {
+            text-decoration: none;
+            color: #4286f4;
+        }
     </style>
 </head>
 
 <body>
     <h1>Editing {{name}}</h1>
-    <p><a href="/">View Site</a></p>
+    <p>[<a href="/">View Site</a>]</p>
     <p>
         <form method="get" action="/editpage">
             <fieldset>
@@ -49,5 +54,8 @@
             </fieldset>
         </form>
     </p>
+    <p style="text-align: center;">
+        <small>Powered by <a href="https://github.com/jeromew21/solutus">Solutus</a></small>
+    </p>
 </body>
 </html>

data/resources/login.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<head>
+    <title>Log in to edit</title>
+    <style type="text/css">
+        body {
+            margin:40px auto;
+            background-color: #eeeeee;
+            max-width:650px;
+            line-height:1.6;
+            font-size:18px;
+            color:#444;
+            padding:0 10px;
+            font-family: "Segoe UI", sans-serif;
+        }
+
+        h1, h2, h3 {
+            line-height:1.2
+        }
+    </style>
+</head>
+
+<body>
+    <h1>Login</h1>
+    {{message}}
+    <form method="post" action="/login">
+        <p>Password: <input type="password" name="password" />
+    </form>
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jerome Wei
@@ -79,6 +79,7 @@ files:
 - resources/editBlog.html
 - resources/editPage.html
 - resources/index.html
+- resources/login.html
 homepage: https://github.com/jeromew21/solutus
 licenses:
 - MIT