Merge pull request #10 from xushiwei/blog

classfile demo
goplus · Jan 7, 2024 · 1b292f3 · 1b292f3
2 parents 828667f + d6dd180
commit 1b292f3
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ yap - Yet Another Go/Go+ HTTP Web Framework
 
 ### Router and Parameters
 
-demo ([hello.go](demo/hello/hello.go)):
+demo in Go ([hello.go](demo/hello/hello.go)):
 
 ```go
 import "github.com/goplus/yap"
@@ -26,33 +26,51 @@ y.Handle("/", func(ctx *yap.Context) {
 y.Run(":8080")
 ```
 
+demo in Go+ classfile ([hello_yap.gox](demo/classfile_hello/hello_yap.gox)):
+
+```go
+get "/p/:id", ctx => {
+	ctx.json {
+		"id": ctx.param("id"),
+	}
+}
+handle "/", ctx => {
+	ctx.html `<html><body>Hello, <a href="/p/123">Yap</a>!</body></html>`
+}
+
+run ":8080"
+```
+
 ### YAP Template
 
-demo ([blog.go](demo/blog/blog.go), [article.yap](demo/blog/yap/article.yap)):
+demo in Go ([blog.go](demo/blog/blog.go), [article.yap](demo/blog/yap/article.yap)):
 
 ```go
 import (
-	"embed"
-	"io/fs"
+	"os"
 
 	"github.com/goplus/yap"
 )
 
-type article struct {
-	ID string
-}
-
-//go:embed yap
-var yapFS embed.FS
-
-fsYap, _ := fs.Sub(yapFS, "yap")
-y := yap.New(fsYap)
+y := yap.New(os.DirFS("."))
 
 y.GET("/p/:id", func(ctx *yap.Context) {
-	ctx.YAP(200, "article", article{
-		ID: ctx.Param("id"),
+	ctx.YAP(200, "article", yap.H{
+		"id": ctx.Param("id"),
 	})
 })
 
 y.Run(":8080")
 ```
+
+demo in Go+ classfile ([blog_yap.gox](demo/classfile_blog/blog_yap.gox), [article.yap](demo/classfile_blog/yap/article.yap)):
+
+```go
+get "/p/:id", ctx => {
+	ctx.yap "article", {
+		"id": ctx.param("id"),
+	}
+}
+
+run ":8080"
+```
diff --git a/demo/blog/blog.go b/demo/blog/blog.go
@@ -1,26 +1,17 @@
 package main
 
 import (
-	"embed"
-	"io/fs"
+	"os"
 
 	"github.com/goplus/yap"
 )
 
-type article struct {
-	ID string
-}
-
-//go:embed yap
-var yapFS embed.FS
-
 func main() {
-	fsYap, _ := fs.Sub(yapFS, "yap")
-	y := yap.New(fsYap)
+	y := yap.New(os.DirFS("."))
 
 	y.GET("/p/:id", func(ctx *yap.Context) {
-		ctx.YAP(200, "article", article{
-			ID: ctx.Param("id"),
+		ctx.YAP(200, "article", yap.H{
+			"id": ctx.Param("id"),
 		})
 	})
 

diff --git a/demo/blog/yap/article.yap b/demo/blog/yap/article.yap
@@ -3,6 +3,6 @@
 <meta charset="utf-8"/>
 </head>
 <body>
-Article {{.ID}}
+Article {{.id}}
 </body>
 </html>
diff --git a/demo/blog_emb/blog.go b/demo/blog_emb/blog.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	"embed"
+	"io/fs"
+
+	"github.com/goplus/yap"
+)
+
+type article struct {
+	ID string
+}
+
+//go:embed yap
+var yapFS embed.FS
+
+func main() {
+	fsYap, _ := fs.Sub(yapFS, "yap")
+	y := yap.New(fsYap)
+
+	y.GET("/p/:id", func(ctx *yap.Context) {
+		ctx.YAP(200, "article", article{
+			ID: ctx.Param("id"),
+		})
+	})
+
+	y.Run(":8080")
+}
diff --git a/demo/blog_emb/yap/article.yap b/demo/blog_emb/yap/article.yap
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta charset="utf-8"/>
+</head>
+<body>
+Article {{.ID}}
+</body>
+</html>
diff --git a/demo/classfile_hello/gop_autogen.go b/demo/classfile_hello/gop_autogen.go
@@ -0,0 +1,25 @@
+package main
+
+import "github.com/goplus/yap"
+
+type hello_yap struct {
+	yap.App
+}
+//line demo/classfile_hello/hello_yap.gox:1
+func (this *hello_yap) MainEntry() {
+//line demo/classfile_hello/hello_yap.gox:1:1
+	this.Get("/p/:id", func(ctx *yap.Context) {
+//line demo/classfile_hello/hello_yap.gox:2:1
+		ctx.Json__1(map[string]string{"id": ctx.Param("id")})
+	})
+//line demo/classfile_hello/hello_yap.gox:6:1
+	this.Handle("/", func(ctx *yap.Context) {
+//line demo/classfile_hello/hello_yap.gox:7:1
+		ctx.Html__1(`<html><body>Hello, <a href="/p/123">Yap</a>!</body></html>`)
+	})
+//line demo/classfile_hello/hello_yap.gox:10:1
+	this.Run__1(":8080")
+}
+func main() {
+	yap.Gopt_App_Main(new(hello_yap))
+}
diff --git a/demo/classfile_hello/hello_yap.gox b/demo/classfile_hello/hello_yap.gox
@@ -0,0 +1,10 @@
+get "/p/:id", ctx => {
+	ctx.json {
+		"id": ctx.param("id"),
+	}
+}
+handle "/", ctx => {
+	ctx.html `<html><body>Hello, <a href="/p/123">Yap</a>!</body></html>`
+}
+
+run ":8080"