solutus 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a3716f57a2963942df64c1148bc85dd01613da9673e0f8d70640c9cb2621788
-  data.tar.gz: 04a880858d6bfa6f414c727a3eaba3ca396a88af3fda2a332d697560b3648e26
+  metadata.gz: a4e5dfc711131b2732b3179bb8bc40adac3c9dbf071f5e37e6edb2cb68421d46
+  data.tar.gz: 4e00e1d6a9f78530fe55e20f3af15384484f0cad83a0c5b682e7d6d751ef16df
 SHA512:
-  metadata.gz: 8dbe8e509ec4522894f3463bf6e9a5664e198f834cba445ff72027091aabe66ffbb717acf0bf75d474f7ab5e1b8eee5e2040f97b18b301fad440db2d3260a507
-  data.tar.gz: 5f20e6a80b3e0ff8ee837898bc3c48b9088a81ea4d4f99757f0a22edee386c2d05b5b04c94c58e1dc054968e47aafdd2064881b0003706fe6ccafab133c39a94
+  metadata.gz: a2a15e30c6b22f8b6b513b1b04497e93e78fad19f1225b8afdaa09a96be541d69c42a2eaa67e7911e2b346d7daa11e8395ed6bf38dea1d6c35d7b3547cafbc72
+  data.tar.gz: 11a67bf8b78990bb57c086ef0ca00901305b4edf2976d2abe648babfa4ab3292965c3775545be52ca9c922568ebbc945bfb9e0e4f6d8924b2820a9f1b15fc76a

data/lib/solutus.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'nokogiri'
 require 'digest'
 require "rubygems"
+require 'uri'
 
 #TODO: Add support for tags
 #TODO: Make stress tests
@@ -30,7 +31,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.9'
+    VERSION = '0.2.0'
 
     LOG_FILE = 'log'
 
@@ -58,6 +59,9 @@ class Solutus
     class Solutus_Server < Sinatra::Base
         CSS = File.read(File.join(File.dirname(File.expand_path(__FILE__)), '../resources', "style.css"))
         FILE_EXCLUDES = ['password.txt', '.gitignore', 'nohup.out', 'log']
+        UPLOAD_DIR_SUFF = 'i'
+        UPLOAD_DIR = File.join(STATIC_PATH, UPLOAD_DIR_SUFF)
+
         enable :sessions
 
         set :public_folder, SITE_PATH
@@ -148,6 +152,9 @@ class Solutus
         end
 
         get "/newpage" do
+            if !session[:verified]
+                return "error"
+            end
             dir = params['dir']
             filename = params['filename']
             dir = File.join(SITE_PAGES_PATH, dir)
@@ -155,6 +162,9 @@ class Solutus
             if !File.directory?(dir)
                 FileUtils.mkdir_p(dir)
             end
+            if file.file?(path)
+                return 'error: file already exists'
+            end
             f = File.new(path, 'w')
             title = 'Page Title'
             text = <<HERE
@@ -246,6 +256,37 @@ HERE
             'saved'
         end
 
+        post "/upload" do
+            if !session[:verified]
+                return "error"
+            end
+
+            filename = URI.escape(params[:file][:filename])
+            file = params[:file][:tempfile]
+            dir = params[:dir] #Probably sanitizxe this
+
+            unless File.directory?(UPLOAD_DIR)
+                FileUtils.mkdir_p(UPLOAD_DIR)
+            end
+
+            unless File.directory?(File.join(UPLOAD_DIR, dir))
+                FileUtils.mkdir_p(File.join(UPLOAD_DIR, dir))
+            end
+
+            path_to_file = File.join(UPLOAD_DIR, dir, filename)
+
+            File.open(path_to_file, 'wb') do |f|
+                f.write(file.read)
+            end
+
+            Solutus.command("build")
+
+            link = settings.global_settings['domain'] + "/" + UPLOAD_DIR_SUFF + "/#{dir}/" +  filename
+            render_local('base.html', {
+                "content" => "<h1>Link</h1><strong><a href='http://#{link}'>#{link}</a></strong><p><a href='/edit'>back</a></p>"
+            })
+        end
+
         post "/publish" do
             if !session[:verified]
                 return "error"
@@ -402,10 +443,30 @@ HERE
             result[:pages] = page_select
             result[:css] = CSS
             result[:files] = render_files
+            result[:file_upload_paths] = render_file_upload_dirs
             result[:version] = VERSION
             result.render
         end
 
+        def render_local(f, data)
+            f = File.open(File.join(path_to_resources, f), "r")
+            template = ""
+            f.each_line do |line|
+                template += line
+            end
+            f.close
+            SolutusStache.template = template
+            result = SolutusStache.new
+            settings.global_settings.each do |key, val|
+                result[key.to_sym] = val
+            end
+            data.each do |key, val|
+                result[key.to_sym] = val
+            end
+            result[:css] = CSS
+            result.render
+        end
+
         def page_select
             result = "<select name=\"page-path\">\n"
             Solutus.page_urls.each do |page|
@@ -441,6 +502,19 @@ HERE
             result
         end
 
+        def render_file_upload_dirs
+            result = ''
+            unless File.directory?(UPLOAD_DIR)
+                FileUtils.mkdir_p(UPLOAD_DIR)
+            end
+            Dir.entries(UPLOAD_DIR).each do |d| 
+                if  (d != '.' && d != '..') && File.directory?(File.join(UPLOAD_DIR, d))
+                    result += "<option>#{d}</option>"
+                end
+            end
+            result
+        end
+
         def blog_select
             result = "<select name=\"post-path\">\n"
             Solutus.blog_urls.each do |yr, arr|

data/resources/base.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<head>
+    <title>Edit Site</title>
+    <style type="text/css">
+        {{css}}
+    </style>
+    <body>
+        {{{content}}}
+    </body>
+</head>

data/resources/index.html

@@ -20,7 +20,7 @@
             <fieldset>
                 <legend>Edit File</legend>
                 {{{files}}}
-                <p><button type="submit">Edit file</button></fieldset></p>
+                <p><button type="submit">Edit file</button></p>
             </fieldset>
         </form>
     </p>
@@ -32,10 +32,25 @@
                 Page subdirectory: 
                 <select name='dir'>{{{page_paths}}}</select>
                 <p>Page name: <input type='text' name='filename'></p>
-                <p><button type="submit">Create page</button></fieldset></p>
+                <p><button type="submit">Create page</button></p>
             </fieldset>
         </form>
     </p>
+
+    <p>
+        <form method="post" action="/upload" enctype="multipart/form-data">
+            <fieldset>
+                <legend>Upload File and Get Link</legend>
+                <p><input type="file" name="file"></p>
+                File subdirectory: 
+                <input list="fofoo" required name='dir' />
+                <datalist id="fofoo">{{{file_upload_paths}}}</datalist>
+                <p><button type="submit">Upload file</button></p>
+            </fieldset>
+        </form>
+    </p>
+
+
     {{/advanced}}
     {{^advanced}}
     <p>
@@ -43,7 +58,7 @@
             <fieldset>
                 <legend>Edit Page</legend>
                 {{{pages}}}
-                <p><button type="submit">Edit page</button></fieldset></p>
+                <p><button type="submit">Edit page</button></p>
             </fieldset>
         </form>
     </p>
@@ -52,7 +67,7 @@
             <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>
+                <p><button type="submit">Create new blog post</button></p>
             </fieldset>
         </form>
     </p>
@@ -61,7 +76,7 @@
             <fieldset>
                 <legend>Edit Blog Post</legend>
                 {{{blogs}}}
-                <p><button type="submit">Edit blog post</button></fieldset></p>
+                <p><button type="submit">Edit blog post</button></p>
             </fieldset>
         </form>
     </p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Jerome Wei
@@ -76,6 +76,7 @@ files:
 - bin/solutus
 - lib/solutus.rb
 - resources/404.html
+- resources/base.html
 - resources/editBlog.html
 - resources/editFile.html
 - resources/editPage.html