solutus 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49cd8eff79c5ef6ec077eca26f41a41d665388f7a4dcac730a310f1df588cb95
-  data.tar.gz: 8f502367c1b27d14040cf2856fab20f365f91b3c05e6b26486a4102a8329e3fc
+  metadata.gz: 6b53796ffa09cef641f839b82b1c6a550039db52c0dfeba0b20b1f4e5fa291cd
+  data.tar.gz: f98588c4cb4b9b4ae957457438770f6c21c8d33fe964bf5f091ba98ce12ba375
 SHA512:
-  metadata.gz: a1aae2085d6b3ac081bf89db1e3b74a2aba9b72c4616e8b1ab977409f4da952cf0a8d8e3fde3e00946a69ba79f1bfa90639cc9396a8ca746c1bcdd6b1db4bfcb
-  data.tar.gz: '09e0f4b38235c12bc62efed2705bbf021ac68428cda126a9e1429daf18becea546c680ea76d769b5e4730f06e006f61b9c585a6d6f4d9e28656abd5b9e8356f3'
+  metadata.gz: 96ec0c958d3fedbeed95f74e04c9b0b95add3a09e6bbb064354be042e4893e0fdb1cdfc071870f5f15ab7a98bd73a975fa1d62e218ded353f8e31b12f4eaacef
+  data.tar.gz: 813cf1e0610875f65d39fbc8645ab839a65bc2e08f04d4f6ed7d048660d0c453b646e5e049900cd65094567dc15eebb84b3548066fe4c25474e3cec36cbed55e

data/lib/solutus.rb

@@ -3,6 +3,8 @@ require 'yaml'
 require 'sinatra/base'
 require 'mustache'
 require 'redcarpet'
+require 'json'
+require 'nokogiri'
 
 class Solutus
     DEFAULT_TEMPLATE = "default"
@@ -14,12 +16,35 @@ class Solutus
     TEMPLATES_PATH = "templates"
     SITE_PAGES_PATH = File.join("pages", "site-pages")
     POSTS_PATH = File.join("pages", "posts")
-    BLOG_DATE_FORMAT = "%b %-d, %Y"
+    BLOG_DATE_FORMAT = "%b %e, %Y"
     SETTINGS_FILE = "settings.yml"
-    
+    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
+    @@page_urls = Array.new
+
+    def self.load_settings
+        begin
+            yml_text = ""
+            f = File.open(SETTINGS_FILE, "r")
+            f.each_line do |line|
+                yml_text += line
+            end
+            f.close
+            YAML.load(yml_text)
+        rescue
+            puts "settings.yml not found"
+        end
+    end
+
     class Solutus_Server < Sinatra::Base
         set :public_folder, SITE_PATH
         
+        configure do
+            glob = Solutus.load_settings
+            set :global_settings, glob
+        end
+
         get "/" do
             send_file File.join(settings.public_folder, 'index.html')
         end
@@ -30,18 +55,182 @@ class Solutus
         end
     
         get "/edit" do
-            send_file File.join(path_to_resources, "index.html")
+            render_index
+        end
+
+        get "/editpage" do
+            render_edit_page(params["page-path"])
+        end
+
+        post "/savepage" do
+            path = params["path"]
+
+            f = File.open(path, "r")
+            yml_text = ""
+            f.each_line do |line|
+                yml_text += line
+            end
+            f.close
+
+            data = YAML.load(yml_text)
+            data["content"] = params["content"]
+
+            new_contents = YAML.dump(data)
+            f = File.open(path, "w")
+            f.write(new_contents)
+            f.close
+
+            Solutus.command("build")
+            "saved page @ #{path}"
         end
 
         post "/newpost" do
-            Solutus.command("new", "post", params["post-title"])
+            path = Solutus.command("new", "post", params["post-title"])
             Solutus.build
-            send_file File.join(path_to_resources, "editBlog.html")
+            render_edit_post(path)
+        end
+
+        get "/editpost" do
+            render_edit_post(*params["post-path"].split(","))
+        end
+
+        post "/savepost" do
+            path = params["path"]
+            f = File.open(path, "r")
+            yml_text = ""
+            f.each_line do |line|
+                yml_text += line
+            end
+            f.close
+            data = YAML.load(yml_text)
+            data["title"] = params["title"]
+            new_contents = YAML.dump(data)
+            new_contents += "---\n"
+            new_contents += params["markdown"]
+            f = File.open(path, "w")
+            f.write(new_contents)
+            f.close
+            Solutus.command("build")
+            "saved post @ #{path}"
         end
 
         def path_to_resources
             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 = ""
+            f.each_line do |line|
+                template += line
+            end
+            f.close
+
+            f = File.open(path, "r")
+            file_contents = ""
+            f.each_line do |line|
+                file_contents += line
+            end
+            data = YAML.load(file_contents)
+
+            ServerStache.template = template
+            result = ServerStache.new
+
+            result[:title] = data["title"]
+            result[:path] = path
+            settings.global_settings.each do |key, val|
+                result[key.to_sym] = val
+            end
+            page_html = Solutus.render_page(Solutus.templates, settings.global_settings, data)
+            parser = Nokogiri::HTML(page_html)
+            parser.at_css("#solutus-content")['contenteditable'] = true
+            result[:everything] = parser.at_css("#solutus-everything")
+            result.render 
+        end
+
+        def render_edit_post(path, url="/")
+            f = File.open(File.join(path_to_resources, "editBlog.html"), "r")
+            template = ""
+            f.each_line do |line|
+                template += line
+            end
+            f.close
+
+            Mustache.template = template
+            result = Mustache.new
+            
+            f = File.open(path, "r")
+            file_contents = ""
+            f.each_line do |line|
+                file_contents += line
+            end
+            data = YAML.load(file_contents)
+
+            result[:title] = data["title"]
+            result[:markdown] = file_contents.split("---")[-1]
+            result[:link] = url
+            result[:canview] = url != "/"
+            result[:path] = path
+            result.render
+        end
+
+        def render_index
+            f = File.open(File.join(path_to_resources, "index.html"), "r")
+            template = ""
+            f.each_line do |line|
+                template += line
+            end
+            f.close
+            Mustache.template = template
+            result = Mustache.new
+            settings.global_settings.each do |key, val|
+                result[key.to_sym] = val
+            end
+            result[:blogs] = blog_select
+            result[:pages] = page_select
+            result.render
+        end
+
+        def page_select
+            result = "<select name=\"page-path\">\n"
+            Solutus.page_urls.each do |page|
+                path = page["file_path"]
+                title = page["title"]
+                result += "<option value=\"#{path}\">#{title}</option>\n"
+            end
+            result += "</select>"
+            result
+        end
+
+        def blog_select
+            result = "<select name=\"post-path\">\n"
+            Solutus.blog_urls.each do |yr, arr|
+                sorted = arr.sort_by {|k| k["date"]} .reverse
+                sorted.each do |blog|
+                    title = blog["title"]
+                    path = blog["file_path"]
+                    url = blog["url"]
+                    result += "<option value=\"#{path},#{url}\">#{title}</option>\n"
+                end
+            end
+            result += "</select>"
+            result
+        end
+    end
+
+    def self.blog_urls
+        @@blog_urls
+    end
+
+    def self.page_urls
+        @@page_urls
+    end
+
+    def self.templates
+        @@templates
     end
 
     def self.command(*args)
@@ -67,15 +256,15 @@ class Solutus
                                 if args[1] == "page"
                                     new_page(args[2])
                                 elsif args[1] == "post"
-                                    new_post(args[2])
+                                    return new_post(args[2])
                                 end
                             end
                         else
-                            puts "Unknown command"
+                            puts "Invalid arguments"
                         end
                     end
                 else
-                    puts "Not enough arguments"
+                    puts "Unknown command"
                 end
             end
         end
@@ -92,12 +281,7 @@ class Solutus
     end
 
     def self.build
-        yml_text = ""
-        f = File.open(SETTINGS_FILE, "r")
-        f.each_line do |line|
-            yml_text += line
-        end
-        settings_data = YAML.load(yml_text)
+        settings_data = load_settings
         
         if File.directory?(BUILD_PATH)
             FileUtils.remove_dir(BUILD_PATH)
@@ -106,7 +290,7 @@ class Solutus
         Dir.mkdir(SITE_PATH)
         copy_static
 
-        templates = Hash.new
+        @@templates = Hash.new
         Dir.entries(TEMPLATES_PATH).each do |entry|
             next if entry == "." || entry == ".."
             puts "Loading template #{entry}"
@@ -117,10 +301,11 @@ class Solutus
                 f.each_line do |line|
                     contents += line
                 end
-                templates[entry.split(".")[0]] = contents
+                @@templates[entry.split(".")[0]] = contents
             end
         end
-        
+
+        @@page_urls = Array.new
         Dir.entries(SITE_PAGES_PATH).each do |entry|
             next if entry == "." || entry == ".."
             puts "Rendering page #{entry}"
@@ -132,16 +317,20 @@ class Solutus
                     yml_text += line
                 end
                 data = YAML.load(yml_text)
-                html = render_page(templates, settings_data, data, false)
+                html = render_page(@@templates, settings_data, data, false)
                 new_path = File.join(SITE_PATH, entry.split(".")[0] + ".html")
                 f = File.new(new_path, "w")
                 puts "Created #{new_path}"
                 f.write(html)
                 f.close
+                @@page_urls.push({
+                    "title" => data["title"],
+                    "file_path" => path
+                })
             end
         end
 
-        blog_urls = Hash.new
+        @@blog_urls = Hash.new
         Dir.entries(POSTS_PATH).each do |entry|
             next if entry == "." || entry == ".."
             path = File.join(POSTS_PATH, entry)
@@ -157,16 +346,21 @@ class Solutus
             date = data["date"]
 
             puts "Rendering blog post #{entry}"
-            html = render_page(templates, settings_data, data, true)
+            html = render_page(@@templates, settings_data, data, true)
 
             relative_dir = File.join(date.year.to_s, date.month.to_s, date.day.to_s)
             root_url = File.join("archive", relative_dir, entry.split(".")[0] + ".html")
 
             year = date.year.to_s
-            if !blog_urls.key?(year)
-                blog_urls[year] = Array.new
+            if !@@blog_urls.key?(year)
+                @@blog_urls[year] = Array.new
             end
-            blog_urls[year].push({"title" => data["title"], "url" => root_url, "date" => date})
+            @@blog_urls[year].push({
+                "title" => data["title"], 
+                "url" => root_url,
+                "file_path" => path,
+                "date" => date
+            })
 
             dir_path = File.join(BLOG_BUILD_PATH, relative_dir)
             if !File.directory?(dir_path)
@@ -181,23 +375,25 @@ class Solutus
 
         #TODO: CREATE SOME FCUKIN BLOG NAVIGATION HTML PAGES
         content = ""
-        blog_urls.each do |yr, arr|
+        @@blog_urls.each do |yr, arr|
             sorted = arr.sort_by {|k| k["date"]} .reverse
             content += "<h3>#{yr}</h3>\n<hr>\n"
-            content += "<ul>"
             sorted.each do |hash|
                 url = hash["url"]
                 title = hash["title"]
-                pretty_date = hash["date"].strftime("%b %-d")
-                content += "<li><a href=\"/#{url}\">#{title}</a> (#{pretty_date})</li>"
+                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>"
             end
-            content += "</ul>"
         end
         path = File.join(SITE_PATH, "archive.html")
         data = Hash.new
         data["title"] = "Archive"
         data["content"] = content
-        html = render_page(templates, settings_data, data, false)
+        html = render_page(@@templates, settings_data, data, false)
         f = File.new(path, "w")
         f.write(html)
         f.close
@@ -228,9 +424,17 @@ HERE
         puts "Created new site page #{title} at #{path}"
     end
 
+    def self.correct_time(time)
+        time.utc.localtime("+05:30")
+    end
+
     def self.new_post(title)
         i = 1
         new_title = title.gsub(/\s+/, "")
+        if title.empty?
+            puts "Empty title"
+            return ""
+        end
         while true
             path = File.join(POSTS_PATH, new_title + ".md")
             if File.file?(path)
@@ -252,9 +456,10 @@ HERE
         f.write(text)
         f.close
         puts "Created new blog post #{title} at #{path}"
+        path
     end
 
-    def self.render_page(templates, default_data, data, blog)
+    def self.render_page(templates, default_data, data, blog=false)
         if data.key?("template")
             Mustache.template = templates[data["template"]]
         else
@@ -277,7 +482,7 @@ HERE
 
     def self.wrap_element(key, content)
         if content.is_a?(Time)
-            content = content.strftime(BLOG_DATE_FORMAT)
+            content = correct_time(content).strftime(BLOG_DATE_FORMAT)
         end
         result = ""
         result += "<div id=\"solutus-#{key}\">\n"
@@ -337,7 +542,7 @@ name: #{name}
 author: Your Name
 watermark: |
   <p style="text-align: center;">
-      <small>Powered by <a href="https://rubygems.org/gems/solutus/versions/0.0.1">Solutus</a></small>
+      <small>Powered by <a href="https://rubygems.org/gems/solutus/">Solutus</a></small>
   </p>
 stylesheets: |
     <link rel="stylesheet" type="text/css" href="/css/styles.css" />
@@ -364,9 +569,10 @@ HERE
             {{{date}}}
         {{/blog}}
         {{{content}}}
+        <small style="display: block; text-align: center;">&copy; {{author}}</small>
         {{{watermark}}}
-        {{{scripts}}}
     </div>
+    {{{scripts}}}
 </body>
 </html>
 HERE
@@ -381,6 +587,7 @@ HERE
         index_file = <<HERE
 template: default
 title: Home page
+type: html
 content: |
     <h1>Hello World!</h1>
     <p>

data/resources/editBlog.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<head>
+    <title>Editing {{title}}</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>
+    <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>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
+</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>
+
+    <script>
+        var simplemde = new SimpleMDE({ element: document.getElementById("solutus-mde") });
+
+        function save() {
+            $.post("/savepost", {
+                "path": "{{path}}",
+                "title": $("#title-input").html(),
+                "markdown": simplemde.value()
+            }, function(response) {
+                console.log(response);
+            });
+        }
+
+        $("#solutus-save-button").click(save);
+    </script>
+</body>
+</html>

data/resources/editPage.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<head>
+    <title>Editing {{title}}</title>
+
+    <style type="text/css">
+        #solutus-editmenu {
+            width: 100%;
+            margin: 0;
+            padding: 15px;
+            background-color: #eeeeee;
+            font-family: sans-serif;
+        }
+    </style>
+    {{{stylesheets}}}
+</head>
+
+<body>
+    <div id="solutus-editmenu">
+        Editing <b>{{title}}</b> @ <code>{{path}}</code>
+        <button id="solutus-save-button">Save</button>
+        <a href="/edit">Back to Edit</a>
+    </div>
+    {{{everything}}}
+    {{{scripts}}}
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
+    <script>
+        function save() {
+            $.post("/savepage", {
+                "path": "{{path}}",
+                "content": $("#solutus-content").html()
+            }, function(response) {
+                console.log(response);
+            });
+        }
+
+        $("#solutus-save-button").click(save);
+    </script>
+</body>
+</html>

data/resources/index.html

@@ -1,18 +1,53 @@
 <!DOCTYPE html>
 <head>
-    <title>Editing Site</title>
+    <title>Editing {{name}}</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>Editing Website</h1>
-        <p><a href="/">View Site</a></p>
-        <p>
-            <form method="post" action="/newpost">
-                <fieldset>
-                    <legend>New Blog Post:</legend>
-                    <p><label for="post-title">Title:</label> <input type="text" name="post-title"></p>
-                    <p><button type="submit">Create</button></fieldset></p>
-                </fieldset>
-            </form>
-        </p>
-    </body>
+
+<body>
+    <h1>Editing {{name}}</h1>
+    <p><a href="/">View Site</a></p>
+    <p>
+        <form method="get" action="/editpage">
+            <fieldset>
+                <legend>Edit Page:</legend>
+                {{{pages}}}
+                <p><button type="submit">Edit page</button></fieldset></p>
+            </fieldset>
+        </form>
+    </p>
+    <p>
+        <form method="post" action="/newpost">
+            <fieldset>
+                <legend>New Blog Post:</legend>
+                <p><label for="post-title">Title:</label> <input type="text" name="post-title"></p>
+                <p><button type="submit">Create new blog post</button></fieldset></p>
+            </fieldset>
+        </form>
+    </p>
+    <p>
+        <form method="get" action="/editpost">
+            <fieldset>
+                <legend>Edit Blog Post:</legend>
+                {{{blogs}}}
+                <p><button type="submit">Edit blog post</button></fieldset></p>
+            </fieldset>
+        </form>
+    </p>
+</body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Jerome Wei
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-05-15 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A miminal static site generator and local Web frontend
 email: jeromew@berkeley.edu
 executables:
@@ -20,6 +76,7 @@ files:
 - bin/solutus
 - lib/solutus.rb
 - resources/editBlog.html
+- resources/editPage.html
 - resources/index.html
 homepage: https://github.com/jeromew21/solutus
 licenses: