workspace and login working

.gitignore

@@ -21,3 +21,4 @@ _testmain.go
*.exe
loop
loop_users

account/account.go

@@ -16,7 +16,7 @@ import (
const (
	UserFile          = "loop_users"
	publishDateLayout = "200601021504"
	PublishDateLayout = "200601021504"
)
type Account struct {
@@ -204,7 +204,7 @@ func (a *Account) Add(content, filename string, file []byte) (string, error) {
	// Create new content directory if necessary
	if content == "" {
		content = fmt.Sprintf("%x", security.Hash(userDir+time.Now().Format(publishDateLayout), environment.Salt()))
		content = fmt.Sprintf("%x", security.Hash(userDir+time.Now().Format(PublishDateLayout), environment.Salt()))
	}
	// Create new content directory
@@ -218,9 +218,9 @@ func (a *Account) Add(content, filename string, file []byte) (string, error) {
	// Check if filename already exists
	filePath := contentPath + s + filename
	if _, err := os.Stat(filePath); os.IsExist(err) {
		return filePath, err
	}
	//if _, err := os.Stat(filePath); os.IsExist(err) {
	//	return filePath, err
	//}
	// Write file to content directory
	fi, err := os.OpenFile(filePath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
@@ -250,7 +250,7 @@ func (a *Account) Publish(title, content string, date time.Time) error {
	userDir := strings.ToLower(a.Username)
	s := string(filepath.Separator)
	contentPath := baseDir + s + userDir + s + "content" + s + content
	publishPath := baseDir + s + userDir + s + "blog" + s + date.Format(publishDateLayout) + "-" + prettyTitle
	publishPath := baseDir + s + userDir + s + "blog" + s + date.Format(PublishDateLayout) + "-" + prettyTitle
	// Check if the content exists
	if _, err := os.Stat(contentPath); os.IsNotExist(err) {
@@ -270,3 +270,58 @@ func (a *Account) Publish(title, content string, date time.Time) error {
	return nil
}
func (a *Account) Content() ([]string, error) {
	baseDir := os.Getenv("LOOP_DATA")
	userDir := strings.ToLower(a.Username)
	s := string(filepath.Separator)
	contentPath := baseDir + s + userDir + s + "content"
	d, err := os.Open(contentPath)
	if err != nil {
		return []string{}, err
	}
	return d.Readdirnames(0)
}
func (a *Account) Read(title string) (string, error) {
	baseDir := os.Getenv("LOOP_DATA")
	userDir := strings.ToLower(a.Username)
	s := string(filepath.Separator)
	fp := baseDir + s + userDir + s + "content" + s + title + s + "document.md"
	// Check to see if the file exists
	if _, err := os.Stat(fp); os.IsNotExist(err) {
		return "", err
	}
	// Open the file
	fi, err := os.Open(fp)
	if err != nil {
		return "", err
	}
	// Read all of its contents
	raw, err := ioutil.ReadAll(fi)
	if err != nil {
		return "", err
	}
	return string(raw), nil
}
func (a *Account) Remove(title string) error {
	baseDir := os.Getenv("LOOP_DATA")
	userDir := strings.ToLower(a.Username)
	s := string(filepath.Separator)
	fp := baseDir + s + userDir + s + "content" + s + title
	// Check to see if the file exists
	if _, err := os.Stat(fp); os.IsNotExist(err) {
		return err
	}
	// Delete the directory
	return os.RemoveAll(fp)
}

account/account_test.go

@@ -72,6 +72,23 @@ func TestAdd(t *testing.T) {
	}
}
func TestContent(t *testing.T) {
	a := Account{
		Username:   "guest",
		Passphrase: "guest",
	}
	environment.ConfigureEnvironment()
	a.Add("", "README.md", []byte{})
	c, err := a.Content()
	if err != nil {
		t.Error(err)
	}
	if len(c) == 0 {
		t.Error("No content found")
	}
}
func TestPublish(t *testing.T) {
	a := Account{
		Username:   "guest",

handlers/blog.go

@@ -16,6 +16,12 @@ var (
	))
)
type PageBlog struct {
	Title     string
	Published string
	Body      template.HTML
}
func BlogHandler(w http.ResponseWriter, r *http.Request) {
	if err := templateBlog.Execute(w, nil); err != nil {
		http.Error(w, err.Error(), http.StatusInternalServerError)

handlers/content.go

@@ -1,9 +1,19 @@
package handlers
import (
	"errors"
	"html/template"
	"log"
	"net/http"
	"time"
	"code.revolvingcow.com/revolvingcow/loop/account"
	"code.revolvingcow.com/revolvingcow/loop/environment"
	"code.revolvingcow.com/revolvingcow/loop/markdown"
	"code.revolvingcow.com/revolvingcow/loop/security"
	"github.com/gorilla/mux"
	"github.com/gorilla/sessions"
)
var (
@@ -11,11 +21,200 @@ var (
		"html/loop.html",
		"html/workspace.html",
	))
	store = sessions.NewCookieStore([]byte(environment.Salt()))
)
// WorkspaceModel passes information to the template engine providing context to the web page.
type WorkspaceModel struct {
	Username    string
	Directories []string
	Title       string
	Content     string
}
// ContentHandler is the default handler used for user content.
func ContentHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Serving template for the content handler")
	if err := templateWorkspace.Execute(w, nil); err != nil {
	session, _ := store.Get(r, "session-account")
	account, err := validateCredentials(session)
	if err != nil {
		http.Error(w, err.Error(), http.StatusUnauthorized)
		return
	}
	directories, _ := account.Content()
	model := WorkspaceModel{
		Username:    account.Username,
		Directories: directories,
	}
	if err := templateWorkspace.Execute(w, model); err != nil {
		http.Error(w, err.Error(), http.StatusInternalServerError)
		return
	}
}
// ContentCreateHandler creates new content in the user context.
func ContentCreateHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Creating new document")
	session, _ := store.Get(r, "session-account")
	account, err := validateCredentials(session)
	if err != nil {
		http.Error(w, err.Error(), http.StatusUnauthorized)
		return
	}
	vars := mux.Vars(r)
	title := vars["title"]
	if title != "" {
		account.Add(title, "document.md", []byte{})
	} else {
		http.Redirect(w, r, account.Username, http.StatusSeeOther)
	}
	http.Redirect(w, r, "/"+account.Username+"/edit/"+title, http.StatusSeeOther)
}
// ContentReadHandler reads a document in the user context.
func ContentReadHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Reading document")
	session, _ := store.Get(r, "session-account")
	account, err := validateCredentials(session)
	if err != nil {
		http.Error(w, err.Error(), http.StatusUnauthorized)
		return
	}
	vars := mux.Vars(r)
	title := vars["title"]
	if title == "" {
		http.Error(w, "No title given", http.StatusInternalServerError)
		return
	}
	contents, err := account.Read(title)
	if err != nil {
		http.Error(w, err.Error(), http.StatusInternalServerError)
		return
	}
	directories, _ := account.Content()
	model := WorkspaceModel{
		Username:    account.Username,
		Directories: directories,
		Title:       title,
		Content:     contents,
	}
	if err := templateWorkspace.Execute(w, model); err != nil {
		http.Error(w, err.Error(), http.StatusInternalServerError)
		return
	}
}
// ContentPreviewHandler displays a Markdown document in HTML format.
func ContentPreviewHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Previewing document")
	session, _ := store.Get(r, "session-account")
	account, err := validateCredentials(session)
	if err != nil {
		http.Error(w, err.Error(), http.StatusUnauthorized)
		return
	}
	vars := mux.Vars(r)
	title := vars["title"]
	contents := r.FormValue("contents")
	if contents == "" {
		contents, _ = account.Read(title)
	}
	md := template.HTML(string(markdown.MarkdownToHtml([]byte(contents))))
	model := PageBlog{
		Title:     title,
		Published: time.Now().Format("2006-01-02 15:04"),
		Body:      md,
	}
	if err := templateArticle.Execute(w, model); err != nil {
		http.Error(w, err.Error(), http.StatusInternalServerError)
		return
	}
}
// ContentUpdateHandler updates content in the user context.
func ContentUpdateHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Updating document")
	session, _ := store.Get(r, "session-account")
	account, err := validateCredentials(session)
	if err != nil {
		http.Error(w, err.Error(), http.StatusUnauthorized)
		return
	}
	vars := mux.Vars(r)
	title := vars["title"]
	if title == "" {
		http.Error(w, "No title given", http.StatusInternalServerError)
		return
	}
	contents := r.FormValue("contents")
	if contents == "" {
		http.Error(w, "No content given", http.StatusInternalServerError)
		return
	}
	account.Add(title, "document.md", []byte(contents))
}
// ContentUploadHandler allows for multiple document uploads in the user context.
func ContentUploadHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Uploading attachment")
}
// ContentDeleteHandler deletes content in the user context.
func ContentDeleteHandler(w http.ResponseWriter, r *http.Request) {
	log.Println("Deleting document")
	session, _ := store.Get(r, "session-account")
	account, err := validateCredentials(session)
	if err != nil {
		http.Error(w, err.Error(), http.StatusUnauthorized)
		return
	}
	vars := mux.Vars(r)
	title := vars["title"]
	if title == "" {
		http.Error(w, "No title given", http.StatusInternalServerError)
		return
	}
	account.Remove(title)
	http.Redirect(w, r, "/"+account.Username, http.StatusSeeOther)
}
// validateCredentials attempts to validate session information.
func validateCredentials(session *sessions.Session) (account.Account, error) {
	user := session.Values["username"]
	pass := session.Values["passphrase"]
	if user == nil || pass == nil {
		return account.Account{}, errors.New("No session state")
	}
	account := account.Account{
		Username:   user.(string),
		Passphrase: security.GeneratePassphrase(user.(string), pass.(string)),
	}
	valid, err := account.Validate()
	if err != nil || !valid {
		return account, errors.New("Invalid credentials")
	}
	return account, nil
}

handlers/logon.go

@@ -1,26 +1,36 @@
package handlers
import (
	"log"
	"net/http"
	"code.revolvingcow.com/revolvingcow/loop/account"
	"code.revolvingcow.com/revolvingcow/loop/security"
)
// LogonHandler is responsible for the initial log on procedures.
func LogonHandler(w http.ResponseWriter, r *http.Request) {
	email := r.FormValue("email")
	password := r.FormValue("password")
	log.Println("Logon handler")
	login := r.FormValue("login")
	passphrase := r.FormValue("passphrase")
	a := account.Account{
		Username:   email,
		Passphrase: password,
		Username:   login,
		Passphrase: security.GeneratePassphrase(login, passphrase),
	}
	err := a.Create()
	if err != nil {
		if err.Error() == "Account already exists" {
		if err.Error() != "Account already exists" {
			http.Error(w, err.Error(), http.StatusInternalServerError)
			return
		}
	}
	session, _ := store.Get(r, "session-account")
	session.Values["username"] = login
	session.Values["passphrase"] = passphrase
	store.Save(r, w, session)
	http.Redirect(w, r, "/"+a.Username, http.StatusSeeOther)
}

html/article.html

@@ -1,12 +1,22 @@
{{ define "title" }}{{ end }}
{{ define "styles" }}{{ end }}
{{ define "styles" }}
    <style type="text/css">
        h3 small { display: block; font-size: 45%; color: #666; }
        #markdown ul { padding-left: 2em; }
        #markdown ul li { list-style-type: initial; }
        #markdown code { padding: 1em; background-color: #eee; }
    </style>
{{ end }}
{{ define "content" }}
    <article>
        <h3>
            {{ .Title }}
            <small>{{ .Published }}</small>
            <small>Published on {{ .Published }}</small>
            <hr />
        </h3>
        {{ .Body }}
        <div id="markdown">
            {{ .Body }}
        </div>
    </article>
{{ end }}
{{ define "scripts" }}{{ end }}

html/default.html

@@ -150,12 +150,12 @@
                    <form class="col s12" method="post" action="/logon">
                        <div class="row">
                            <div class="input-field col s12">
                                <input id="email" type="text" class="validate">
                                <label for="email">Email</label>
                                <input id="login" name="login" type="text" class="validate">
                                <label for="login">Login</label>
                            </div>
                            <div class="input-field col s12">
                                <input id="password" type="password" class="validate">
                                <label for="password">Password</label>
                                <input id="passphrase" name="passphrase" type="password" class="validate">
                                <label for="passphrase">Passphrase</label>
                            </div>
                            <div class="input-field col s12">
                                <button class="btn waves-effect waves-light" type="submit" name="action">

html/workspace.html

@@ -1,119 +1,142 @@
{{ define "title" }}Loop Workspace{{ end }}
{{ define "title" }}Loop: Workspace{{ end }}
{{ define "styles" }}
    <style>
        pre#editor {
            height: 100vh;
        }
        iframe#view {
            height: 100vh;
            borders: none;
        }
        div#welcome {
            height: 100vh;
        }
        div#welcome h5 {
            width: 100%;
        }
        div#holder {
            border: 2px dashed #ccc;
            /*width: 300px;*/
            min-height: 110px;
            margin: 20px auto;
        }
        .select-wrapper {
            z-index: 2;
        }
        div#holder.hover {
            border: 2px dashed #0c0;
        }
        div#holder p {
            margin: 10px;
            font-size: 14px;
        }
        progress {
            width: 100%;
        }
        progress:after {
            content: '%';
        }
        .fail {
            background: #c00;
            padding: 2px;
            color: #fff;
        }
        .hidden {
            display: none !important;
        }
        #editor-actions a.btn-flat {
            padding: 0 0.5rem;
        }
        .fixed-action-btn ul button.btn-floating {
            opacity: 0;
        }
        .fullscreen {
            width: 100%;
            height: 100vh;
        }
    </style>
{{ end }}
{{ define "content" }}
    <div id="toolbar" class="row">
        <div class="col s12 center">
            <!-- Toolbar of stuffs -->
            <button id="fullscreen" class="btn waves-effect waves-light">
                <i class="mdi-navigation-fullscreen left hide-on-med-and-down"></i>
                <i class="mdi-navigation-fullscreen hide-on-large-only"></i>
                <span class="hide-on-med-and-down">Focus Mode</span>
            </button>
            <button id="save" class="btn waves-effect waves-light">
                <i class="mdi-content-save left hide-on-med-and-down"></i>
                <i class="mdi-content-save hide-on-large-only"></i>
                <span class="hide-on-med-and-down">Save</span>
            </button>
            <button id="create" class="btn waves-effect waves-light">
                <i class="mdi-content-create left hide-on-med-and-down"></i>
                <i class="mdi-content-create hide-on-large-only"></i>
                <span class="hide-on-med-and-down">Create</span>
            </button>
            <button id="publish" class="btn waves-effect waves-light">
                <i class="mdi-editor-publish left hide-on-med-and-down"></i>
                <i class="mdi-editor-publish hide-on-large-only"></i>
                <span class="hide-on-med-and-down">Publish</span>
            </button>
            <a id="upload" class="btn waves-effect waves-light modal-trigger" href="#upload-area">
                <i class="mdi-file-file-upload left hide-on-med-and-down"></i>
                <i class="mdi-file-file-upload hide-on-large-only"></i>
                <span class="hide-on-med-and-down">Upload</span>
            </a>
        </div>
    </div>
    <div class="row">
        <div id="left-pane" class="col s4 m4 l2">
            <!-- Directory of stuffs -->
            <div class="row">
                <div class="col s12">
                    <label>Workspace</label>
                    <select>
                        <option value="" disabled>Select a directory</option>
                        <option value="Persona" selected>Personal</option>
                        <option value="Blog">Blog</option>
                        <option value="Personal" selected>Personal</option>
                    </select>
                </div>
                <div class="col s12 center">
                    <a class="waves-effect waves-light btn modal-trigger" href="#modal-new-directory">New Content</a>
                </div>
            </div>
            <div class="row">
                <div class="col s12">
                <div class="col s12" style="overflow-y: auto;">
                    <ul class="collection">
                        <li class="collection-item avatar dismissable">
                            <i class="mdi-file-folder circle"></i>
                            <span class="title">Title</span>
                            <p>(3 files)</p>
                            <a href="#" class="secondary-content"><i class="mdi-action-grade"></i></a>
                        </li>
                        <li class="collection-item avatar dismissable">
                            <i class="mdi-file-folder circle"></i>
                            <span class="title">Title</span>
                            <p></p>
                            <a href="#" class="secondary-content"><i class="mdi-action-grade"></i></a>
                        </li>
                        <li class="collection-item avatar dismissable">
                            <i class="mdi-file-folder circle"></i>
                            <span class="title">Title</span>
                            <p></p>
                            <a href="#" class="secondary-content"><i class="mdi-action-grade"></i></a>
                        </li>
                        <li class="collection-item avatar dismissable">
                            <i class="mdi-file-folder circle"></i>
                            <span class="title">Title</span>
                            <p>(7 files)</p>
                            <a href="#" class="secondary-content"><i class="mdi-action-grade"></i></a>
                        </li>
                        {{ range $d := .Directories }}
                            <li class="collection-item avatar dismissable">
                                <i class="mdi-file-folder circle"></i>
                                <span class="title"><a href="/{{ $.Username }}/edit/{{ $d }}">{{ $d }}</a></span>
                                <p><!--(3 files)--></p>
                                <a href="#" class="secondary-content"><i class="mdi-action-grade"></i></a>
                            </li>
                        {{ end }}
                    </ul>
                </div>
            </div>
        </div>
        <div id="workarea" class="col s8 m8 l10">
            <div class="row">
                <pre id="editor" class="col s12 m12 l12"></pre>
                <!--<div id="preview" class="col s12 m12 l6"></div>-->
            <div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
                <a id="create" class="btn-floating btn-large red" title="Edit">
                    <i class="large mdi-editor-mode-edit"></i>
                </a>
                <ul>
                    <li><a id="delete" class="btn-floating red" title="Delete"><i class="large mdi-action-delete"></i></a></li>
                    <li><a id="save" class="btn-floating amber" title="Save"><i class="large mdi-content-save"></i></a></li>
                    <li><a id="publish" class="btn-floating green" title="Publish"><i class="large mdi-editor-publish"></i></a></li>
                    <li><a id="upload" class="btn-floating blue modal-trigger" href="#upload-area" title="Attach file"><i class="large mdi-editor-attach-file"></i></a></li>
                </ul>
            </div>
            {{ if .Title }}
                <div id="zoom" class="row">
                    <div id="editor-actions" class="col s12 m12 l12">
                        <a id="fullscreen" class="waves-effect waves-teal btn-flat right" title="Fullscreen">
                            <i class="mdi-navigation-fullscreen left hide-on-med-and-down"></i>
                            <i class="mdi-navigation-fullscreen hide-on-large-only"></i>
                            <span class="hide-on-med-and-down">Focus Mode</span>
                        </a>
                        <a id="preview" class="waves-effect waves-teal btn-flat right" title="Toggle Mode">
                            <i class="mdi-action-cached left hide-on-med-and-down"></i>
                            <i class="mdi-action-cached hide-on-large-only"></i>
                            <span class="hide-on-med-and-down">Preview</span>
                        </a>
                    </div>
                    <div class="col s12 m12 l12"><h4>{{ .Title }}</h4></div>
                    <pre id="editor" class="col s12 m12 l12">{{ .Content }}</pre>
                    <iframe id="view" class="col s12 m12 l12" style="display: none;" frameBorder="0" seamless="seamless" src="/{{ .Username }}/edit/{{ .Title }}/preview"></iframe>
                </div>
            {{ else }}
                <div class="row">
                    <div id="welcome" class="col s12 m12 l12 valign-wrapper">
                        <h5 class="valign center">Welcome!</h5>
                    </div>
                </div>
            {{ end }}
        </div>
    </div>
    <div class="row">
@@ -121,7 +144,6 @@
            <div id="upload-area" class="modal bottom-sheet">
                <div class="modal-content">
                    <h4>Upload</h4>
                    <div id="holder" class="valign-wrapper">
                        <p class="valign center" style="width: 100%;">Drag &amp; drop your files here!</p>
                    </div>
@@ -139,6 +161,23 @@
            </div>
        </div>
    </div>
    <div id="modal-new-directory" class="modal">
        <div class="modal-content">
            <h4>New Content</h4>
            <form id="new-directory" class="col s12" method="post" action="/{{ .Username }}/edit/">
                <div class="row">
                    <div class="input-field col s12">
                        <input id="title" name="title" type="text" class="validate">
                        <label for="title">Document Title</label>
                    </div>
                </div>
            </form>
        </div>
        <div class="modal-footer">
            <a id="new" href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Create</a>
            <a href="#" class="modal-action modal-close waves-effect waves-red btn-flat">Cancel</a>
        </div>
    </div>
{{ end }}
{{ define "scripts" }}
    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.8/ace.js"></script>
@@ -146,9 +185,11 @@
    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.8/mode-markdown.js"></script>
    <script type="text/javascript">
        (function () {
            var editor = ace.edit('editor');
            editor.setTheme('ace/theme/chrome');
            editor.getSession().setMode('ace/mode/markdown');
            if (document.getElementById('editor')) {
                var editor = ace.edit('editor');
                editor.setTheme('ace/theme/chrome');
                editor.getSession().setMode('ace/mode/markdown');
            }
        })();
        (function () {
@@ -232,17 +273,17 @@
        $(function () {
            function toggleFullScreen() {
                var editorElement = document.getElementById('editor');
                var zoom = document.getElementById('zoom');
                if (!document.fullscreenElement && !document.mozFullScreenElement && !document.webkitFullScreenElement && !document.msFullscreenElement) {
                if (!document.fullscreenElement && !document.mozFullScreenElement && !document.webkitFullscreenElement && !document.msFullscreenElement) {
                    if (document.documentElement.requestFullscreen) {
                        editorElement.requestFullscreen();
                        zoom.requestFullscreen();
                    } else if (document.documentElement.msRequestFullscreen) {
                        editorElement.msRequestFullscreen();
                        zoom.msRequestFullscreen();
                    } else if (document.documentElement.mozRequestFullScreen) {
                        editorElement.mozRequestFullScreen();
                        zoom.mozRequestFullScreen();
                    } else if (document.documentElement.webkitRequestFullscreen) {
                        editorElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
                        zoom.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
                    }
                } else {
                    if (document.exitFullscreen) {
@@ -259,10 +300,70 @@
            $('select').material_select();
            $('.modal-trigger').leanModal();
            $('button#fullscreen').click(function (event) {
            $('#fullscreen').click(function (event) {
                event.preventDefault();
                $('#zoom').toggleClass('fullscreen');
                toggleFullScreen();
            });
            $('#preview').click(function (event) {
                event.preventDefault();
                var editor = ace.edit('editor');
                if (!$('#view').is(':visible')) {
                    $.ajax({
                        url: window.location.href,
                        method: 'put',
                        data: {
                            'contents': editor.getValue()
                        }
                    })
                    .done(function () {
                        $('#view').attr('src', $('#view').attr('src'));
                        $('#editor, #view').toggle();
                    });
                } else {
                    $('#editor, #view').toggle();
                }
            });
            $('a#delete').click(function (event) {
                event.preventDefault();
                var title = $('input#title').val();
                $.ajax({
                    url: window.location.href,
                    method: 'delete'
                })
                .done(function () {
                    window.location.href = '/{{ .Username }}';
                });
            });
            $('a#new').click(function (event) {
                event.preventDefault();
                var title = $('input#title').val();
                var form = $('form#new-directory');
                form.attr('action', form.attr('action') + title);
                form.submit();
                return false;
            });
            $('a#save').click(function (event) {
                event.preventDefault();
                var editor = ace.edit('editor');
                $.ajax({
                    url: window.location.href,
                    method: 'put',
                    data: {
                        'contents': editor.getValue()
                    }
                });
            });
        });
    </script>
{{ end }}

main.go

@@ -21,13 +21,21 @@ func main() {
	auth := r.PathPrefix("/logon").Subrouter()
	auth.Methods("POST").HandlerFunc(handlers.LogonHandler)
	content := r.PathPrefix("/{username}").Subrouter()
	doc := r.PathPrefix("/{user}/edit/{title}").Subrouter()
	doc.HandleFunc("/preview", handlers.ContentPreviewHandler).Methods("GET")
	doc.Methods("GET").HandlerFunc(handlers.ContentReadHandler)
	doc.Methods("POST").HandlerFunc(handlers.ContentCreateHandler)
	//doc.Methods("POST").HandlerFunc(handlers.ContentUploadHandler)
	doc.Methods("PUT").HandlerFunc(handlers.ContentUpdateHandler)
	doc.Methods("DELETE").HandlerFunc(handlers.ContentDeleteHandler)
	content := r.PathPrefix("/{user}").Subrouter()
	content.Methods("GET").HandlerFunc(handlers.ContentHandler)
	article := r.PathPrefix("/{username}/blog/{article}").Subrouter()
	article := r.PathPrefix("/{user}/blog/{article}").Subrouter()
	article.Methods("GET").HandlerFunc(handlers.BlogArticleHandler)
	blog := r.PathPrefix("/{username}/blog").Subrouter()
	blog := r.PathPrefix("/{user}/blog").Subrouter()
	blog.Methods("GET").HandlerFunc(handlers.BlogHandler)
	log.Print("Serving content on ", environment.Address())

security/security_test.go

@@ -1,8 +1,6 @@
package security
import (
	"testing"
)
import "testing"
func TestEncoding(t *testing.T) {
	clear := "encoding test"
@@ -40,5 +38,12 @@ func TestHashCredentials(t *testing.T) {
}
func TestGeneratePassphrase(t *testing.T) {
	t.Skip("Need a test for generating a passphrase")
	username := "bryan"
	passphrase := "test"
	expected := "o47ZaAu3pd5cK0ZA412Z3rpsi8MDdlUZPkJ9Z51x7QlNUc7S4EGYuT9XIe4HYtzy7vxHah528ibkfd4CjHCSsg=="
	generated := GeneratePassphrase(username, passphrase)
	if expected != generated {
		t.FailNow()
	}
}