Replace our own custom option with the one defined by Google

Makefile

@@ -3,10 +3,21 @@ GO_PLUGIN=bin/protoc-gen-go
 GO_PLUGIN_PKG=github.com/golang/protobuf/protoc-gen-go
 GATEWAY_PLUGIN=bin/protoc-gen-grpc-gateway
 GATEWAY_PLUGIN_PKG=$(PKG)/protoc-gen-grpc-gateway
-GATEWAY_PLUGIN_SRC=protoc-gen-grpc-gateway/main.go \
-		   protoc-gen-grpc-gateway/generator.go
-OPTIONS_GO=options/options.pb.go
-OPTIONS_PROTO=options/options.proto
+GATEWAY_PLUGIN_SRC= protoc-gen-grpc-gateway/descriptor/name.go \
+		    protoc-gen-grpc-gateway/descriptor/registry.go \
+		    protoc-gen-grpc-gateway/descriptor/services.go \
+		    protoc-gen-grpc-gateway/descriptor/types.go \
+		    protoc-gen-grpc-gateway/gengateway/generator.go \
+		    protoc-gen-grpc-gateway/gengateway/template.go \
+		    protoc-gen-grpc-gateway/httprule/compile.go \
+		    protoc-gen-grpc-gateway/httprule/parse.go \
+		    protoc-gen-grpc-gateway/httprule/types.go \
+		    protoc-gen-grpc-gateway/main.go
+
+GOOGLEAPIS_DIR=third_party/googleapis
+OPTIONS_PROTO=$(GOOGLEAPIS_DIR)/google/api/annotations.proto $(GOOGLEAPIS_DIR)/google/api/http.proto
+OPTIONS_GO=$(OPTIONS_PROTO:.proto=.pb.go)
+
 PKGMAP=Mgoogle/protobuf/descriptor.proto=$(GO_PLUGIN_PKG)/descriptor,Mexamples/sub/message.proto=$(PKG)/examples/sub
 EXAMPLES=examples/echo_service.proto \
 	 examples/a_bit_of_everything.proto
@@ -25,21 +36,22 @@ $(GO_PLUGIN):
 	go build -o $@ $(GO_PLUGIN_PKG)
 
 $(OPTIONS_GO): $(OPTIONS_PROTO) $(GO_PLUGIN)
-	protoc -I $(PROTOC_INC_PATH)  -I. --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP):. $(OPTIONS_PROTO)
+	protoc -I $(PROTOC_INC_PATH)  -I$(GOOGLEAPIS_DIR) --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP):$(GOOGLEAPIS_DIR) $(OPTIONS_PROTO)
 
 $(GATEWAY_PLUGIN): $(OPTIONS_GO) $(GATEWAY_PLUGIN_SRC)
 	go build -o $@ $(GATEWAY_PLUGIN_PKG)
 
 $(EXAMPLE_SVCSRCS): $(GO_PLUGIN) $(EXAMPLES)
-	protoc -I $(PROTOC_INC_PATH) -I. --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP),plugins=grpc:. $(EXAMPLES)
+	protoc -I $(PROTOC_INC_PATH) -I. -I$(GOOGLEAPIS_DIR) --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP),plugins=grpc:. $(EXAMPLES)
 $(EXAMPLE_DEPSRCS): $(GO_PLUGIN) $(EXAMPLE_DEPS)
 	protoc -I $(PROTOC_INC_PATH) -I. --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP),plugins=grpc:. $(EXAMPLE_DEPS)
 $(EXAMPLE_GWSRCS): $(GATEWAY_PLUGIN) $(EXAMPLES)
-	protoc -I $(PROTOC_INC_PATH) -I. --plugin=$(GATEWAY_PLUGIN) --grpc-gateway_out=logtostderr=true,import_prefix=$(PKG):. $(EXAMPLES)
+	protoc -I $(PROTOC_INC_PATH) -I. -I$(GOOGLEAPIS_DIR) --plugin=$(GATEWAY_PLUGIN) --grpc-gateway_out=logtostderr=true,$(PKGMAP):. $(EXAMPLES)
 
 test: $(EXAMPLE_SVCSRCS) $(EXAMPLE_GWSRCS) $(EXAMPLE_DEPSRCS)
 	go test $(PKG)/...
 
+clean distclean:
 realclean:
 	rm -f $(OPTIONS_GO)
 	rm -f $(EXAMPLE_SVCSRCS) $(EXAMPLE_DEPSRCS)

README.md

@@ -60,43 +60,65 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
    ```diff
     syntax = "proto3";
     package example;
-    
-   +import "github.com/gengo/grpc-gateway/options/options.proto";
-    
+   +
+   +import "github.com/gengo/grpc-gateway/third_party/googleapis/google/api/annnotations.proto";
+   +
     message StringMessage {
       string value = 1;
     }
 
     service YourService {
    -  rpc Echo(StringMessage) returns (StringMessage) {}
    +  rpc Echo(StringMessage) returns (StringMessage) {
-   +    option (gengo.grpc.gateway.ApiMethodOptions.api_options) = {
-   +      path: "/v1/example/echo"
-   +      method: "POST"
+   +    option (google.api.http) = {
+   +      post: "/v1/example/echo"
+   +      body: "*"
    +    };
    +  }
     }
    ```
 3. Generate gRPC stub
 
    ```sh
-   protoc -I/usr/local/include -I. -I$GOPATH/src \
+   protoc -I/usr/local/include -I. \
+     -I$GOPATH/src \
+     -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
      --go_out=plugins=grpc:. \
      path/to/your_service.proto
    ```
 
    It will generate a stub file `path/to/your_service.pb.go`.
-   Now you can implement your service on top of the stub.
-4. Generate reverse-proxy
+4. Implement your service in gRPC as usual
+   1. (Optional) Generate gRPC stub in the language you want.
+
+     e.g.
+     ```sh
+     protoc -I/usr/local/include -I. \
+       -I$GOPATH/src \
+       -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
+       --ruby_out=. \
+       path/to/your/service_proto
+
+     protoc -I/usr/local/include -I. \
+       -I$GOPATH/src \
+       -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
+       --plugin=protoc-gen-grpc-ruby=grpc_ruby_plugin \
+       --grpc-ruby_out=. \
+       path/to/your/service.proto
+     ```
+   2. Implement your service
+5. Generate reverse-proxy
 
    ```sh
-   protoc -I/usr/local/include -I. -I$GOPATH/src \
+   protoc -I/usr/local/include -I. \
+     -I$GOPATH/src \
+     -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
      --grpc-gateway_out=logtostderr=true:. \
      path/to/your_service.proto
    ```
 
    It will generate a reverse proxy `path/to/your_service.pb.gw.go`.
-5. Write an entrypoint
+6. Write an entrypoint
 
    Now you need to write an entrypoint of the proxy server.
    ```go
@@ -106,8 +128,8 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
      "net/http"
 
      "github.com/golang/glog"
-     "github.com/zenazn/goji/web"
      "golang.org/x/net/context"
+     "github.com/gengo/grpc-gateway/runtime"
 
      gw "path/to/your_service_package"
    )
@@ -121,7 +143,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
      ctx, cancel := context.WithCancel(ctx)
      defer cancel()
 
-     mux := web.New()
+     mux := runtime.NewServeMux()
      err := gw.RegisterYourServiceHandlerFromEndpoint(ctx, mux, *echoEndpoint)
      if err != nil {
        return err