Compare commits
No commits in common. "master" and "handle-string-pointer" have entirely different histories.
master
...
handle-str
12
README.org
12
README.org
@ -10,18 +10,6 @@ https://pypi.org/project/template-nest/.
|
||||
|
||||
* News
|
||||
|
||||
** v0.1.6 - 2025-12-02
|
||||
|
||||
+ Treat empty hash as nil
|
||||
|
||||
Tom: I think that if go's behaviour is to insert an empty map when nil is
|
||||
returned as a templatenest.Hash, then we need to change the templatenest
|
||||
behaviour to regard an empty map as being nil.
|
||||
|
||||
** v0.1.5 - 2025-02-22
|
||||
|
||||
+ Handle all pointer types generically.
|
||||
|
||||
** v0.1.4 - 2025-01-09
|
||||
|
||||
+ Fix nil pointer dereference error.
|
||||
|
||||
@ -283,15 +283,6 @@ func (nest *TemplateNest) Render(toRender interface{}) (string, error) {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
// Handle pointer types generically
|
||||
if reflect.TypeOf(toRender).Kind() == reflect.Ptr {
|
||||
if reflect.ValueOf(toRender).IsNil() {
|
||||
return "", nil
|
||||
}
|
||||
// Dereference the pointer and recursively call Render
|
||||
return nest.Render(reflect.ValueOf(toRender).Elem().Interface())
|
||||
}
|
||||
|
||||
if reflect.TypeOf(toRender).Kind() == reflect.Slice {
|
||||
return nest.renderSlice(toRender)
|
||||
}
|
||||
@ -303,6 +294,12 @@ func (nest *TemplateNest) Render(toRender interface{}) (string, error) {
|
||||
case bool:
|
||||
return fmt.Sprintf("%t", v), nil
|
||||
|
||||
case *string:
|
||||
if v == nil {
|
||||
return "", nil
|
||||
}
|
||||
return nest.Render(*v)
|
||||
|
||||
case string:
|
||||
if nest.option.NoEscapeInput {
|
||||
return v, nil
|
||||
@ -364,15 +361,10 @@ func (nest *TemplateNest) renderSlice(toRender interface{}) (string, error) {
|
||||
}
|
||||
|
||||
func (nest *TemplateNest) renderHash(hash map[string]interface{}) (string, error) {
|
||||
// If the hash is completely empty, return an empty string.
|
||||
if len(hash) == 0 {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
tLabel, ok := hash[*nest.option.NameLabel]
|
||||
if !ok {
|
||||
return "", fmt.Errorf(
|
||||
"encountered hash with no name label (name label: `%+v`)", nest.option.NameLabel,
|
||||
"encountered hash with no name label (name label: `%s`)", nest.option.NameLabel,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@ -174,19 +174,6 @@ func TestRenderNoNameLabel(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderEmptyHash(t *testing.T) {
|
||||
nest, err := templatenest.New(templatenest.Option{TemplateDir: "templates"})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to initialize TemplateNest: %+v", err)
|
||||
}
|
||||
|
||||
page := templatenest.Hash{}
|
||||
|
||||
render, err := nest.Render(page)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "", render)
|
||||
}
|
||||
|
||||
func TestRenderSimplePageArrays(t *testing.T) {
|
||||
nest, err := templatenest.New(templatenest.Option{
|
||||
TemplateDir: "templates",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user