Add adv currency formatting

.buildkite/pipeline.yml

@@ -0,0 +1,10 @@
+---
+env:
+  DEPENDENCY_NAME: github.com/autopilot3/liquid
+  VERSION: ${VERSION:-master}
+
+steps:
+  - label: ":buildkite: Generate Build Steps"
+    command: bksg -c golang-module-update -v "$VERSION"
+    retry:
+      automatic: true

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ## Checklist
 
-- [ ] I have searched the [issue list](https://github.com/osteele/liquid/issues)
+- [ ] I have searched the [issue list](https://github.com/autopilot3/liquid/issues)
 - [ ] I have tested my example against Shopify Liquid. (This isn't necessary if the actual behavior is a panic, or an error for which `IsTemplateError` returns false.)
 
 ## Expected Behavior

.gitignore

@@ -1,4 +1,6 @@
+.DS_Store
 *.output
 *.out
 /liquid
 *.test
+.idea

CONTRIBUTING.md

@@ -2,11 +2,11 @@
 
 Here's some ways to help:
 
-* Select an item from the [issues list](https://github.com/osteele/liquid/issues)
+* Select an item from the [issues list](https://github.com/autopilot3/liquid/issues)
 * Search the sources for FIXME and TODO comments.
 * Improve the [code coverage](https://coveralls.io/github/osteele/liquid?branch=master).
 
-Review the [pull request template](https://github.com/osteele/liquid/blob/master/.github/PULL_REQUEST_TEMPLATE.md) before you get too far along on coding.
+Review the [pull request template](https://github.com/autopilot3/liquid/blob/master/.github/PULL_REQUEST_TEMPLATE.md) before you get too far along on coding.
 
 A note on lint: `nolint: gocyclo` has been used to disable cyclomatic complexity checks on generated functions, hand-written parsers, and some of the generic interpreter functions. IMO this check isn't appropriate for those classes of functions. This isn't a license to disable cyclomatic complexity checks or lint in general.
 
@@ -40,7 +40,7 @@ make lint
 
 ```bash
 godoc -http=:6060
-open http://localhost:6060/pkg/github.com/osteele/liquid/
+open http://localhost:6060/pkg/github.com/autopilot3/liquid/
 ```
 
 ### Work on the Expression Parser and Lexer

Makefile

@@ -2,7 +2,7 @@ SOURCEDIR=.
 SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
 
 LIB = liquid
-PACKAGE = github.com/osteele/liquid
+PACKAGE = github.com/autopilot3/liquid
 LDFLAGS=
 
 .DEFAULT_GOAL: ci
@@ -24,17 +24,15 @@ imports: ## list imports
 	@go list -f '{{join .Imports "\n"}}' ./... | grep -v `go list -f '{{.ImportPath}}'` | grep '\.' | sort | uniq
 
 lint: ## lint the package
-	gometalinter ./... --tests --deadline=5m --include=gofmt --exclude expressions/scanner.go --exclude y.go --exclude '.*_string.go' --disable=gotype --disable=interfacer
+	golangci-lint run
 	@echo lint passed
 
 pre-commit: lint test ## lint and test the package
 
 setup: ## install dependencies and development tools
-	go get golang.org/x/tools/cmd/stringer
+	go install golang.org/x/tools/cmd/stringer
 	go install golang.org/x/tools/cmd/goyacc
 	go get -t ./...
-	go get github.com/alecthomas/gometalinter
-	gometalinter --install
 
 test: ## test the package
 	go test ./...

README.md

@@ -35,7 +35,7 @@ It was developed for use in the [Gojekyll](https://github.com/osteele/gojekyll)
 
 `go get gopkg.in/osteele/liquid.v1` # latest snapshot
 
-`go get -u github.com/osteele/liquid` # development version
+`go get -u github.com/autopilot3/liquid` # development version
 
 ## Usage
 
@@ -83,7 +83,7 @@ Drops have a different design from the Shopify (Ruby) implementation.
 A Ruby drop sets `liquid_attributes` to a list of attributes that are exposed to Liquid.
 A Go drop implements `ToLiquid() interface{}`, that returns a proxy object.
 Conventionally, the proxy is a `map` or `struct` that defines the exposed properties.
-See <http://godoc.org/github.com/osteele/liquid#Drop> for additional information.
+See <http://godoc.org/github.com/autopilot3/liquid#Drop> for additional information.
 
 ### Value Types
 
@@ -141,7 +141,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-| [<img src="https://avatars2.githubusercontent.com/u/674?v=4" width="100px;"/><br /><sub><b>Oliver Steele</b></sub>](https://osteele.com/)<br />[💻](https://github.com/osteele/liquid/commits?author=osteele "Code") [📖](https://github.com/osteele/liquid/commits?author=osteele "Documentation") [🤔](#ideas-osteele "Ideas, Planning, & Feedback") [🚇](#infra-osteele "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-osteele "Reviewed Pull Requests") [⚠️](https://github.com/osteele/liquid/commits?author=osteele "Tests") | [<img src="https://avatars0.githubusercontent.com/u/973593?v=4" width="100px;"/><br /><sub><b>James Littlejohn</b></sub>](https://github.com/thessem)<br />[💻](https://github.com/osteele/liquid/commits?author=thessem "Code") [📖](https://github.com/osteele/liquid/commits?author=thessem "Documentation") [⚠️](https://github.com/osteele/liquid/commits?author=thessem "Tests") | [<img src="https://avatars2.githubusercontent.com/u/12567?v=4" width="100px;"/><br /><sub><b>nsf</b></sub>](http://nosmileface.ru)<br />[💻](https://github.com/osteele/liquid/commits?author=nsf "Code") [⚠️](https://github.com/osteele/liquid/commits?author=nsf "Tests") |
+| [<img src="https://avatars2.githubusercontent.com/u/674?v=4" width="100px;"/><br /><sub><b>Oliver Steele</b></sub>](https://osteele.com/)<br />[💻](https://github.com/autopilot3/liquid/commits?author=osteele "Code") [📖](https://github.com/autopilot3/liquid/commits?author=osteele "Documentation") [🤔](#ideas-osteele "Ideas, Planning, & Feedback") [🚇](#infra-osteele "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-osteele "Reviewed Pull Requests") [⚠️](https://github.com/autopilot3/liquid/commits?author=osteele "Tests") | [<img src="https://avatars0.githubusercontent.com/u/973593?v=4" width="100px;"/><br /><sub><b>James Littlejohn</b></sub>](https://github.com/thessem)<br />[💻](https://github.com/autopilot3/liquid/commits?author=thessem "Code") [📖](https://github.com/autopilot3/liquid/commits?author=thessem "Documentation") [⚠️](https://github.com/autopilot3/liquid/commits?author=thessem "Tests") | [<img src="https://avatars2.githubusercontent.com/u/12567?v=4" width="100px;"/><br /><sub><b>nsf</b></sub>](http://nosmileface.ru)<br />[💻](https://github.com/autopilot3/liquid/commits?author=nsf "Code") [⚠️](https://github.com/autopilot3/liquid/commits?author=nsf "Tests") |
 | :---: | :---: | :---: |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
@@ -177,14 +177,14 @@ MIT License
 [coveralls-url]: https://coveralls.io/r/osteele/liquid?branch=master
 [coveralls-svg]: https://img.shields.io/coveralls/osteele/liquid.svg?branch=master
 
-[godoc-url]: https://godoc.org/github.com/osteele/liquid
-[godoc-svg]: https://godoc.org/github.com/osteele/liquid?status.svg
+[godoc-url]: https://godoc.org/github.com/autopilot3/liquid
+[godoc-svg]: https://godoc.org/github.com/autopilot3/liquid?status.svg
 
-[license-url]: https://github.com/osteele/liquid/blob/master/LICENSE
+[license-url]: https://github.com/autopilot3/liquid/blob/master/LICENSE
 [license-svg]: https://img.shields.io/badge/license-MIT-blue.svg
 
-[go-report-card-url]: https://goreportcard.com/report/github.com/osteele/liquid
-[go-report-card-svg]: https://goreportcard.com/badge/github.com/osteele/liquid
+[go-report-card-url]: https://goreportcard.com/report/github.com/autopilot3/liquid
+[go-report-card-svg]: https://goreportcard.com/badge/github.com/autopilot3/liquid
 
 [travis-url]: https://travis-ci.org/osteele/liquid
 [travis-svg]: https://img.shields.io/travis/osteele/liquid.svg?branch=master

cmd/liquid/main.go

@@ -4,19 +4,18 @@
 //
 // Examples:
 //
-// 	echo '{{ "Hello " | append: "World" }}' | liquid
-// 	liquid source.tpl
+//	echo '{{ "Hello " | append: "World" }}' | liquid
+//	liquid source.tpl
 package main
 
 import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 
-	"github.com/osteele/liquid"
+	"github.com/autopilot3/liquid"
 )
 
 // for testing
@@ -49,7 +48,7 @@ func run(args []string) error {
 		usage()
 		exit(1)
 	case len(args) == 1:
-		s, err := ioutil.ReadFile(args[0])
+		s, err := os.ReadFile(args[0])
 		if err != nil {
 			return err
 		}

cmd/liquid/main_test.go

@@ -3,7 +3,10 @@ package main
 import (
 	"bytes"
 	"testing"
+	"time"
 
+	"github.com/autopilot3/ap3-types-go/types/date"
+	"github.com/autopilot3/liquid"
 	"github.com/stretchr/testify/require"
 )
 
@@ -46,3 +49,110 @@ func TestMain(t *testing.T) {
 	require.NoError(t, run([]string{"file1", "file2"}))
 	require.Equal(t, 1, exitCode)
 }
+
+func TestRenderAllowedTags(t *testing.T) {
+
+	bindings := map[string]interface{}{
+		"people": map[string]interface{}{
+			"name": "bob",
+		},
+	}
+	tests := []struct {
+		name                 string
+		allowTagsWithDefault bool
+		src                  string
+		expected             string
+	}{
+		{
+			"Allow name only",
+			false,
+			"Hello {{ people.name | default: 'there' }}, your email is {{ people.email }}! {% if people.random == '123' %} you can't see me {% endif %}",
+			"Hello bob, your email is {{ people.email }}! {% if people.random == '123' %} you can't see me {% endif %}",
+		},
+		{
+			"Allow name only, others have default",
+			false,
+			"Hello {{ people.name | default: 'there' }}, your email is {{ people.email | default: 'unknown' }}!",
+			"Hello bob, your email is {{ people.email | default: 'unknown' }}!",
+		},
+		{
+			"Allow name and default",
+			true,
+			"Hello {{ people.name | default: 'there' }}, your email is {{ people.email | default: 'unknown' }}!",
+			"Hello bob, your email is unknown!",
+		},
+		{
+			"Allow name and default",
+			true,
+			"Hello {{ people.name | default: 'there' }}, your email is {{ people.email | default: 'unknown' }}!{% if people.random == '123' %} you can't see me.{% endif %}",
+			"Hello bob, your email is unknown!{% if people.random == '123' %} you can't see me.{% endif %}",
+		},
+	}
+	for _, tt := range tests {
+		engine := liquid.NewEngine()
+		engine.SetAllowedTags(map[string]struct{}{
+			"people.name": {},
+		})
+		if tt.allowTagsWithDefault {
+			engine.AllowedTagsWithDefault()
+		}
+		tmpl, err := engine.ParseString(tt.src)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Run(tt.name, func(t *testing.T) {
+			out, err := tmpl.RenderString(bindings)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if out != tt.expected {
+				t.Errorf("TestRenderAllowedTags() = %v, want %v", out, tt.expected)
+			}
+		})
+	}
+}
+
+func TestDateFormat(t *testing.T) {
+
+	bDate, _ := date.New(1994, 4, 28, "UTC")
+	bindings := map[string]interface{}{
+		"people": map[string]interface{}{
+			"birthday": bDate,
+		},
+	}
+	tests := []struct {
+		name     string
+		v        interface{}
+		src      string
+		expected string
+	}{
+		{
+			"date",
+			bDate,
+			"{{ people.birthday | dateFormatOrDefault: 'dmy' | default: '0001-01-01' }}",
+			"28/04/1994",
+		},
+		{
+			"time",
+			time.Date(1994, time.April, 28, 0, 0, 0, 0, time.UTC),
+			"{{ people.birthday | dateFormatOrDefault: 'dmy' | default: '0001-01-01' }}",
+			"28/04/1994",
+		},
+	}
+	for _, tt := range tests {
+		engine := liquid.NewEngine()
+		tmpl, err := engine.ParseString(tt.src)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Run(tt.name, func(t *testing.T) {
+			out, err := tmpl.RenderString(bindings)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if out != tt.expected {
+				t.Errorf("TestRenderAllowedTags() = %v, want %v", out, tt.expected)
+			}
+		})
+	}
+}

customtags/tags.go

@@ -0,0 +1,79 @@
+package customtags
+
+import (
+	"fmt"
+
+	crmtypes "github.com/autopilot3/ap3-crm-api-go/services/types"
+)
+
+const (
+	TagDisplayTypeDate      string = "date"
+	TagDisplayTypeTime      string = "time"
+	TagDisplayTypeBool      string = "bool"
+	TagDisplayTypeCurrency  string = "currency"
+	TagDisplayTypeDecimal   string = "decimal"
+	TagDisplayTypeAggregate string = "aggregate"
+	TagDisplayTypePhone     string = "phone"
+)
+
+type TagType string
+
+const (
+	TagTypeMergeTag  TagType = "merge"
+	TagTypeMergeText TagType = "text"
+)
+
+type Tag struct {
+	ID           string           `json:"id" bson:"id"`
+	Type         TagType          `json:"type" bson:"type"`
+	Icon         string           `json:"icon" bson:"icon"`
+	Title        string           `json:"title" bson:"title"`
+	DisplayType  string           `json:"display_type" bson:"display_type"`
+	LiquidName   string           `json:"liquid_name" bson:"liquid_name"`
+	DefaultValue string           `json:"default_value" bson:"default_value"`
+	FormatOption string           `json:"format_option" bson:"format_option"`
+	FieldID      crmtypes.FieldID `json:"field_id" bson:"field_id"`
+	ActivityID   crmtypes.FieldID `json:"activity_id" bson:"activity_id"`
+}
+
+func (t *Tag) GetPreviewString() (string, error) {
+	if t.Type == TagTypeMergeText {
+		return t.Title, nil
+	}
+	if t.Type == TagTypeMergeTag {
+		return fmt.Sprintf("[%s]", t.Title), nil
+	}
+	return "", fmt.Errorf("unsupported subject merge tag %+v type: %s", t, t.Type)
+}
+
+func (t *Tag) GetLiquidString() (string, error) {
+	if t.Type == TagTypeMergeText {
+		return t.Title, nil
+	}
+	if t.Type == TagTypeMergeTag {
+		switch t.DisplayType {
+		case TagDisplayTypeDate:
+			return fmt.Sprintf(`{{ %s | dateFormatOrDefault: "%s", "%s" }}`, t.LiquidName, t.FormatOption, t.DefaultValue), nil
+		case TagDisplayTypeTime:
+			return fmt.Sprintf(`{{ %s | dateTimeFormatOrDefault: "%s", "%s" }}`, t.LiquidName, t.FormatOption, t.DefaultValue), nil
+		case TagDisplayTypeBool:
+			return fmt.Sprintf(`{{ %s | booleanFormat: "%s" }}`, t.LiquidName, t.FormatOption), nil
+		case TagDisplayTypeCurrency, TagDisplayTypeDecimal, TagDisplayTypeAggregate:
+			return fmt.Sprintf(`{{ %s | decimal: "%s", "%s" }}`, t.LiquidName, t.FormatOption, t.DefaultValue), nil
+		case TagDisplayTypePhone:
+			willHide := false
+			if t.FormatOption == "hide" {
+				willHide = true
+			}
+			return fmt.Sprintf(`{{ %s | hideCountryCodeAndDefault: %t, "%s" }}`, t.LiquidName, willHide, t.DefaultValue), nil
+		default:
+			result := `{{ ` + t.LiquidName
+			if t.DefaultValue != "" {
+				result += ` | default: "` + t.DefaultValue + `"`
+			}
+			result += ` }}`
+			return result, nil
+		}
+	}
+	return "", fmt.Errorf("unsupported subject merge tag %+v type: %s", t, t.Type)
+}