Merge pull request #91 from fortizpenaloza/fix-redirect

Fix redirect to index file
svenvc · Apr 14, 2022 · 9485e0f · 9485e0f
2 parents ce95eb0 + 745b1ff
commit 9485e0f
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 5 deletions.
diff --git a/...inc-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/actualFilenameFor..st b/...inc-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/actualFilenameFor..st
@@ -3,7 +3,7 @@ actualFilenameFor: uri
 	| subElements subDir entry |
 	(uri isEmpty and: [ self prefix isEmpty ]) ifTrue: [ ^ self indexFileIn: self directory ].
 	(self prefix isEmpty or: [ uri isEmpty not and: [ uri pathSegments beginsWith: self prefix ] ]) ifFalse: [ ^ nil ].
-	subElements := (uri pathSegments allButFirst: self prefix size) reject: [ :each | each = #/ ].
+	subElements := (uri pathSegments allButFirst: self prefix size) reject: [ :each | each = $/ ].
 	subDir := subElements allButLast inject: self directory into: [ :parent :sub | | file |
 		(file := parent / sub) exists
 			ifTrue: [ file ]

diff --git a/...-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/directoryRedirectFor..st b/...-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/directoryRedirectFor..st
@@ -1,5 +1,5 @@
 private
 directoryRedirectFor: uri
 	| directoryUri |
-	directoryUri := uri copy addPathSegment: #/.  
+	directoryUri := uri copy addPathSegment: $/.  
 	^ ZnResponse redirect: directoryUri 
diff --git a/...ory/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/indexHtml.st b/...ory/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/indexHtml.st
@@ -0,0 +1,7 @@
+private
+indexHtml
+	^ '<html>
+<head><title>Index</title></head>
+<body><h1>Hi, i''m the index page</h1></body>
+</html>
+'
diff --git a/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/setUp.st b/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/setUp.st
@@ -12,4 +12,8 @@ setUp
 	ZnFileSystemUtils
 		writeStreamFor: 'wide.html' 
 		do: [ :stream |
-			stream nextPutAll: self wideHtml ].
+			stream nextPutAll: self wideHtml ].
+	ZnFileSystemUtils
+		writeStreamFor: 'index.html' 
+		do: [ :stream |
+			stream nextPutAll: self indexHtml ].
diff --git a/...tory/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/tearDown.st b/...tory/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/tearDown.st
@@ -3,6 +3,7 @@ tearDown
 	ZnFileSystemUtils 
 		deleteIfExists: 'small.html'; 
 		deleteIfExists: 'large.html'; 
-		deleteIfExists: 'wide.html'.
+		deleteIfExists: 'wide.html';
+		deleteIfExists: 'index.html'.
 	super tearDown	
 
diff --git a/.../Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/testRedirect.st b/.../Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/instance/testRedirect.st
@@ -0,0 +1,16 @@
+tests
+testRedirect
+	self
+		withServerDo: [ :server | 
+			| client |
+			(client := ZnClient new)
+				beOneShot;
+				url: server localUrl;
+				addPath: #('local-files');
+				get.
+			self assert: client isSuccess.
+			self assert: client response contentType equals: ZnMimeType textHtml.
+			self assert: client contents equals: self indexHtml.
+			self assert: (ZnUtils parseHttpDate: (client response headers at: 'Modification-Date')) equals: (ZnFileSystemUtils modificationTimeFor: 'index.html') asUTC.
+			self assert: (ZnUtils parseHttpDate: (client response headers at: 'Expires')) > (DateAndTime now + 10 days).
+			self assert: (client response headers at: 'Cache-Control') equals: (server delegate maxAgeFor: ZnMimeType textHtml) ]
diff --git a/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/properties.json b/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegateTest.class/properties.json
@@ -1,5 +1,5 @@
 {
-	"commentStamp" : "SvenVanCaekenberghe 12/8/2019 14:06",
+	"commentStamp" : "",
 	"super" : "TestCase",
 	"category" : "Zinc-HTTP-Examples",
 	"classinstvars" : [ ],