Merge pull request #2 from go-rs/develop

alpha.2

Author: roshangade

README.md

@@ -6,7 +6,7 @@ REST API framework for go lang
 Released alpha version
 <br>
 See examples 
-  - Request Interceptors/Middlewares
+  - Request Interceptors/Middleware
   - Routes with URL pattern 
   - Methods [GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH]
   - Extend routes with namespace

api.go

@@ -7,7 +7,6 @@ package rest
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
 	"regexp"
 
@@ -59,8 +58,7 @@ type exception struct {
 func (api *API) Route(method string, pattern string, handle Handler) {
 	regex, params, err := utils.Compile(pattern)
 	if err != nil {
-		fmt.Println("Error in pattern", err)
-		panic(1)
+		panic(err)
 	}
 	api.routes = append(api.routes, route{
 		method:  method,

context.go

@@ -59,8 +59,10 @@ func (ctx *Context) Set(key string, val interface{}) {
 /**
  * Get request data from context
  */
-func (ctx *Context) Get(key string) interface{} {
-	return ctx.data[key]
+func (ctx *Context) Get(key string) (val interface{}, exists bool) {
+	val = ctx.data[key]
+	exists = val != nil
+	return
 }
 
 /**
@@ -134,11 +136,19 @@ func (ctx *Context) Text(data string) {
  * Send data
  */
 func (ctx *Context) send(data []byte, err error) {
-	if ctx.end && err != nil {
+	if ctx.end {
 		return
 	}
+
+	if err != nil {
+		ctx.err = err
+		return
+	}
+
 	ctx.Response.WriteHeader(ctx.status)
 	_, err = ctx.Response.Write(data)
+
+	//TODO: check - should not be recursive
 	if err != nil {
 		ctx.err = err
 		return

render/json.go

@@ -7,6 +7,7 @@ package render
 
 import (
 	"encoding/json"
+	"errors"
 	"net/http"
 	"reflect"
 )
@@ -20,21 +21,29 @@ var (
 	jsonType = "application/json"
 )
 
+var (
+	invalidJson = errors.New("INVALID_JSON_RESPONSE")
+)
+
 /**
  * JSON Write
  */
-func (j JSON) Write(w http.ResponseWriter) ([]byte, error) {
-	var data []byte
-	var err error
+func (j JSON) Write(w http.ResponseWriter) (data []byte, err error) {
 	if reflect.TypeOf(j.Body).String() == "string" {
-		rawIn := json.RawMessage(j.Body.(string))
-		data, err = rawIn.MarshalJSON()
+		data, err = json.RawMessage(j.Body.(string)).MarshalJSON()
 	} else {
 		data, err = json.Marshal(j.Body)
 	}
+
 	if err != nil {
-		return nil, err
+		return
 	}
+
+	if !json.Valid(data) {
+		err = invalidJson
+		return
+	}
+
 	w.Header().Set("Content-Type", jsonType)
-	return data, nil
+	return
 }

render/text.go

@@ -20,8 +20,8 @@ var (
 /**
  * Text Write
  */
-func (j Text) Write(w http.ResponseWriter) ([]byte, error) {
-	data := []byte(j.Body)
+func (j Text) Write(w http.ResponseWriter) (data []byte, err error) {
+	data = []byte(j.Body)
 	w.Header().Set("Content-Type", plainType)
-	return data, nil
+	return
 }

utils/url.go

@@ -12,12 +12,11 @@ import (
 
 const sep = "/"
 
-func Compile(str string) (*regexp.Regexp, []string, error) {
+func Compile(str string) (regex *regexp.Regexp, keys []string, err error) {
 	pattern := ""
-	keys := make([]string, 0)
-	_str := strings.Split(str, "/")
+	keys = make([]string, 0)
 
-	for _, val := range _str {
+	for _, val := range strings.Split(str, "/") {
 		if val != "" {
 			switch val[0] {
 			case 42:
@@ -45,9 +44,8 @@ func Compile(str string) (*regexp.Regexp, []string, error) {
 	// 	pattern += "(?:/)?"
 	// }
 
-	regex, err := regexp.Compile("^" + pattern + "/?$")
-
-	return regex, keys, err
+	regex, err = regexp.Compile("^" + pattern + "/?$")
+	return
 }
 
 func Exec(regex *regexp.Regexp, keys []string, uri []byte) *map[string]string {

version.txt

@@ -1 +1 @@
-0.0.1-alpha.1
+0.0.1-alpha.2