@@ -1,37 +1,37 @@
(class NSFileManager
-
- (- (id) directoryContentsAtPath:(id)path withPattern:(id)pattern is
+
+ ;; Filters directory contents based on a provided regular expression.
+ (- (id) directoryContentsAtPath:(id)path withPattern:(id)pattern is
((self directoryContentsAtPath: path) select:
- (do (directory)
- (pattern findInString: directory))))
-
+ (do (directory)
+ (pattern findInString: directory))))
+
;; Forwards unknown methods to the singleton instance of NSFileManager.
(+ handleUnknownMessage:(id)message withContext:(id)ctx is
((NSFileManager defaultManager) sendMessage:message withContext:ctx)))
(class NSString
- ;; Whitespace removal. Self-explanaory.
+ ;; Whitespace removal. Self-explanatory.
(- (id) stripWhitespace is
- (self stringByTrimmingCharactersInSet:(NSCharacterSet whitespaceCharacterSet)))
+ (self stringByTrimmingCharactersInSet:(NSCharacterSet whitespaceCharacterSet)))
;; Grabs the nth path component. There is no error checking on this. Be careful.
(- (id) pathComponent:(int)index is
- ((self pathComponents) index))
+ ((self pathComponents) index))
;; This makes string substitution much more concise and Rubyesque.
;; Merely an alias for replaceWithString:inString:
(- (id) sub:(id)re with:(id)string is
- (re replaceWithString:string inString:self))
+ (re replaceWithString:string inString:self))
;; This escapes all HTML characters. Perhaps this should be included in NuTemplate?
(- (id) escapeHTML is
- ((((self sub: /&/ with: "&")
- sub: /\"/ with: """)
- sub: />/ with: ">")
- sub: /</ with: "<")))
+ ((((self sub: /\"/ with: """)
+ sub: />/ with: ">")
+ sub: /</ with: "<"))))
(class NSNull
;; Overriding stringValue prevents parentheses from appearing everywhere in my templates.
;; Kids, don't try this at home. I feel very dirty writing this.
- (- (id) stringValue is ""))
\ No newline at end of file
+ (- (id) stringValue is ""))
\ No newline at end of file
nu/extensions.nu
@@ -10,4 +10,11 @@
(global link-to-page
(do (page)
- "<a href=\"#{(page path)}\">#{(page path)}</a>"))
\ No newline at end of file
+ "<a href=\"#{(page path)}\">#{(page path)}</a>"))
+
+(global display-page
+ (do (page)
+ (if page
+ (NuMarkdown convert: (page contents))
+ (else
+ "This page doesn't exist yet. Click on the 'Edit' link above to create it."))))
\ No newline at end of file
nu/helpers.nu
@@ -6,10 +6,7 @@
Welcome to Nuki!
Nuki is a simple Wiki engine powered by the Nunja web server, the Git version control system, and NuMarkdown.
-As you can _see_, Markdown works - however, <em>regular</em> HTML is escaped.
-Links are created with Markdown syntax: [About Nuki](/AboutNuki).
-
-The logo above was drawn by the lovely and talented [Victoria Wang](http://violasong.com)
+As you can _see_, Markdown works.
END)
($session commit))
(unless ($session fileExists: "About")
nu/preload.nu
@@ -11,6 +11,7 @@
(load "Nunja")
(load "NuMarkdown")
+(load "SmartyPants")
(load "Nuki")
(load "Nuki:git")
nukid
@@ -13,7 +13,7 @@
<div id="content">
<form action=<%= "/#{@path}/edit" %> method="post">
<label for="contents">Page contents: </label>
- <textarea name="contents" rows=35 cols=75><%= (@page filesystemContents) %></textarea> <br/>
+ <textarea name="contents" rows=35 cols=75><%= (@page contents) %></textarea> <br/>
<input type="submit" value="Commit"/> <br/> <input type="reset"/>
</form>
</div>
site/edit.nhtml
@@ -13,7 +13,8 @@
<div id="content">
<% (if @allRevisions %>
<% (@allRevisions each: (do (hash) %>
- Revision: <a href="/<%= @path %>/history/<%= hash %>"><%= hash %></a> <br> <% )) %>
+ Rev <a href="/<%= @path %>/history/<%= hash %>"><%= hash %></a>
+ (<a href="/<%= @path %>/history/<%= hash %>/edit">Edit</a>)<br> <% )) %>
<% (else %>
Since the page <%= @path %> doesn't exist yet, it has no history.
<% )) %>
site/history.nhtml
@@ -28,7 +28,6 @@ background:#FFF;
width: 750px;
padding: 0;
margin: 0;
-height: 100%;
float: left;
background:#FFF;
}
site/nuki.css
@@ -15,11 +15,7 @@
</div>
</div>
<div id="content">
- <% (if @page %>
- <%= (NuMarkdown convert: ((@page contents) escapeHTML)) %>
- <% (else %>
- The page '<%= @path %>' doesn't exist yet. Click on the 'Edit' link above to create it.
- <% )) %>
+ <%= (display-page @page) %>
</div>
<div id="footer">
<p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p>
site/page.nhtml
@@ -17,7 +17,6 @@
(get "/pages"
(default-headers)
(set @pages ($session allBlobs))
- (p @pages)
(eval (template-named "listpages")))
(get /\/(\w*)/
@@ -52,4 +51,12 @@
(set @revision (TITLE pathComponent: 3))
(set @page ($session fetchBlob: @path))
(@page setContents: (@page contentsForRevisionHash: @revision))
- (eval (template-named "page")))
\ No newline at end of file
+ (eval (template-named "page")))
+
+(get /\/(\w*)\/history\/(\w*)\/edit/
+ (default-headers)
+ (set @path (TITLE pathComponent: 1))
+ (set @revision (TITLE pathComponent: 3))
+ (set @page ($session fetchBlob: @path))
+ (@page setContents: (@page contentsForRevisionHash: @revision))
+ (eval (template-named "edit")))
\ No newline at end of file
site/site.nu
566e02472a5e2358221ba9ac36bb830aeef7c1f5
Patrick Thomson
ironswallow@gmail.com
http://github.com/patrickt/nuki/commit/f6d5bed22bae4a5c53d5c42cbf2c1739694c0c0d
f6d5bed22bae4a5c53d5c42cbf2c1739694c0c0d
2008-04-01T19:48:40-07:00
2008-04-01T19:48:40-07:00
Many changes, the most significant of which is the support for editing a page starting at a given revision. Check the History pages to see it in action.
Improved the CSS a little bit. Removed the HTML escapes, as they weren't working right. (Thanks to Grayson Hansard for pointing that out.)
Changed the edit pages to use (page contents) rather than (page filesystemContents).
9c4fde20ec8e2a58ec8295fb441795c4b4f5b087
Patrick Thomson
ironswallow@gmail.com