From 790c166b5abb98a8df960b467594292882ba6104 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Wed, 1 Jul 2020 22:36:26 -0700 Subject: [PATCH] make subdir a complete path (closes #228) --- pollen/private/ts.rktd | 2 +- pollen/setup.rkt | 4 ++-- pollen/test/data/ext/example.html.pm | 0 pollen/test/data/ext/sub/another.html.pm | 0 pollen/test/test-ext.rkt | 12 ++++++++++++ 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 pollen/test/data/ext/example.html.pm create mode 100644 pollen/test/data/ext/sub/another.html.pm create mode 100644 pollen/test/test-ext.rkt diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index 2791f79..d7a0adf 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1592782348 +1593668186 diff --git a/pollen/setup.rkt b/pollen/setup.rkt index c919918..021349e 100644 --- a/pollen/setup.rkt +++ b/pollen/setup.rkt @@ -1,4 +1,4 @@ -#lang racket/base +#lang debug racket/base (require (for-syntax racket/base racket/syntax) racket/runtime-path "private/constants.rkt") @@ -23,7 +23,7 @@ [(not maybe-dir) (current-directory)] [(directory-exists? maybe-dir) maybe-dir] [else (define dir (dirname maybe-dir)) - (and (not (eq? 'relative dir)) dir)])) + (and (not (eq? 'relative dir)) (path->complete-path dir (current-directory)))])) (let loop ([dir starting-dir][path default-directory-require]) (and dir ; dir is #f when it hits the top of the filesystem (let ([simplified-path (simplify-path (path->complete-path path starting-dir))]) diff --git a/pollen/test/data/ext/example.html.pm b/pollen/test/data/ext/example.html.pm new file mode 100644 index 0000000..e69de29 diff --git a/pollen/test/data/ext/sub/another.html.pm b/pollen/test/data/ext/sub/another.html.pm new file mode 100644 index 0000000..e69de29 diff --git a/pollen/test/test-ext.rkt b/pollen/test/test-ext.rkt new file mode 100644 index 0000000..c7edb13 --- /dev/null +++ b/pollen/test/test-ext.rkt @@ -0,0 +1,12 @@ +#lang at-exp racket/base +(require rackunit + racket/runtime-path + pollen/file) + +(define-runtime-path example "data/ext/example.html") +(define-runtime-path example-pm "data/ext/example.html.pm") +(define-runtime-path another "data/ext/sub/another.html") +(define-runtime-path another-pm "data/ext/sub/another.html.pm") + +(check-equal? (get-markup-source example) example-pm) +(check-equal? (get-markup-source another) another-pm)