Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
22a266a2
Commit
22a266a2
authored
Nov 20, 2016
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
templates: Add arguments to .Include
parent
5a6b7656
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
caddyhttp/gzip/gzip_test.go
caddyhttp/gzip/gzip_test.go
+1
-1
caddyhttp/httpserver/context.go
caddyhttp/httpserver/context.go
+5
-2
caddyhttp/httpserver/context_test.go
caddyhttp/httpserver/context_test.go
+11
-2
No files found.
caddyhttp/gzip/gzip_test.go
View file @
22a266a2
...
@@ -104,7 +104,7 @@ func nextFunc(shouldGzip bool) httpserver.Handler {
...
@@ -104,7 +104,7 @@ func nextFunc(shouldGzip bool) httpserver.Handler {
return
0
,
fmt
.
Errorf
(
"ResponseWriter should be gzipResponseWriter, found %T"
,
w
)
return
0
,
fmt
.
Errorf
(
"ResponseWriter should be gzipResponseWriter, found %T"
,
w
)
}
}
if
strings
.
Contains
(
w
.
Header
()
.
Get
(
"Content-Type"
),
"application/x-gzip"
)
{
if
strings
.
Contains
(
w
.
Header
()
.
Get
(
"Content-Type"
),
"application/x-gzip"
)
{
return
0
,
fmt
.
Errorf
(
"Content
type should not be gzip.
"
)
return
0
,
fmt
.
Errorf
(
"Content
-Type should not be gzip
"
)
}
}
return
0
,
nil
return
0
,
nil
}
}
...
...
caddyhttp/httpserver/context.go
View file @
22a266a2
...
@@ -12,8 +12,9 @@ import (
...
@@ -12,8 +12,9 @@ import (
"text/template"
"text/template"
"time"
"time"
"github.com/russross/blackfriday"
"os"
"os"
"github.com/russross/blackfriday"
)
)
// This file contains the context and functions available for
// This file contains the context and functions available for
...
@@ -24,10 +25,12 @@ type Context struct {
...
@@ -24,10 +25,12 @@ type Context struct {
Root
http
.
FileSystem
Root
http
.
FileSystem
Req
*
http
.
Request
Req
*
http
.
Request
URL
*
url
.
URL
URL
*
url
.
URL
Args
[]
interface
{}
// defined by arguments to .Include
}
}
// Include returns the contents of filename relative to the site root.
// Include returns the contents of filename relative to the site root.
func
(
c
Context
)
Include
(
filename
string
)
(
string
,
error
)
{
func
(
c
Context
)
Include
(
filename
string
,
args
...
interface
{})
(
string
,
error
)
{
c
.
Args
=
args
return
ContextInclude
(
filename
,
c
,
c
.
Root
)
return
ContextInclude
(
filename
,
c
,
c
.
Root
)
}
}
...
...
caddyhttp/httpserver/context_test.go
View file @
22a266a2
...
@@ -30,6 +30,7 @@ func TestInclude(t *testing.T) {
...
@@ -30,6 +30,7 @@ func TestInclude(t *testing.T) {
}()
}()
tests
:=
[]
struct
{
tests
:=
[]
struct
{
args
[]
interface
{}
fileContent
string
fileContent
string
expectedContent
string
expectedContent
string
shouldErr
bool
shouldErr
bool
...
@@ -42,7 +43,15 @@ func TestInclude(t *testing.T) {
...
@@ -42,7 +43,15 @@ func TestInclude(t *testing.T) {
shouldErr
:
false
,
shouldErr
:
false
,
expectedErrorContent
:
""
,
expectedErrorContent
:
""
,
},
},
// Test 1 - failure on template.Parse
// Test 1 - all good, with args
{
args
:
[]
interface
{}{
"hello"
,
5
},
fileContent
:
`str1 {{ .Root }} str2 {{index .Args 0}} {{index .Args 1}}`
,
expectedContent
:
fmt
.
Sprintf
(
"str1 %s str2 %s %d"
,
context
.
Root
,
"hello"
,
5
),
shouldErr
:
false
,
expectedErrorContent
:
""
,
},
// Test 2 - failure on template.Parse
{
{
fileContent
:
`str1 {{ .Root } str2`
,
fileContent
:
`str1 {{ .Root } str2`
,
expectedContent
:
""
,
expectedContent
:
""
,
...
@@ -73,7 +82,7 @@ func TestInclude(t *testing.T) {
...
@@ -73,7 +82,7 @@ func TestInclude(t *testing.T) {
t
.
Fatal
(
testPrefix
+
"Failed to create test file. Error was: %v"
,
err
)
t
.
Fatal
(
testPrefix
+
"Failed to create test file. Error was: %v"
,
err
)
}
}
content
,
err
:=
context
.
Include
(
inputFilename
)
content
,
err
:=
context
.
Include
(
inputFilename
,
test
.
args
...
)
if
err
!=
nil
{
if
err
!=
nil
{
if
!
test
.
shouldErr
{
if
!
test
.
shouldErr
{
t
.
Errorf
(
testPrefix
+
"Expected no error, found [%s]"
,
test
.
expectedErrorContent
,
err
.
Error
())
t
.
Errorf
(
testPrefix
+
"Expected no error, found [%s]"
,
test
.
expectedErrorContent
,
err
.
Error
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment