Merge pull request #190 from gobuffalo/v5

v5

.github/workflows/standard-go-test.yml

@@ -2,11 +2,49 @@ name: Standard Test
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
 
 jobs:
-  call-standard-test:
-    name: Test
-    uses: gobuffalo/.github/.github/workflows/go-test.yml@v1
-    secrets: inherit
+  dependency-review:
+    if: ${{ github.event_name == 'pull_request' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Dependency Review
+        uses: actions/dependency-review-action@v1
+
+  standard-go-test:
+    name: go${{ matrix.go-version }}/${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go-version:
+          - "1.21"
+          - "1.22"
+        os:
+          - "ubuntu-latest"
+          - "macos-latest"
+          - "windows-latest"
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Test
+        if: ${{ matrix.os != 'windows-latest' }}
+        env:
+          YARN_ENABLE_IMMUTABLE_INSTALLS: 0
+        run: |
+          go test -v -p 1 -race -cover -tags "sqlite,integration" ./...
+
+      - name: Short Test
+        if: ${{ matrix.os == 'windows-latest' }}
+        env:
+          YARN_ENABLE_IMMUTABLE_INSTALLS: 0
+        run: |
+          go test -v -p 1 -tags "sqlite,integration" ./...

.github/workflows/standard-stale.yml

@@ -5,7 +5,28 @@ on:
     - cron: "30 1 * * *"
 
 jobs:
-  call-standard-autocloser:
-    name: Autocloser
-    uses: gobuffalo/.github/.github/workflows/stale.yml@v1
-    secrets: inherit
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write # for actions/stale to close stale issues
+      pull-requests: write # for actions/stale to close stale PRs
+
+    steps:
+      - uses: actions/stale@v6
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-issue-stale: 30
+          days-before-issue-close: 7
+          days-before-pr-stale: 45
+          days-before-pr-close: 7
+          stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment. Otherwise, this will be closed in 7 days."
+          stale-pr-message: "This PR is stale because it has been open 45 days with no activity. Remove stale label or comment. Otherwise, this will be closed in 7 days."
+          close-issue-message: "This issue was closed because it has been stalled for 30+7 days with no activity."
+          close-pr-message: "This PR was closed because it has been stalled for 45+7 days with no activity."
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          close-issue-label: "s: closed"
+          close-pr-label: "s: closed"
+          exempt-issue-labels: "bug,security,s: accepted,s: blocked,s: hold"
+          exempt-pr-labels: "bug,security,s: accepted,s: blocked,s: hold"
+          exempt-all-milestones: true

README.md

@@ -1,7 +1,7 @@
 # Plush
 
 [![Standard Test](https://github.com/gobuffalo/plush/actions/workflows/standard-go-test.yml/badge.svg)](https://github.com/gobuffalo/plush/actions/workflows/standard-go-test.yml)
-[![Go Reference](https://pkg.go.dev/badge/github.com/gobuffalo/plush/v4.svg)](https://pkg.go.dev/github.com/gobuffalo/plush/v4)
+[![Go Reference](https://pkg.go.dev/badge/github.com/gobuffalo/plush/v5.svg)](https://pkg.go.dev/github.com/gobuffalo/plush/v5)
 
 Plush is the templating system that [Go](http://golang.org) both needs _and_ deserves. Powerful, flexible, and extendable, Plush is there to make writing your templates that much easier.
 
@@ -207,8 +207,8 @@ for (i,v) in [1, 2, 3,4,5,6,7,8,9,10] {
   if (i > 0) {
     continue
   }
-  return v   
-} 
+  return v
+}
 ```
 
 You can terminate the for loop with `break`:
@@ -217,8 +217,8 @@ for (i,v) in [1, 2, 3,4,5,6,7,8,9,10] {
   if (i > 5) {
     break
   }
-  return v   
-} 
+  return v
+}
 ```
 
 The values inside the `()` part of the statement are the names you wish to give to the key (or index) and the value of the expression. The `expression` can be an array, map, or iterator type.
@@ -294,9 +294,9 @@ fmt.Print(s)
 // output: 45
 ```
 
-## Helpers
+## Default helpers
 
-For a full list, and documentation of, all the Helpers included in Plush, see [`github.com/gobuffalo/helpers`](https://godoc.org/github.com/gobuffalo/helpers).
+Plush ships with a comprehensive list of helpers to make your life easier. For more info check the helpers package.
 
 ### Custom Helpers
 
@@ -350,4 +350,3 @@ This package absolutely 100% could not have been written without the help of Tho
 Not only did the book make understanding the process of writing lexers, parsers, and asts, but it also provided the basis for the syntax of Plush itself.
 
 If you have yet to read Thorsten's book, I can't recommend it enough. Please go and buy it!
-

ast/ast.go

@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/gobuffalo/plush/v4/token"
+import "github.com/gobuffalo/plush/v5/token"
 
 type TokenAble struct {
 	token.Token

ast/ast_test.go

@@ -3,8 +3,8 @@ package ast_test
 import (
 	"testing"
 
-	"github.com/gobuffalo/plush/v4/ast"
-	"github.com/gobuffalo/plush/v4/token"
+	"github.com/gobuffalo/plush/v5/ast"
+	"github.com/gobuffalo/plush/v5/token"
 	"github.com/stretchr/testify/require"
 )
 

ast/return_statement.go

@@ -3,7 +3,7 @@ package ast
 import (
 	"bytes"
 
-	"github.com/gobuffalo/plush/v4/token"
+	"github.com/gobuffalo/plush/v5/token"
 )
 
 type ReturnStatement struct {

comments_test.go

@@ -3,7 +3,7 @@ package plush_test
 import (
 	"testing"
 
-	"github.com/gobuffalo/plush/v4"
+	"github.com/gobuffalo/plush/v5"
 	"github.com/stretchr/testify/require"
 )
 
@@ -32,12 +32,12 @@ func Test_BlockComment(t *testing.T) {
 	r := require.New(t)
 	input := map[string]string{
 		"test1": `
-		<%# this is 
+		<%# this is
 		a block comment %>
 		Hi
 		`,
 		"test2": `
-		<% <%# this is 
+		<% <%# this is
 		a block comment %> %>
 		Hi`,
 	}

compiler.go

@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/gobuffalo/plush/v4/token"
+	"github.com/gobuffalo/plush/v5/token"
 
 	"html/template"
 	"reflect"
 	"regexp"
 	"strings"
 	"time"
 
-	"github.com/gobuffalo/helpers/hctx"
-	"github.com/gobuffalo/plush/v4/ast"
+	"github.com/gobuffalo/plush/v5/ast"
+	"github.com/gobuffalo/plush/v5/helpers/hctx"
 )
 
 type ErrUnknownIdentifier struct {

context.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/gobuffalo/helpers/hctx"
+	"github.com/gobuffalo/plush/v5/helpers/hctx"
 )
 
 var _ context.Context = &Context{}
@@ -85,7 +85,7 @@ func NewContextWith(data map[string]interface{}) *Context {
 		moot:    &sync.Mutex{},
 	}
 
-	for k, v := range Helpers.helpers {
+	for k, v := range Helpers.All() {
 		if !c.Has(k) {
 			c.Set(k, v)
 		}
@@ -105,7 +105,7 @@ func NewContextWithOuter(data map[string]interface{}, out *Context) *Context {
 		moot:    &sync.Mutex{},
 	}
 
-	for k, v := range Helpers.helpers {
+	for k, v := range Helpers.All() {
 		if !c.Has(k) && !c.outer.Has(k) {
 			c.Set(k, v)
 		}

context_test.go

@@ -6,7 +6,7 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/gobuffalo/plush/v4"
+	"github.com/gobuffalo/plush/v5"
 	"github.com/stretchr/testify/require"
 )
 

error_test.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/gobuffalo/plush/v4"
+	"github.com/gobuffalo/plush/v5"
 	"github.com/stretchr/testify/require"
 )
 

escape_test.go

@@ -4,7 +4,7 @@ import (
 	"html/template"
 	"testing"
 
-	"github.com/gobuffalo/plush/v4"
+	"github.com/gobuffalo/plush/v5"
 	"github.com/stretchr/testify/require"
 )
 

example_test.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"log"
 
-	"github.com/gobuffalo/plush/v4"
+	"github.com/gobuffalo/plush/v5"
 )
 
 // ExampleRender using `if`, `for`, `else`, functions, etc...