solutus 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dd19d93e148611ac8ed6dac9a5b16fb563d4fabd604301db30890ccf472b575
-  data.tar.gz: 9a820f57ad89b5c8a816dcba7daf4e8516af304a958cb9f84c8fbb37e3ca6443
+  metadata.gz: 4aeee0bf89def35ee1d8f9ef1679c8922068575c9804df2be0a2bc9a077f4aec
+  data.tar.gz: f0a0ea1447c199be711a07834bfee3ddd02cb0bbaad75f627527648dc92c3948
 SHA512:
-  metadata.gz: eadc38cd4bcb1d80d1c66d68b42bc4dffc68ea127484c8f9a3aac777502590069e19a792b38f2ea87376c205e5ed628b3c6b4861e4c37820cc31c523a489e62b
-  data.tar.gz: f1ea64d0502301fbbdb11e0e47de087501b9037230b299baaa6c591eda8dd1b2255cc1db7211a6e180d74fcfa849c71fefdbcaa85a396e9d4b2faec475066b83
+  metadata.gz: fd52de693cd3915faf620286dbdaeabfafa5dc47a7fb82cfac1cb72ecc0b48ccdc100d70712a0150217803b3392a1de8520a27df1399d434fa509e63fd396a00
+  data.tar.gz: 180770a7761f4368ec9c842aec46ee6b29ba28020995af4633ee39c3b8a198524878a433cbdab0de8f3f22380ba3ad5878934675627e2a8abffe14de0a6acdc5

data/lib/solutus.rb

@@ -7,22 +7,27 @@ require 'json'
 require 'nokogiri'
 
 class Solutus
+    ARCHIVE = "archive"
     DEFAULT_TEMPLATE = "default"
     BLOG_TEMPLATE = "post"
     BUILD_PATH = "deploy"
     SITE_PATH = File.join(BUILD_PATH, "site")
-    BLOG_BUILD_PATH = File.join(SITE_PATH, "archive")
+    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 %e, %Y"
     SETTINGS_FILE = "settings.yml"
+    CACHE = ".solutus-cache"
     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
 
+    class SolutusStache < Mustache 
+    end
+
     def self.load_settings
         begin
             yml_text = ""
@@ -33,7 +38,7 @@ class Solutus
             f.close
             YAML.load(yml_text)
         rescue
-            puts "settings.yml not found"
+            puts "Not a Solutus Project (yet) --- settings.yml not found"
         end
     end
 
@@ -114,11 +119,35 @@ class Solutus
             "saved post @ #{path}"
         end
 
+        get "/:page" do
+            path = File.join(settings.public_folder, params['page'], 'index.html')
+            if File.file?(path)
+                send_file path
+            else
+                send_404
+            end
+        end
+
+        get "/archive/:year/:month/:day/:title" do
+            path = File.join(settings.public_folder, ARCHIVE,
+                params['year'], params["month"], params["day"], params["title"],
+            'index.html')
+            if File.file?(path)
+                send_file path
+            else
+                send_404
+            end
+        end
+
+        def send_404
+            send_file File.join(path_to_resources, "404.html")
+        end
+
         def path_to_resources
             File.join(File.dirname(File.expand_path(__FILE__)), '../resources')
         end
 
-        class ServerStache < Mustache
+        class ServerStache < Mustache 
         end
 
         def render_edit_page(path)
@@ -147,6 +176,7 @@ class Solutus
             page_html = Solutus.render_page(Solutus.templates, settings.global_settings, data)
             parser = Nokogiri::HTML(page_html)
             parser.at_css("#solutus-content")['contenteditable'] = true
+            parser.at_css("#solutus-content")['style'] = "border: 1px black dashed" 
             result[:everything] = parser.at_css("#solutus-everything")
             result.render 
         end
@@ -159,8 +189,8 @@ class Solutus
             end
             f.close
 
-            Mustache.template = template
-            result = Mustache.new
+            SolutusStache.template = template
+            result = SolutusStache.new
             
             f = File.open(path, "r")
             file_contents = ""
@@ -184,8 +214,8 @@ class Solutus
                 template += line
             end
             f.close
-            Mustache.template = template
-            result = Mustache.new
+            SolutusStache.template = template
+            result = SolutusStache.new
             settings.global_settings.each do |key, val|
                 result[key.to_sym] = val
             end
@@ -239,15 +269,18 @@ class Solutus
         if args.length >= 1
             if args[0] == "deploy"
                 deploy
-            elsif args[0] == "start"
+            elsif args[0] == "build"
                 build
+            elsif args[0] == "serve"
+                build #right now, the server won't werve unless its built. 
+                      #consider serializing data in cache to save time.
+                      #TODO: Stress test the build for speed.
                 serve
                 return
-            elsif args[0] == "serve"
+            elsif args[0] == "start"
+                build 
                 serve
                 return
-            elsif args[0] == "build"
-                build
             elsif args[0] == "publish"
                 build
                 deploy
@@ -270,7 +303,7 @@ class Solutus
                         end
                     end
                 else
-                    puts "Unknown command"
+                    puts "Unknown command."
                     return
                 end
             end
@@ -278,20 +311,22 @@ class Solutus
 
         end_time = Time.now
         diff = end_time - start_time
-        puts "Finished in #{diff} seconds."
+        puts "Completed in #{diff} seconds."
     end
 
     def self.deploy
+        puts "Solutus is deploying"
         system load_settings["deploy-command"]
     end
 
     def self.serve
-        #TODO: RESTART THE SERVER WHEN LOCAL CHANGES ARE MADE! REBUILD ERRYTHANG
-        puts "http://localhost:4567/site/"
+        puts "Solutus is serving"
+        puts "View at http://localhost:4567/"
         Solutus_Server.run!
     end
 
     def self.build
+        puts "Solutus is building the static site"
         settings_data = load_settings
         
         if File.directory?(BUILD_PATH)
@@ -316,30 +351,7 @@ class Solutus
             end
         end
 
-        @@page_urls = Array.new
-        Dir.entries(SITE_PAGES_PATH).each do |entry|
-            next if entry == "." || entry == ".."
-            puts "Rendering page #{entry}"
-            path = File.join(SITE_PAGES_PATH, entry)
-            if File.file?(path)
-                yml_text = ""
-                f = File.open(path, "r")
-                f.each_line do |line|
-                    yml_text += line
-                end
-                data = YAML.load(yml_text)
-                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
+        yaml_data = Hash.new
 
         @@blog_urls = Hash.new
         Dir.entries(POSTS_PATH).each do |entry|
@@ -351,27 +363,46 @@ class Solutus
                 contents += line
             end
             f.close
+
+            yaml_data[entry] = contents
             data = YAML.load(contents)
-            markdown_parsed = render_markdown(contents.split("---")[-1])
-            data["content"] = markdown_parsed
             date = data["date"]
-
-            puts "Rendering blog post #{entry}"
-            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")
-
+            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)
                 @@blog_urls[year] = Array.new
             end
             @@blog_urls[year].push({
                 "title" => data["title"], 
-                "url" => root_url,
+                "url" => File.join(ARCHIVE, relative_dir),
                 "file_path" => path,
                 "date" => date
             })
+        end
+
+        recents_count = 3
+        recents = ""
+        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>"
+        end
+
+        yaml_data.each do |entry, contents|
+            path = File.join(POSTS_PATH, entry)
+            data = YAML.load(contents)
+            markdown_parsed = render_markdown(contents.split("---")[-1])
+            data["content"] = markdown_parsed
+            data["recents"] = recents
+            date = data["date"]
+
+            puts "Rendering blog post #{entry}"
+            html = render_page(@@templates, settings_data, data, true)
+
+            relative_dir = File.join(date.year.to_s, date.month.to_s, date.day.to_s, entry.split(".")[0])
+            root_url = File.join(ARCHIVE, relative_dir, "index.html")
+
+            year = date.year.to_s
 
             dir_path = File.join(BLOG_BUILD_PATH, relative_dir)
             if !File.directory?(dir_path)
@@ -382,9 +413,43 @@ class Solutus
             f = File.new(file_path, "w")
             f.write(html)
             f.close()
-        end        
+        end    
 
-        #TODO: CREATE SOME FCUKIN BLOG NAVIGATION HTML PAGES
+        @@page_urls = Array.new
+        Dir.entries(SITE_PAGES_PATH).each do |entry|
+            next if entry == "." || entry == ".."
+            puts "Rendering page #{entry}"
+            path = File.join(SITE_PAGES_PATH, entry)
+            if File.file?(path)
+                yml_text = ""
+                f = File.open(path, "r")
+                f.each_line do |line|
+                    yml_text += line
+                end
+                data = YAML.load(yml_text)
+                data["recents"] = recents
+                html = render_page(@@templates, settings_data, data, false)
+                new_dir = File.join(SITE_PATH, entry.split(".")[0])
+                if ["error", "index"].include? entry.split(".")[0]
+                    new_path = File.join(SITE_PATH, entry.split(".")[0] + ".html")
+                else
+                    if !File.directory?(new_dir)
+                        FileUtils.mkdir_p(new_dir)
+                    end
+                    new_path = File.join(new_dir, "index.html")
+                end
+                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    
+
+        # Create blog archive page 
         content = ""
         @@blog_urls.each do |yr, arr|
             sorted = arr.sort_by {|k| k["date"]} .reverse
@@ -400,16 +465,18 @@ class Solutus
                 content += "</div>"
             end
         end
-        path = File.join(SITE_PATH, "archive.html")
+        path = File.join(SITE_PATH, ARCHIVE, "index.html")
         data = Hash.new
         data["title"] = "Archive"
         data["content"] = content
+        data["recents"] = recents
         html = render_page(@@templates, settings_data, data, false)
         f = File.new(path, "w")
         f.write(html)
         f.close
         puts "Created blog archive @ #{path}"
 
+        # Mirror build
         if settings_data["mirror"]
             dir_path = settings_data["mirror"]
             FileUtils.rm_rf("#{dir_path}/.", secure: true)
@@ -417,6 +484,28 @@ class Solutus
         end
     end
 
+    def self.render_page(templates, default_data, data, blog=false)
+        if data.key?("template")
+            SolutusStache.template = templates[data["template"]]
+        else
+            SolutusStache.template = templates[DEFAULT_TEMPLATE]
+        end
+        result = SolutusStache.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"
+                val = wrap_element(key, val)
+            end
+            result[key.to_sym] = val
+        end
+        result[:blog] = blog
+        result[:year] = Time.now.year
+        result.render
+    end
+    
     def self.new_page(title)
         file_title = title.gsub(/\s+/, "")
         path = File.join(SITE_PAGES_PATH, file_title + ".yml")
@@ -440,10 +529,6 @@ 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+/, "")
@@ -475,38 +560,6 @@ HERE
         path
     end
 
-    def self.render_page(templates, default_data, data, blog=false)
-        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"
-                val = wrap_element(key, val)
-            end
-            result[key.to_sym] = val
-        end
-        result[:blog] = blog
-        result.render
-    end
-
-    def self.wrap_element(key, content)
-        if content.is_a?(Time)
-            content = correct_time(content).strftime(BLOG_DATE_FORMAT)
-        end
-        result = ""
-        result += "<div id=\"solutus-#{key}\">\n"
-        result += content
-        result += "</div>"
-        result
-    end
-
     def self.copy_static
         Dir.entries(STATIC_PATH).each do |entry|
             next if entry == "." || entry == ".."
@@ -521,10 +574,33 @@ HERE
         end
     end
 
+    def self.get_recents(count)
+        res = Array.new
+        @@blog_urls.each do |yr, arr|
+            res = res + arr.sort_by {|k| k["date"]}
+        end
+        res.last(count)
+    end
+
+    def self.correct_time(time)
+        time.utc.localtime("+05:30")
+    end
+
     def self.render_markdown(markdown)
         Redcarpet::Markdown.new(Redcarpet::Render::HTML.new).render(markdown)
     end
 
+    def self.wrap_element(key, content)
+        if content.is_a?(Time)
+            content = correct_time(content).strftime(BLOG_DATE_FORMAT)
+        end
+        result = ""
+        result += "<div id=\"solutus-#{key}\">\n"
+        result += content
+        result += "</div>"
+        result
+    end
+
     def self.new_project(name)
         if File.directory?(name)
             puts "Invalid name, already a folder with that name"
@@ -539,7 +615,7 @@ HERE
         Dir.mkdir(name)
         
         paths = Array.new
-        ["deploy", "static", "templates", "pages"].each do |dir|
+        ["deploy", "static", "templates", "pages", CACHE].each do |dir|
             paths.push(File.join(name, dir))
         end
         ["css", "js", "imgs"].each do |dir|
@@ -560,12 +636,13 @@ domain: www.yoursite.tld
 deploy-command: aws s3 sync --acl public-read --sse --delete deploy/site/ s3://www.yoursite.tld
 watermark: |
   <p style="text-align: center;">
-      <small>Powered by <a href="https://rubygems.org/gems/solutus/">Solutus</a></small>
+      <small>Powered by <a href="https://github.com/jeromew21/solutus">Solutus</a></small>
   </p>
 stylesheets: |
     <link rel="stylesheet" type="text/css" href="/css/styles.css" />
 scripts: |
-    <script></script>     
+    <script></script>
+recents-count: 3
 HERE
 
         styles_file = <<HERE
@@ -587,7 +664,7 @@ HERE
             {{{date}}}
         {{/blog}}
         {{{content}}}
-        <small style="display: block; text-align: center;">&copy; {{author}}</small>
+        <small style="display: block; text-align: center;">&copy; {{year}} {{author}}</small>
         {{{watermark}}}
     </div>
     {{{scripts}}}

data/resources/404.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<head>
+    <title>Error 404</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>Error 404: Page Not Found</h1>
+    <p><a href="/">Back to site</a></p>
+    <p><a href="/edit">Back to edit</a></p>
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jerome Wei
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - bin/solutus
 - lib/solutus.rb
+- resources/404.html
 - resources/editBlog.html
 - resources/editPage.html
 - resources/index.html