solutus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 726e73c608c5ee52e178eb44a2b8c49b4c045c91691931a060fdea8c4d5eb4b0
-  data.tar.gz: e596ad97cc3e985b693d0836f80a10cd48545457e0aacb668b97599b4ac96d44
+  metadata.gz: 49cd8eff79c5ef6ec077eca26f41a41d665388f7a4dcac730a310f1df588cb95
+  data.tar.gz: 8f502367c1b27d14040cf2856fab20f365f91b3c05e6b26486a4102a8329e3fc
 SHA512:
-  metadata.gz: 740a22d2d1054ff79d0a5458ceeea692e752b49cb7f20ec228592842acb2901464c09ef88e66b34ceecd1d479063be53b3006c7c19af40062900df450acd2de7
-  data.tar.gz: 5c6844b88e67dec102939d105f369bd65420e096e5af6d543480f594a18b504bc298cc6041f697d26a49c574f281de63b9ae9250fa7e54b3f5da7365d54d8297
+  metadata.gz: a1aae2085d6b3ac081bf89db1e3b74a2aba9b72c4616e8b1ab977409f4da952cf0a8d8e3fde3e00946a69ba79f1bfa90639cc9396a8ca746c1bcdd6b1db4bfcb
+  data.tar.gz: '09e0f4b38235c12bc62efed2705bbf021ac68428cda126a9e1429daf18becea546c680ea76d769b5e4730f06e006f61b9c585a6d6f4d9e28656abd5b9e8356f3'

data/lib/solutus.rb

@@ -9,11 +9,13 @@ class Solutus
     BLOG_TEMPLATE = "post"
     BUILD_PATH = "deploy"
     SITE_PATH = File.join(BUILD_PATH, "site")
+    BLOG_BUILD_PATH = File.join(SITE_PATH, "archive")
     STATIC_PATH = "static"
     TEMPLATES_PATH = "templates"
     SITE_PAGES_PATH = File.join("pages", "site-pages")
     POSTS_PATH = File.join("pages", "posts")
     BLOG_DATE_FORMAT = "%b %-d, %Y"
+    SETTINGS_FILE = "settings.yml"
     
     class Solutus_Server < Sinatra::Base
         set :public_folder, SITE_PATH
@@ -21,13 +23,24 @@ class Solutus
         get "/" do
             send_file File.join(settings.public_folder, 'index.html')
         end
+
+        get "/reset" do
+            Solutus.command("build")
+            redirect "/"
+        end
     
         get "/edit" do
-            redirect '/edit/'
+            send_file File.join(path_to_resources, "index.html")
         end
-    
-        get "/edit/?" do
-            "Edit your site!"
+
+        post "/newpost" do
+            Solutus.command("new", "post", params["post-title"])
+            Solutus.build
+            send_file File.join(path_to_resources, "editBlog.html")
+        end
+
+        def path_to_resources
+            File.join(File.dirname(File.expand_path(__FILE__)), '../resources')
         end
     end
 
@@ -79,6 +92,13 @@ 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)
+        
         if File.directory?(BUILD_PATH)
             FileUtils.remove_dir(BUILD_PATH)
         end
@@ -112,7 +132,7 @@ class Solutus
                     yml_text += line
                 end
                 data = YAML.load(yml_text)
-                html = render_page(templates, 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}"
@@ -121,6 +141,7 @@ class Solutus
             end
         end
 
+        blog_urls = Hash.new
         Dir.entries(POSTS_PATH).each do |entry|
             next if entry == "." || entry == ".."
             path = File.join(POSTS_PATH, entry)
@@ -136,19 +157,51 @@ class Solutus
             date = data["date"]
 
             puts "Rendering blog post #{entry}"
-            html = render_page(templates, 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
+            end
+            blog_urls[year].push({"title" => data["title"], "url" => root_url, "date" => date})
 
-            dir_path = File.join(SITE_PATH, date.year.to_s, date.month.to_s, date.day.to_s)
+            dir_path = File.join(BLOG_BUILD_PATH, relative_dir)
             if !File.directory?(dir_path)
                 FileUtils.mkdir_p(dir_path)
             end
-            file_path = File.join(dir_path, entry.split(".")[0] + ".html")
+            file_path = File.join(SITE_PATH, root_url)
             puts "Created #{file_path}"
             f = File.new(file_path, "w")
             f.write(html)
             f.close()
-        end
+        end        
+
         #TODO: CREATE SOME FCUKIN BLOG NAVIGATION HTML PAGES
+        content = ""
+        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>"
+            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)
+        f = File.new(path, "w")
+        f.write(html)
+        f.close
+        puts "Created blog archive @ #{path}"
 
     end
 
@@ -193,7 +246,7 @@ HERE
 title: #{title}
 date: #{date}
 ---
-*This is a test blog post page!*
+*This is a temporary blog post page!*
 HERE
         f = File.new(path, "w")
         f.write(text)
@@ -201,13 +254,16 @@ HERE
         puts "Created new blog post #{title} at #{path}"
     end
 
-    def self.render_page(templates, data, blog)
+    def self.render_page(templates, default_data, data, blog)
         if data.key?("template")
             Mustache.template = templates[data["template"]]
         else
             Mustache.template = templates[DEFAULT_TEMPLATE]
         end
         result = Mustache.new
+        default_data.each do |key, val|
+            result[key.to_sym] = val
+        end
         data.each do |key, val|
             next if key == "template"
             if key != "title"
@@ -262,7 +318,7 @@ HERE
         Dir.mkdir(name)
         
         paths = Array.new
-        ["deploy", "static", "server", "templates", "pages"].each do |dir|
+        ["deploy", "static", "templates", "pages"].each do |dir|
             paths.push(File.join(name, dir))
         end
         ["css", "js", "imgs"].each do |dir|
@@ -278,7 +334,15 @@ HERE
         
         settings_file =  <<HERE
 name: #{name}
-author: Your 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>
+  </p>
+stylesheets: |
+    <link rel="stylesheet" type="text/css" href="/css/styles.css" />
+scripts: |
+    <script></script>     
 HERE
 
         styles_file = <<HERE
@@ -291,15 +355,17 @@ HERE
 <!DOCTYPE html>
 <head>
     <title>{{title}}</title>
-    <link rel="stylesheet" type="text/css" href="/css/styles.css" />
+    {{{stylesheets}}}
 </head>
 <body>
     <div id="solutus-everything">
         {{#blog}}
             <h1>{{title}}</h1>
-            {{date}}
+            {{{date}}}
         {{/blog}}
         {{{content}}}
+        {{{watermark}}}
+        {{{scripts}}}
     </div>
 </body>
 </html>

data/resources/index.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<head>
+    <title>Editing Site</title>
+</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>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jerome Wei
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 date: 2018-05-15 00:00:00.000000000 Z
 dependencies: []
-description: A miminal static site generator
+description: A miminal static site generator and local Web frontend
 email: jeromew@berkeley.edu
 executables:
 - solutus
@@ -19,6 +19,8 @@ extra_rdoc_files: []
 files:
 - bin/solutus
 - lib/solutus.rb
+- resources/editBlog.html
+- resources/index.html
 homepage: https://github.com/jeromew21/solutus
 licenses:
 - MIT
@@ -42,5 +44,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: A miminal static site generator
+summary: simplicity
 test_files: []