solutus 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a476906bf83edc539d3566e7992844d9d2e1438c1c252c8f6a9fcbca376e5526
-  data.tar.gz: 0bc58bdcce19dcfcebc4f5a14020999c44bacccad8bed77afd9ed5f75a92b341
+  metadata.gz: ae52f904903e09196391fcb54016663146fb2a5d5684a1c108b4d49c5d6dd89b
+  data.tar.gz: e130edaeb9cedfef9f7514d70cd20df83575da31a1c936dde187298321085c30
 SHA512:
-  metadata.gz: 78a2dca0440d97315e4099d2ec5c2d1476492b8461674217dae22de396953ace70bb6aee31016da34c0e8e7422a4e3efe011f20991c243c568b022daa2366ad4
-  data.tar.gz: 102d3a7364083e90c5df5f6348e369bc99e212534755311e6a2f776bbe2fc12cab969b1d4f8919675b08163d07aa8046602021b19402be933d1c66f0f717a080
+  metadata.gz: c4eb0309c57ac9974e34df6ab2eadce3e26d9950845010537575dde21456117963ad1440cc622a7e648d3dc8f35299d34b39f1ee692280f6ab6e85e9ca3749b7
+  data.tar.gz: 42018df96fbc29c1a8c57fcd404be2f979f4cf21876cdc96de787772ea684cbb41684fa21f07cf3548f4bfab032d90242347b141f22c87d0cd9c5bf1a12b7405

data/lib/solutus.rb

@@ -30,7 +30,7 @@ class Solutus
     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"]
 
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
 
     @@blog_urls = Hash.new
     @@page_urls = Array.new
@@ -54,6 +54,7 @@ class Solutus
     end
 
     class Solutus_Server < Sinatra::Base
+        CSS = File.read(File.join(File.dirname(File.expand_path(__FILE__)), '../resources', "style.css"))
         enable :sessions
 
         set :public_folder, SITE_PATH
@@ -64,6 +65,10 @@ class Solutus
             set :global_settings, glob
         end
 
+        def path_to_resources
+            File.join(File.dirname(File.expand_path(__FILE__)), '../resources')
+        end
+
         class ServerStache < Mustache 
         end
 
@@ -213,10 +218,6 @@ class Solutus
             send_file File.join(path_to_resources, "404.html")
         end
 
-        def path_to_resources
-            File.join(File.dirname(File.expand_path(__FILE__)), '../resources')
-        end
-
         def render_edit_page(path)
             f = File.open(File.join(path_to_resources, "editPage.html"), "r")
             template = ""
@@ -234,7 +235,8 @@ class Solutus
 
             ServerStache.template = template
             result = ServerStache.new
-
+            
+            result[:css] = CSS
             result[:title] = data["title"]
             result[:path] = path
             link = path.split("/")[-1].split(".")[0]
@@ -271,6 +273,7 @@ class Solutus
             end
             data = YAML.load(file_contents)
 
+            result[:css] = CSS
             result[:title] = data["title"]
             result[:date] = data["date"].strftime(BLOG_DATE_FORMAT)
             result[:markdown] = file_contents.split("---")[-1]
@@ -285,6 +288,7 @@ class Solutus
             ServerStache.template = File.read(File.join(path_to_resources, "login.html"))
             result = ServerStache.new
             result[:message] = message
+            result[:css] = CSS
             result.render
         end
 
@@ -302,6 +306,7 @@ class Solutus
             end
             result[:blogs] = blog_select
             result[:pages] = page_select
+            result[:css] = CSS
             result.render
         end
 
@@ -566,16 +571,18 @@ HERE
                 content += "</div>\n"
             end
         end
-        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}"
+        if File.directory?(File.join(SITE_PATH, ARCHIVE))
+            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}"
+        end
 
         # Mirror build
         if settings_data["mirror"]
@@ -593,16 +600,16 @@ HERE
         end
         result = SolutusStache.new
         default_data.each do |key, val|
-            result[key.to_sym] = 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
+            result[key.to_sym] = val || ""
         end
-        result[:blog] = blog
+        result[:blog] = blog || false
         result[:year] = Time.now.year
         result.render
     end

data/resources/editBlog.html

@@ -2,28 +2,7 @@
 <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
-        }
-
-        input[type=text] {
-            width: 500px;
-        }
-        a {
-            text-decoration: none;
-            color: #4286f4;
-        }
+        {{css}}
     </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>

data/resources/index.html

@@ -2,25 +2,7 @@
 <head>
     <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
-        }
-
-        a {
-            text-decoration: none;
-            color: #4286f4;
-        }
+        {{css}}
     </style>
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
 </head>

data/resources/login.html

@@ -2,20 +2,7 @@
 <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
-        }
+        {{css}}
     </style>
 </head>
 

data/resources/style.css

@@ -0,0 +1,23 @@
+body {
+    margin:40px auto;
+    background-color: #eeeeee;
+    max-width:650px;
+    line-height:1.6;
+    font-size:18px;
+    color:#454545;
+    padding:0 10px;
+    font-family: "Segoe UI", sans-serif;
+}
+
+h1, h2, h3 {
+    line-height:1.2
+}
+
+input[type=text] {
+    width: 500px;
+}
+
+a {
+    text-decoration: none;
+    color: #4286f4;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jerome Wei
@@ -80,6 +80,7 @@ files:
 - resources/editPage.html
 - resources/index.html
 - resources/login.html
+- resources/style.css
 homepage: https://github.com/jeromew21/solutus
 licenses:
 - MIT
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: simplicity