Refactoring

Author: osamingo

.travis.yml

@@ -1,22 +1,29 @@
-sudo: required
-dist: trusty
+sudo: false
 
 language: go
 go:
-  - 1.6
-  - 1.7
-  - 1.8
+  - 1.6.4
+  - 1.7.6
+  - 1.8.3
+  - 1.9
+  - tip
+
+matrix:
+  allow_failures:
+  - go: tip
 
 before_install:
-  - sudo add-apt-repository ppa:masterminds/glide -y
-  - sudo apt-get update
-  - sudo apt-get install glide -y
+  - go get -u github.com/Masterminds/glide github.com/golang/lint/golint
 
 install:
   - glide install
 
+before_script:
+  - go vet .
+  - golint .
+
 script:
-  - go test -race -covermode=atomic -coverprofile=coverage.txt .
+  - go test -covermode=atomic -coverprofile=coverage.txt .
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

README.md

@@ -12,7 +12,6 @@
 - Simple, Poetic, Pithy.
 - No `reflect` package.
   - But `reflect` package is used only when invoke the debug handler.
-- Support both packages `context` and `golang.org/x/net/context`.
 - Support GAE/Go Standard Environment.
 - Compliance with [JSON-RPC 2.0](http://www.jsonrpc.org/specification).
 
@@ -25,30 +24,28 @@ $ go get -u github.com/osamingo/jsonrpc
 ## Usage
 
 ```go
-package main
+package jsonrpc
 
 import (
-	"context"
 	"encoding/json"
 	"log"
 	"net/http"
 
 	"github.com/osamingo/jsonrpc"
+	"golang.org/x/net/context"
 )
 
 type (
-	EchoHandler struct {}
-	EchoParams struct {
+	EchoHandler struct{}
+	EchoParams  struct {
 		Name string `json:"name"`
 	}
 	EchoResult struct {
 		Message string `json:"message"`
 	}
 )
 
-var _ (jsonrpc.Handler) = (*EchoHandler)(nil)
-
-func (h *EchoHandler)ServeJSONRPC(c context.Context, params *json.RawMessage) (interface{}, *jsonrpc.Error) {
+func (h *EchoHandler) ServeJSONRPC(c context.Context, params *json.RawMessage) (interface{}, *jsonrpc.Error) {
 
 	var p EchoParams
 	if err := jsonrpc.Unmarshal(params, &p); err != nil {
@@ -65,7 +62,9 @@ func init() {
 }
 
 func main() {
-	http.HandleFunc("/jrpc", jsonrpc.HandlerFunc)
+	http.HandleFunc("/jrpc", func(w http.ResponseWriter, r *http.Request) {
+		jsonrpc.HandlerFunc(r.Context(), w, r)
+	})
 	http.HandleFunc("/jrpc/debug", jsonrpc.DebugHandlerFunc)
 	if err := http.ListenAndServe(":8080", nil); err != nil {
 		log.Fatalln(err)

context.go

@@ -1,5 +1,3 @@
-// +build !go1.7
-
 package jsonrpc
 
 import (

context17.go

@@ -1,5 +1,3 @@
-// +build !go1.7
-
 package jsonrpc
 
 import (

context17_test.go

@@ -1,5 +1,3 @@
-// +build go1.7
-
 package jsonrpc
 
 import (
@@ -26,7 +24,7 @@ func TestDebugHandler(t *testing.T) {
 	require.NoError(t, RegisterMethod("Debug.Sample", SampleHandler(), struct {
 		Name string `json:"name"`
 	}{}, struct {
-		Message string `json:"message,omitrmpty"`
+		Message string `json:"message,omitempty"`
 	}{}))
 
 	rec = httptest.NewRecorder()

context_test.go

@@ -15,8 +15,6 @@ const (
 	ErrorCodeInternal ErrorCode = -32603
 )
 
-var _ error = (*Error)(nil)
-
 type (
 	// A ErrorCode by JSON-RPC 2.0.
 	ErrorCode int

debug_test.go

@@ -7,6 +7,12 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestError(t *testing.T) {
+	var err interface{} = &Error{}
+	_, ok := err.(error)
+	require.True(t, ok)
+}
+
 func TestError_Error(t *testing.T) {
 
 	err := &Error{

error.go

@@ -1,16 +1,17 @@
-// +build go1.7
+//+build !go1.6
 
 package jsonrpc
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"io"
 	"log"
 	"net/http"
 	"net/http/httptest"
 	"os"
+
+	"golang.org/x/net/context"
 )
 
 type (
@@ -43,13 +44,15 @@ func ExampleEchoHandler_ServeJSONRPC() {
 		log.Fatalln(err)
 	}
 
-	http.HandleFunc("/v17/jrpc", HandlerFunc)
-	http.HandleFunc("/v17/jrpc/debug", DebugHandlerFunc)
+	http.HandleFunc("/jrpc", func(w http.ResponseWriter, r *http.Request) {
+		HandlerFunc(r.Context(), w, r)
+	})
+	http.HandleFunc("/jrpc/debug", DebugHandlerFunc)
 
 	srv := httptest.NewServer(http.DefaultServeMux)
 	defer srv.Close()
 
-	resp, err := http.Post(srv.URL+"/v17/jrpc", "application/json", bytes.NewBufferString(`{
+	resp, err := http.Post(srv.URL+"/jrpc", "application/json", bytes.NewBufferString(`{
 	  "jsonrpc": "2.0",
       "method": "Main.Echo",
       "params": {

error_test.go

@@ -1,9 +1,9 @@
-package: .
+package: github.com/osamingo/jsonrpc
 import:
+- package: github.com/alecthomas/jsonschema
 - package: golang.org/x/net
   subpackages:
   - context
-- package: github.com/alecthomas/jsonschema
 testImport:
 - package: github.com/stretchr/testify
   subpackages:

example_test.go

@@ -1,5 +1,3 @@
-// +build !go1.7
-
 package jsonrpc
 
 import (

glide.lock

@@ -1,5 +1,3 @@
-// +build !go1.7
-
 package jsonrpc
 
 import (

glide.yaml

@@ -1,5 +1,3 @@
-// +build !go1.7
-
 package jsonrpc
 
 import (