0.0.4 release

Author: pjdufour

README.md

@@ -47,10 +47,13 @@ The `Convert`, `Deserialize`, and `Serialize` functions are the core functions t
 
 ```go
 ...
-  output_string, err := gss.Convert(input_string, input_format, input_header, input_comment, output_format)
+  output_string, err := gss.Convert(input_string, input_format, input_header, input_comment, output_format, verbose)
 ...
-  output = map[string]interface{}{}
-  err := gss.Deserialize(input, format, input_header, input_comment, &output)
+  input_type, err := GetType(input_string, input_format)
+	if err != nil {
+		return "", errors.Wrap(err, "error creating new object for format "+input_format)
+	}
+  output, err := gss.Deserialize(input, format, input_header, input_comment, input_type, verbose)
 ...
   output_string, err := gss.Serialize(input, format)
 ...
@@ -84,7 +87,7 @@ The `go-simple-serializer` code is available for use in Android applications und
 ```java
 import com.spatialcurrent.gss.Gss;
 ...
-  String output_format = Gss.convert(input_string, input_format, input_header, input_comment, output_format);
+  String output_format = Gss.convert(input_string, input_format, input_header, input_comment, output_format, verbose);
 ...
 ```
 

cmd/gss.js/main.go

@@ -14,18 +14,18 @@ package main
 
 import (
 	"fmt"
-	"github.com/spatialcurrent/go-simple-serializer/gss"
-)
-
-import (
 	"github.com/gopherjs/gopherjs/js"
+	"github.com/pkg/errors"
+	"github.com/spatialcurrent/go-simple-serializer/gss"
 	"honnef.co/go/js/console"
 )
 
 func main() {
 	js.Global.Set("gss", map[string]interface{}{
-		"version": gss.VERSION,
-		"convert": Convert,
+		"version":     gss.VERSION,
+		"convert":     Convert,
+		"deserialize": Deserialize,
+		"serialize":   Serialize,
 	})
 }
 
@@ -60,8 +60,63 @@ func Convert(input_string string, input_format string, output_format string, opt
 
 	output_string, err := gss.Convert(input_string, input_format, input_header, input_comment, output_format, false)
 	if err != nil {
-		console.Log(err.Error())
+		console.Error(err.Error())
 		return ""
 	}
 	return output_string
 }
+
+func Deserialize(input_string string, input_format string, options *js.Object) interface{} {
+
+	m := map[string]interface{}{}
+	for _, key := range js.Keys(options) {
+		m[key] = options.Get(key).Interface()
+	}
+
+	input_header := []string{}
+	input_comment := ""
+
+	if v, ok := m["header"]; ok {
+		switch v.(type) {
+		case []string:
+			input_header = v.([]string)
+		case []interface{}:
+			input_header = make([]string, 0, len(v.([]interface{})))
+			for _, h := range v.([]interface{}) {
+				input_header = append(input_header, fmt.Sprint(h))
+			}
+		}
+	}
+
+	if v, ok := m["input_comment"]; ok {
+		switch v := v.(type) {
+		case string:
+			input_comment = v
+		}
+	}
+
+	input_type, err := gss.GetType(input_string, input_format)
+	if err != nil {
+		console.Error(errors.Wrap(err, "error creating new object for format "+input_format))
+		return ""
+	}
+
+	output_object, err := gss.Deserialize(input_string, input_format, input_header, input_comment, input_type, false)
+	if err != nil {
+		console.Error(err.Error())
+		return ""
+	}
+
+	return output_object
+}
+
+func Serialize(input_object interface{}, output_format string) interface{} {
+
+	output_string, err := gss.Serialize(input_object, output_format)
+	if err != nil {
+		console.Error(err.Error())
+		return ""
+	}
+
+	return output_string
+}

examples/c/test.c

@@ -18,6 +18,7 @@ main(int argc, char **argv) {
     char *input_string = "{\"a\":\"b\",\"c\":[\"d\"]}";
     char *output_string;
 
+    printf("Version: %s\n", Version());
     printf("%s\n", input_string);
 
     err = Convert(input_string, "json", "", "", "yaml", &output_string);

examples/cpp/test.cpp

@@ -48,6 +48,9 @@ int main(int argc, char **argv) {
   std::string output_format("yaml");
   char *output_char_ptr;
 
+  // Write version to stderr
+  std::cout << "Version" << Version() <<std::endl;
+
   // Write input to stderr
   std::cout << input_string << std::endl;
 

examples/python/test.py

@@ -15,7 +15,11 @@
 # You can add current directory with LD_LIBRARY_PATH=. python test.py
 lib = cdll.LoadLibrary("gss.so")
 
-# Define Function Definition
+# Define Function Definitions
+version = lib.Version
+version.argtypes = []
+version.restype = c_char_p
+
 convert = lib.Convert
 convert.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p, c_char_p, POINTER(c_char_p)]
 convert.restype = c_char_p
@@ -25,6 +29,8 @@
 input_string = "{\"a\":\"b\",\"c\":[\"d\"]}"
 output_string_pointer = c_char_p()
 
+print "Version:", version
+
 print input_string
 
 err = convert(input_string, "json", "", "", "yaml", byref(output_string_pointer))

gss/Deserialize.go

@@ -137,15 +137,16 @@ func Deserialize(input string, format string, input_header []string, input_comme
 		for scanner.Scan() {
 			line := strings.TrimSpace(scanner.Text())
 			if len(input_comment) == 0 || !strings.HasPrefix(line, input_comment) {
-				obj := reflect.MakeMap(output_type.Elem())
-				err := json.Unmarshal([]byte(line), obj.Interface())
+				ptr := reflect.New(output_type.Elem())
+				ptr.Elem().Set(reflect.MakeMap(output_type.Elem()))
+				err := json.Unmarshal([]byte(line), ptr.Interface())
 				if err != nil {
 					return nil, errors.Wrap(err, "Error reading object from JSON line")
 				}
-				output = reflect.Append(output, obj)
+				output = reflect.Append(output, ptr.Elem())
 			}
 		}
-		return output, nil
+		return output.Interface(), nil
 	} else if format == "hcl" {
 		ptr := reflect.New(output_type)
 		ptr.Elem().Set(reflect.MakeMap(output_type))

gss/GetType.go

@@ -14,6 +14,9 @@ import (
 	"unicode"
 )
 
+// GetType takes in the content of an object as a string and the serialization format.
+// Returns the type using reflection.
+// This type is fixed and can be passed through functions without losing type information (unlike an empty object).
 func GetType(content string, format string) (reflect.Type, error) {
 
 	if format == "json" {

gss/Version.go

@@ -7,4 +7,4 @@
 
 package gss
 
-var VERSION = "0.0.3"
+var VERSION = "0.0.4"

plugins/gss/main.go

@@ -19,8 +19,6 @@ import (
 	"github.com/spatialcurrent/go-simple-serializer/gss"
 )
 
-var GO_GSS_VERSION = "0.0.2"
-
 func main() {}
 
 //export Convert
@@ -31,7 +29,8 @@ func Convert(input_string *C.char, input_format *C.char, input_header *C.char, i
 		C.GoString(input_format),
 		strings.Split(C.GoString(input_header), ","),
 		C.GoString(input_comment),
-		C.GoString(output_format))
+		C.GoString(output_format),
+		false)
 	if err != nil {
 		return C.CString(err.Error())
 	}
@@ -40,3 +39,8 @@ func Convert(input_string *C.char, input_format *C.char, input_header *C.char, i
 
 	return nil
 }
+
+//export Version
+func Version() *C.char {
+	return C.CString(gss.VERSION)
+}