From 78879a43a0e8555b65bb107ba3df97ea45f9b94c Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Sun, 20 Oct 2013 22:26:07 -0700
Subject: [PATCH] bugfixes

---
 ptree.rkt       | 19 ++++++++++++++-----
 readability.rkt |  5 +++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ptree.rkt b/ptree.rkt
index 3a7516b..1ce4a2d 100644
--- a/ptree.rkt
+++ b/ptree.rkt
@@ -229,16 +229,16 @@
 (define here->pnode path->pnode)
 
 (define/contract (pnode->url pnode [files current-url-context])
-  ((pnode?) ((listof pathish?)) . ->* . string?)
+  ((pnode?) ((listof pathish?)) . ->* . (or/c string? boolean?))
   ;; upconvert all files to their output path
   ;; then remove duplicates because some sources might have already been rendered
   (define output-paths (remove-duplicates (map ->output-path files) equal?))
   ;; find ones that match pnode
-  (define matching-paths (filter (λ(x) (x . starts-with? . pnode)) output-paths))
+  (define matching-paths (filter (λ(x) (equal? (->string (remove-all-ext x)) (->string pnode))) output-paths))
   (cond
-    [((len matching-paths) . = . 0) "#"] ; conventional way to write a null URL
     [((len matching-paths) . = . 1) (->string (car matching-paths))]
-    [((len matching-paths) . > . 1) (error "More than one matching URL for" pnode)]))
+    [((len matching-paths) . > . 1) (error "More than one matching URL for" pnode)]
+    [else #f] ))
 
 
 (module+ test
@@ -298,18 +298,27 @@
 
 
 (define current-ptree '(empty ((parent "")))) ;; simplest empty ptree that will meet ptree contract
-(define current-url-context pollen-project-directory)
 
 (define/contract (set-current-ptree ptree)
   (ptree? . -> . void?)
   (set! current-ptree ptree))
 
+;; create the state variable
+(define current-url-context '())
+
+;; create the state variable setter
 (define/contract (set-current-url-context x)
   ((or/c directory-pathish? (listof pathish?)) . -> . void)
+  ;; try treating x as a directory, 
+  ;; otherwise treat it as a list of paths
   (set! current-url-context (with-handlers ([exn:fail? (λ(e) x)])
                               (directory-list x))))
 
+;; set the state variable using the setter
+(set-current-url-context pollen-project-directory)
+
 (module+ main
+  (displayln "Running module main")
   (set-current-ptree (make-project-ptree (->path "/Users/MB/git/bpt/")))
   (set-current-url-context (directory-list "/Users/MB/git/bpt/"))
   (pnode->url (previous-page (previous-page 'what-is-typography))))
\ No newline at end of file
diff --git a/readability.rkt b/readability.rkt
index 47e1adf..abd2766 100644
--- a/readability.rkt
+++ b/readability.rkt
@@ -71,7 +71,7 @@
 (module+ test
   (check-equal? (->list '(1 2 3)) '(1 2 3))
   (check-equal? (->list (list->vector '(1 2 3))) '(1 2 3))
-  (check-equal? (->list (set 1 2 3)) '(1 2 3))
+  (check-equal? (->list (set 1 2 3)) '(3 2 1))
   (check-equal? (->list "foo") (list "foo")))
 
 ;; general way of coercing to vector
@@ -236,7 +236,8 @@
 ;; todo: merge this with pathish
 (define/contract (stringish? x)
   (any/c . -> . boolean?)
-  (->boolean (or path? string? symbol?)))
+  (with-handlers ([exn:fail? (λ(e) #f)])
+    (->boolean (->string x))))
 
 ;; python-style string testers
 (define/contract (starts-with? str starter)