Merge pull request #51 from devimteam/develop

vetcher · web-flow · commit c5c574c1bf05 · 2018-01-30T12:49:01.000+03:00
0.7.0
diff --git a/example/generated/endpoints.go b/example/generated/endpoints.go
@@ -29,7 +29,7 @@ func (E *Endpoints) Uppercase(ctx context.Context, stringsMap map[string]string)
 	return endpointUppercaseResponse.(*UppercaseResponse).Ans, err
 }
 
-func (E *Endpoints) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {
+func (E *Endpoints) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {
 	endpointCountRequest := CountRequest{
 		Symbol: symbol,
 		Text:   text,
diff --git a/example/generated/exchanges.go b/example/generated/exchanges.go
@@ -14,7 +14,7 @@ type UppercaseResponse struct {
 
 type CountRequest struct {
 	Text   string `json:"text"`
-	Symbol string `json:"symbol"`
+	Symbol int    `json:"symbol"`
 }
 
 type CountResponse struct {
diff --git a/example/generated/middleware/error_logging.go b/example/generated/middleware/error_logging.go
@@ -33,7 +33,7 @@ func (L *serviceErrorLogging) Uppercase(ctx context.Context, stringsMap map[stri
 	return L.next.Uppercase(ctx, stringsMap)
 }
 
-func (L *serviceErrorLogging) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {
+func (L *serviceErrorLogging) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {
 	defer func() {
 		if err != nil {
 			L.logger.Log("method", "Count", "message", err)
diff --git a/example/generated/middleware/logging.go b/example/generated/middleware/logging.go
@@ -35,7 +35,7 @@ func (L *serviceLogging) Uppercase(ctx context.Context, stringsMap map[string]st
 	return L.next.Uppercase(ctx, stringsMap)
 }
 
-func (L *serviceLogging) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {
+func (L *serviceLogging) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {
 	defer func(begin time.Time) {
 		L.logger.Log(
 			"method", "Count",
@@ -74,7 +74,7 @@ type logUppercaseRequest struct {
 
 type logCountRequest struct {
 	Text   string
-	Symbol string
+	Symbol int
 }
 
 type logCountResponse struct {
diff --git a/example/generated/middleware/recovering.go b/example/generated/middleware/recovering.go
@@ -35,7 +35,7 @@ func (R *serviceRecovering) Uppercase(ctx context.Context, stringsMap map[string
 	return R.next.Uppercase(ctx, stringsMap)
 }
 
-func (R *serviceRecovering) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {
+func (R *serviceRecovering) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			R.logger.Log("method", "Count", "message", r)
diff --git a/example/generated/svc.go b/example/generated/svc.go
@@ -12,7 +12,8 @@ import (
 type StringService interface {
 	// @logs-ignore ans, err
 	Uppercase(ctx context.Context, stringsMap map[string]string) (ans string, err error)
-	Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error)
+	// @http-method geT
+	Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error)
 	// @logs-len comments
 	TestCase(ctx context.Context, comments []*entity.Comment) (tree map[string]int, err error)
 }
diff --git a/example/generated/transport/converter/http/exchange_converters.go b/example/generated/transport/converter/http/exchange_converters.go
@@ -6,9 +6,13 @@ import (
 	bytes "bytes"
 	context "context"
 	json "encoding/json"
+	errors "errors"
 	generated "github.com/devimteam/microgen/example/generated"
+	mux "github.com/gorilla/mux"
 	ioutil "io/ioutil"
 	http "net/http"
+	path "path"
+	strconv "strconv"
 )
 
 func CommonHTTPRequestEncoder(_ context.Context, r *http.Request, request interface{}) error {
@@ -32,9 +36,28 @@ func DecodeHTTPUppercaseRequest(_ context.Context, r *http.Request) (interface{}
 }
 
 func DecodeHTTPCountRequest(_ context.Context, r *http.Request) (interface{}, error) {
-	var req generated.CountRequest
-	err := json.NewDecoder(r.Body).Decode(&req)
-	return &req, err
+	var (
+		_param string
+	)
+	var ok bool
+	_vars := mux.Vars(r)
+	_param, ok = _vars["text"]
+	if !ok {
+		return nil, errors.New("param text not found")
+	}
+	text := _param
+	_param, ok = _vars["symbol"]
+	if !ok {
+		return nil, errors.New("param symbol not found")
+	}
+	symbol, err := strconv.ParseInt(_param, 10, 64)
+	if err != nil {
+		return nil, err
+	}
+	return &generated.CountRequest{
+		Symbol: int(symbol),
+		Text:   string(text),
+	}, nil
 }
 
 func DecodeHTTPTestCaseRequest(_ context.Context, r *http.Request) (interface{}, error) {
@@ -62,14 +85,21 @@ func DecodeHTTPTestCaseResponse(_ context.Context, r *http.Response) (interface{
 }
 
 func EncodeHTTPUppercaseRequest(ctx context.Context, r *http.Request, request interface{}) error {
+	r.URL.Path = path.Join(r.URL.Path, "uppercase")
 	return CommonHTTPRequestEncoder(ctx, r, request)
 }
 
 func EncodeHTTPCountRequest(ctx context.Context, r *http.Request, request interface{}) error {
-	return CommonHTTPRequestEncoder(ctx, r, request)
+	req := request.(*generated.CountRequest)
+	r.URL.Path = path.Join(r.URL.Path, "count",
+		req.Text,
+		strconv.FormatInt(int64(req.Symbol), 10),
+	)
+	return nil
 }
 
 func EncodeHTTPTestCaseRequest(ctx context.Context, r *http.Request, request interface{}) error {
+	r.URL.Path = path.Join(r.URL.Path, "test-case")
 	return CommonHTTPRequestEncoder(ctx, r, request)
 }
 
diff --git a/example/generated/transport/http/client.go b/example/generated/transport/http/client.go
@@ -20,7 +20,7 @@ func NewHTTPClient(addr string, opts ...http.ClientOption) (generated.StringServ
 	}
 	return &generated.Endpoints{
 		CountEndpoint: http.NewClient(
-			"POST",
+			"GET",
 			u,
 			http1.EncodeHTTPCountRequest,
 			http1.DecodeHTTPCountResponse,
diff --git a/example/generated/transport/http/server.go b/example/generated/transport/http/server.go
@@ -6,25 +6,29 @@ import (
 	generated "github.com/devimteam/microgen/example/generated"
 	http2 "github.com/devimteam/microgen/example/generated/transport/converter/http"
 	http "github.com/go-kit/kit/transport/http"
+	mux "github.com/gorilla/mux"
 	http1 "net/http"
 )
 
 func NewHTTPHandler(endpoints *generated.Endpoints, opts ...http.ServerOption) http1.Handler {
-	handler := http1.NewServeMux()
-	handler.Handle("/uppercase", http.NewServer(
-		endpoints.UppercaseEndpoint,
-		http2.DecodeHTTPUppercaseRequest,
-		http2.EncodeHTTPUppercaseResponse,
-		opts...))
-	handler.Handle("/count", http.NewServer(
-		endpoints.CountEndpoint,
-		http2.DecodeHTTPCountRequest,
-		http2.EncodeHTTPCountResponse,
-		opts...))
-	handler.Handle("/test-case", http.NewServer(
-		endpoints.TestCaseEndpoint,
-		http2.DecodeHTTPTestCaseRequest,
-		http2.EncodeHTTPTestCaseResponse,
-		opts...))
-	return handler
+	mux := mux.NewRouter()
+	mux.Methods("POST").Path("uppercase").Handler(
+		http.NewServer(
+			endpoints.UppercaseEndpoint,
+			http2.DecodeHTTPUppercaseRequest,
+			http2.EncodeHTTPUppercaseResponse,
+			opts...))
+	mux.Methods("GET").Path("count/{text}/{symbol}").Handler(
+		http.NewServer(
+			endpoints.CountEndpoint,
+			http2.DecodeHTTPCountRequest,
+			http2.EncodeHTTPCountResponse,
+			opts...))
+	mux.Methods("POST").Path("test-case").Handler(
+		http.NewServer(
+			endpoints.TestCaseEndpoint,
+			http2.DecodeHTTPTestCaseRequest,
+			http2.EncodeHTTPTestCaseResponse,
+			opts...))
+	return mux
 }
diff --git a/generator/decide.go b/generator/decide.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	mstrings "github.com/devimteam/microgen/generator/strings"
 	"github.com/devimteam/microgen/generator/template"
 	lg "github.com/devimteam/microgen/logger"
 	"github.com/devimteam/microgen/util"
@@ -29,6 +30,9 @@ const (
 	GrpcClientTag             = template.GrpcClientTag
 	MainTag                   = template.MainTag
 	ErrorLoggingMiddlewareTag = template.ErrorLoggingMiddlewareTag
+
+	HttpMethodTag  = template.HttpMethodTag
+	HttpMethodPath = template.HttpMethodPath
 )
 
 func ListTemplatesForGen(iface *types.Interface, force bool, importPackageName, absOutPath, sourcePath string) (units []*generationUnit, err error) {
@@ -47,8 +51,8 @@ func ListTemplatesForGen(iface *types.Interface, force bool, importPackageName,
 		Iface:                    iface,
 		AbsOutPath:               absOutPath,
 		SourceFilePath:           absSourcePath,
-		ProtobufPackage:          fetchMetaInfo(TagMark+ProtobufTag, iface.Docs),
-		GRPCRegAddr:              fetchMetaInfo(TagMark+GRPCRegAddr, iface.Docs),
+		ProtobufPackage:          mstrings.FetchMetaInfo(TagMark+ProtobufTag, iface.Docs),
+		GRPCRegAddr:              mstrings.FetchMetaInfo(TagMark+GRPCRegAddr, iface.Docs),
 		FileHeader:               defaultFileHeader,
 	}
 	stubSvc, err := NewGenUnit(template.NewStubInterfaceTemplate(info), absOutPath)
@@ -84,17 +88,6 @@ func ListTemplatesForGen(iface *types.Interface, force bool, importPackageName,
 	return units, nil
 }
 
-// Fetch information from slice of comments (docs).
-// Returns appendix of first comment which has tag as prefix.
-func fetchMetaInfo(tag string, comments []string) string {
-	for _, comment := range comments {
-		if len(comment) > len(tag) && strings.HasPrefix(comment, tag) {
-			return comment[len(tag)+1:]
-		}
-	}
-	return ""
-}
-
 func tagToTemplate(tag string, info *template.GenerationInfo) (tmpls []template.Template) {
 	switch tag {
 	case MiddlewareTag:
diff --git a/generator/generator.go b/generator/generator.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	Version           = "0.7.0b"
+	Version           = "0.7.0"
 	defaultFileHeader = `This file was automatically generated by "microgen ` + Version + `" utility.`
 )
 
diff --git a/generator/strings/strings.go b/generator/strings/strings.go
@@ -0,0 +1,23 @@
+package strings
+
+import "strings"
+
+// Fetch information from slice of comments (docs).
+// Returns appendix of first comment which has tag as prefix.
+func FetchMetaInfo(tag string, comments []string) string {
+	for _, comment := range comments {
+		if len(comment) > len(tag) && strings.HasPrefix(comment, tag) {
+			return comment[len(tag)+1:]
+		}
+	}
+	return ""
+}
+
+func ContainTag(strs []string, prefix string) bool {
+	for _, comment := range strs {
+		if strings.HasPrefix(comment, prefix) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/generator/template/common.go b/generator/template/common.go
@@ -33,6 +33,9 @@ const (
 	PackagePathSyscall            = "syscall"
 	PackagePathErrors             = "errors"
 	PackagePathNet                = "net"
+	PackagePathGorillaMux         = "github.com/gorilla/mux"
+	PackagePathPath               = "path"
+	PackagePathStrconv            = "strconv"
 
 	TagMark         = "// @"
 	MicrogenMainTag = "microgen"
@@ -93,15 +96,15 @@ func structFieldName(field *types.Variable) *Statement {
 }
 
 // Remove from function fields context if it is first in slice
-func removeContextIfFirst(fields []types.Variable) []types.Variable {
+func RemoveContextIfFirst(fields []types.Variable) []types.Variable {
 	if IsContextFirst(fields) {
 		return fields[1:]
 	}
 	return fields
 }
 
 func IsContextFirst(fields []types.Variable) bool {
-	if len(fields) == 0{
+	if len(fields) == 0 {
 		return false
 	}
 	name := types.TypeName(fields[0].Type)
diff --git a/generator/template/endpoints.go b/generator/template/endpoints.go
@@ -136,7 +136,7 @@ func (t *endpointsTemplate) serviceEndpointMethodBody(fn *types.Function) func(g
 	reqName := endpointExchange("request", fn)
 	respName := endpointExchange("response", fn)
 	return func(g *Group) {
-		g.Id(reqName).Op(":=").Id(requestStructName(fn)).Values(dictByVariables(removeContextIfFirst(fn.Args)))
+		g.Id(reqName).Op(":=").Id(requestStructName(fn)).Values(dictByVariables(RemoveContextIfFirst(fn.Args)))
 		g.Add(endpointResponse(respName, fn)).Id(util.LastUpperOrFirst("Endpoint")).Dot(endpointStructName(fn.Name)).Call(Id(firstArgName(fn)), Op("&").Id(reqName))
 		g.If(Id(nameOfLastResultError(fn)).Op("!=").Nil().BlockFunc(func(ifg *Group) {
 			if t.grpc {
@@ -197,7 +197,7 @@ func createEndpointBody(signature *types.Function) *Statement {
 		Interface(),
 		Error(),
 	).BlockFunc(func(g *Group) {
-		methodParams := removeContextIfFirst(signature.Args)
+		methodParams := RemoveContextIfFirst(signature.Args)
 		if len(methodParams) > 0 {
 			g.Id("_req").Op(":=").Id("request").Assert(Op("*").Id(requestStructName(signature)))
 		}
diff --git a/generator/template/exchange.go b/generator/template/exchange.go
@@ -47,7 +47,7 @@ func (t *exchangeTemplate) Render() write_strategy.Renderer {
 	f.PackageComment(`Please, do not edit.`)
 
 	for _, signature := range t.Info.Iface.Methods {
-		f.Add(exchange(requestStructName(signature), removeContextIfFirst(signature.Args))).Line()
+		f.Add(exchange(requestStructName(signature), RemoveContextIfFirst(signature.Args))).Line()
 		f.Add(exchange(responseStructName(signature), removeErrorIfLast(signature.Results))).Line()
 	}
 
diff --git a/generator/template/grpc_client.go b/generator/template/grpc_client.go
@@ -85,12 +85,29 @@ func (t *gRPCClientTemplate) Render() write_strategy.Renderer {
 // Renders reply type argument
 // 		stringsvc.CountResponse{}
 func (t *gRPCClientTemplate) replyType(signature *types.Function) *Statement {
-	if len(removeErrorIfLast(signature.Results)) == 0 {
+	results := removeErrorIfLast(signature.Results)
+	if len(results) == 0 {
 		return Qual(PackagePathEmptyProtobuf, "Empty").Values()
 	}
+	if len(results) == 1 {
+		sp := specialReplyType(results[0].Type)
+		if sp != nil {
+			return sp
+		}
+	}
 	return Qual(t.Info.ProtobufPackage, responseStructName(signature)).Values()
 }
 
+func specialReplyType(p types.Type) *Statement {
+	name := types.TypeName(p)
+	imp := types.TypeImport(p)
+	// *string -> *wrappers.StringValue
+	if name != nil && *name == "string" && imp == nil && p.TypeOf() == types.T_Pointer {
+		return (&Statement{}).Qual(GolangProtobufWrappers, "StringValue").Values()
+	}
+	return nil
+}
+
 func (gRPCClientTemplate) DefaultPath() string {
 	return "./transport/grpc/client.go"
 }
diff --git a/generator/template/grpc_endpoint_conv.go b/generator/template/grpc_endpoint_conv.go
diff --git a/generator/template/grpc_server.go b/generator/template/grpc_server.go
diff --git a/generator/template/http_client.go b/generator/template/http_client.go
diff --git a/generator/template/http_converters.go b/generator/template/http_converters.go
diff --git a/generator/template/http_server.go b/generator/template/http_server.go
diff --git a/generator/template/logging.go b/generator/template/logging.go
diff --git a/generator/template/stub_grpc_type_conv.go b/generator/template/stub_grpc_type_conv.go
diff --git a/generator/validate.go b/generator/validate.go

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (E *Endpoints) Uppercase(ctx context.Context, stringsMap map[string]string)`
`29`	`29`	`return endpointUppercaseResponse.(*UppercaseResponse).Ans, err`
`30`	`30`	`}`
`31`	`31`
`32`		`-func (E *Endpoints) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {`
	`32`	`+func (E *Endpoints) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {`
`33`	`33`	`endpointCountRequest := CountRequest{`
`34`	`34`	`Symbol: symbol,`
`35`	`35`	`Text: text,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type UppercaseResponse struct {`
`14`	`14`
`15`	`15`	`type CountRequest struct {`
`16`	`16`	Text string `json:"text"`
`17`		- Symbol string `json:"symbol"`
	`17`	+ Symbol int `json:"symbol"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`type CountResponse struct {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (L *serviceErrorLogging) Uppercase(ctx context.Context, stringsMap map[stri`
`33`	`33`	`return L.next.Uppercase(ctx, stringsMap)`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (L *serviceErrorLogging) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {`
	`36`	`+func (L *serviceErrorLogging) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {`
`37`	`37`	`defer func() {`
`38`	`38`	`if err != nil {`
`39`	`39`	`L.logger.Log("method", "Count", "message", err)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (L *serviceLogging) Uppercase(ctx context.Context, stringsMap map[string]st`
`35`	`35`	`return L.next.Uppercase(ctx, stringsMap)`
`36`	`36`	`}`
`37`	`37`
`38`		`-func (L *serviceLogging) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {`
	`38`	`+func (L *serviceLogging) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {`
`39`	`39`	`defer func(begin time.Time) {`
`40`	`40`	`L.logger.Log(`
`41`	`41`	`"method", "Count",`
`@@ -74,7 +74,7 @@ type logUppercaseRequest struct {`
`74`	`74`
`75`	`75`	`type logCountRequest struct {`
`76`	`76`	`Text string`
`77`		`- Symbol string`
	`77`	`+ Symbol int`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`type logCountResponse struct {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (R *serviceRecovering) Uppercase(ctx context.Context, stringsMap map[string`
`35`	`35`	`return R.next.Uppercase(ctx, stringsMap)`
`36`	`36`	`}`
`37`	`37`
`38`		`-func (R *serviceRecovering) Count(ctx context.Context, text string, symbol string) (count int, positions []int, err error) {`
	`38`	`+func (R *serviceRecovering) Count(ctx context.Context, text string, symbol int) (count int, positions []int, err error) {`
`39`	`39`	`defer func() {`
`40`	`40`	`if r := recover(); r != nil {`
`41`	`41`	`R.logger.Log("method", "Count", "message", r)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func NewHTTPClient(addr string, opts ...http.ClientOption) (generated.StringServ`
`20`	`20`	`}`
`21`	`21`	`return &generated.Endpoints{`
`22`	`22`	`CountEndpoint: http.NewClient(`
`23`		`- "POST",`
	`23`	`+ "GET",`
`24`	`24`	`u,`
`25`	`25`	`http1.EncodeHTTPCountRequest,`
`26`	`26`	`http1.DecodeHTTPCountResponse,`