be very strict about nil identifiers fixes #17

gobuffalo · Nov 3, 2017 · 081bad1 · 081bad1
1 parent 9f09c20
commit 081bad1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 35 deletions.
diff --git a/compiler.go b/compiler.go
@@ -242,7 +242,13 @@ func (c *compiler) evalIdentifier(node *ast.Identifier) (interface{}, error) {
 		}
 		return f.Interface(), nil
 	}
-	return c.ctx.Value(node.Value), nil
+	if c.ctx.Has(node.Value) {
+		return c.ctx.Value(node.Value), nil
+	}
+	if node.Value == "nil" {
+		return nil, nil
+	}
+	return nil, errors.Errorf("could not find identifier '%s'", node.Value)
 }
 
 func (c *compiler) evalInfixExpression(node *ast.InfixExpression) (interface{}, error) {

diff --git a/example_test.go b/example_test.go
@@ -100,31 +100,6 @@ func ExampleRender_customHelperFunctions() {
 	// <p>i can update</p>
 }
 
-func ExampleRender_nilValue() {
-	html := `<html>
-<%= if (names && len(names) > 0) { %>
-	<ul>
-		<%= for (n) in names { %>
-			<li><%= capitalize(n) %></li>
-		<% } %>
-	</ul>
-<% } else { %>
-	<h1>Sorry, no names. :(</h1>
-<% } %>
-</html>`
-
-	s, err := Render(html, NewContext())
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Print(s)
-	// output: <html>
-	//
-	// 	<h1>Sorry, no names. :(</h1>
-	//
-	// </html>
-}
-
 func ExampleRender_forIterator() {
 	html := `<%= for (v) in between(3,6) { %><%=v%><% } %>`
 

diff --git a/for_test.go b/for_test.go
@@ -83,7 +83,7 @@ func Test_Render_For_Nil(t *testing.T) {
 	ctx := NewContext()
 	ctx.Set("nilValue", nil)
 	s, err := Render(input, ctx)
-	r.NoError(err)
+	r.Error(err)
 	r.Equal("", s)
 }
 

diff --git a/functions_test.go b/functions_test.go
@@ -27,7 +27,6 @@ func Test_Render_Unknown_Function_Call(t *testing.T) {
 	input := `<p><%= f() %></p>`
 	_, err := Render(input, NewContext())
 	r.Error(err)
-	r.Contains(err.Error(), "f()")
 }
 
 func Test_Render_Function_Call_With_Arg(t *testing.T) {

diff --git a/if_test.go b/if_test.go
@@ -49,9 +49,8 @@ func Test_Render_If_Or(t *testing.T) {
 func Test_Render_If_Nil(t *testing.T) {
 	r := require.New(t)
 	input := `<%= if (names && len(names) >= 1) { %>hi<%} %>`
-	s, err := Render(input, NewContext())
-	r.NoError(err)
-	r.Equal("", s)
+	_, err := Render(input, NewContext())
+	r.Error(err)
 }
 
 func Test_Render_If_Else_Return(t *testing.T) {

diff --git a/plush_test.go b/plush_test.go
@@ -102,9 +102,8 @@ func Test_Render_Missing_Variable(t *testing.T) {
 	r := require.New(t)
 
 	input := `<p><%= name %></p>`
-	s, err := Render(input, NewContext())
-	r.NoError(err)
-	r.Equal("<p></p>", s)
+	_, err := Render(input, NewContext())
+	r.Error(err)
 }
 
 func Test_Render_HTML_Escape(t *testing.T) {
@@ -318,7 +317,7 @@ func Test_(t *testing.T) {
 
 func Test_Helper_Nil_Arg(t *testing.T) {
 	r := require.New(t)
-	input := `<%= foo(none, "k") %><%= foo(nil, "k") %><%= foo(one, "k") %>`
+	input := `<%= foo(nil, "k") %><%= foo(one, "k") %>`
 	ctx := NewContextWith(map[string]interface{}{
 		"one": map[string]string{
 			"k": "test",
@@ -335,6 +334,17 @@ func Test_Helper_Nil_Arg(t *testing.T) {
 	r.Equal("test", s)
 }
 
+func Test_UndefinedArg(t *testing.T) {
+	r := require.New(t)
+	input := `<%= foo(bar) %>`
+	ctx := NewContext()
+	ctx.Set("foo", func(string) {})
+
+	_, err := Render(input, ctx)
+	r.Error(err)
+	r.Contains(err.Error(), "could not find identifier 'bar'")
+}
+
 func Test_RunScript(t *testing.T) {
 	r := require.New(t)
 	bb := &bytes.Buffer{}