0.0.3 release

Author: pjdufour

.travis.yml

@@ -8,14 +8,22 @@ go:
 
 os:
   - linux
-  - osx
+  #- osx
 
 matrix:
   allow_failures:
     - go: tip
   fast_finish: true
 
+install:
+  - go get -u github.com/alecthomas/gometalinter
+  - gometalinter --install
+
 script:
+  - gometalinter --misspell-locale=US --disable-all --enable=misspell --enable=vet ./gss/
+  - gometalinter --misspell-locale=US --disable-all --enable=misspell --enable=vet ./plugins/gss/
+  - gometalinter --misspell-locale=US --disable-all --enable=misspell --enable=vet ./cmd/gss/
+  - gometalinter --misspell-locale=US --disable-all --enable=misspell --enable=vet ./cmd/gss.js/
   - cd gss
   - go fmt
   - cd ./../cmd/gss

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/spatialcurrent/go-simple-serializer.svg)](https://travis-ci.org/spatialcurrent/go-simple-serializer) [![GoDoc](https://godoc.org/github.com/spatialcurrent/go-simple-serializer?status.svg)](https://godoc.org/github.com/spatialcurrent/go-simple-serializer)
+[![Build Status](https://travis-ci.org/spatialcurrent/go-simple-serializer.svg)](https://travis-ci.org/spatialcurrent/go-simple-serializer) [![Go Report Card](https://goreportcard.com/badge/spatialcurrent/go-simple-serializer)](https://goreportcard.com/report/spatialcurrent/go-simple-serializer)  [![GoDoc](https://godoc.org/github.com/spatialcurrent/go-simple-serializer?status.svg)](https://godoc.org/github.com/spatialcurrent/go-simple-serializer) [![license](http://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://github.com/spatialcurrent/go-simple-serializer/blob/master/LICENSE)
 
 # go-simple-serializer
 
@@ -56,6 +56,8 @@ The `Convert`, `Deserialize`, and `Serialize` functions are the core functions t
 ...
 ```
 
+See [gss](https://godoc.org/github.com/spatialcurrent/go-simple-serializer/gss) in GoDoc for information on how to use Go API.
+
 **JavaScript**
 
 ```html
@@ -102,7 +104,7 @@ The Go function definition defined in `plugins/gss/main.go` uses `*C.char` for a
 func Convert(input_string *C.char, input_format *C.char, input_header *C.char, input_comment *C.char, output_format *C.char, output_string **C.char) *C.char
 ```
 
-For complete patterns for `C`, `C++`, and `Python`, see the `examples`.
+For complete patterns for `C`, `C++`, and `Python`, see the `go-simpler-serializer/examples` folder.
 
 # Releases
 
@@ -140,6 +142,10 @@ The `build_android.sh` script is used to build an [Android Archive](https://deve
 
 The `build_so.sh` script is used to build a Shared Object (`*.go`), which can be called by `C`, `C++`, and `Python` on Linux machines.
 
+**Changing Destination**
+
+The default destination for build artifacts is `go-simple-serializer/bin`, but you can change the destination with a CLI argument.  For building on a Chromebook consider saving the artifacts in `/usr/local/go/bin`, e.g., `bash scripts/build_cli.sh /usr/local/go/bin`
+
 # Contributing
 
 [Spatial Current, Inc.](https://spatialcurrent.io) is currently accepting pull requests for this repository.  We'd love to have your contributions!  Please see [Contributing.md](https://github.com/spatialcurrent/go-simple-serializer/blob/master/CONTRIBUTING.md) for how to get started.

cmd/gss.js/main.go

@@ -22,11 +22,9 @@ import (
 	"honnef.co/go/js/console"
 )
 
-var GO_GSS_VERSION = "0.0.2"
-
 func main() {
 	js.Global.Set("gss", map[string]interface{}{
-		"version":        GO_GSS_VERSION,
+		"version": gss.VERSION,
 		"convert": Convert,
 	})
 }

cmd/gss/main.go

@@ -23,7 +23,6 @@ import (
 	"github.com/spatialcurrent/go-simple-serializer/gss"
 )
 
-var GO_GSS_VERSION = "0.0.2"
 var GO_GSS_FORMATS = []string{"csv", "tsv", "hcl", "hcl2", "json", "jsonl", "properties", "toml", "yaml"}
 
 func printUsage() {
@@ -67,7 +66,7 @@ func main() {
 	}
 
 	if version {
-		fmt.Println(GO_GSS_VERSION)
+		fmt.Println(gss.VERSION)
 		os.Exit(0)
 	}
 

examples/c/Makefile

@@ -8,7 +8,7 @@
 build_so:
 	go build -o gss.so -buildmode=c-shared github.com/spatialcurrent/go-simple-serializer/plugins/gss
 build_c:
-	mkdir bin && gcc -o bin/gss_test_c test.c -L. -l:gss.so
+	mkdir -p bin && gcc -o bin/gss_test_c test.c -L. -l:gss.so
 build: build_so build_c
 run:
 	LD_LIBRARY_PATH=. bin/gss_test_c

examples/c/gss_test_c

@@ -1,3 +1,10 @@
+# =================================================================
+#
+# Copyright (C) 2018 Spatial Current, Inc. - All Rights Reserved
+# Released as open source under the MIT License.  See LICENSE file.
+#
+# =================================================================
+
 from ctypes import *
 import sys
 

examples/python/test.py

@@ -14,7 +14,10 @@ import (
 // Convert converts an input_string from the input_format to the output_format and returns an error, if any.
 func Convert(input_string string, input_format string, input_header []string, input_comment string, output_format string) (string, error) {
 
-	object := NewObject(input_string, input_format)
+	object, err := NewObject(input_string, input_format)
+	if err != nil {
+		return "", errors.Wrap(err, "error creating new object for format "+input_format)
+	}
 
 	if input_format == "bson" || input_format == "json" || input_format == "hcl" || input_format == "hcl2" || input_format == "properties" || input_format == "toml" || input_format == "yaml" {
 		if output_format == "bson" || output_format == "json" || input_format == "hcl" || input_format == "hcl2" || output_format == "properties" || output_format == "toml" || output_format == "yaml" {

gss/Convert.go

@@ -148,9 +148,26 @@ func Deserialize(input string, format string, input_header []string, input_comme
 	} else if format == "json" {
 		return json.Unmarshal([]byte(input), output)
 	} else if format == "jsonl" {
-		switch output.(type) {
+
+		//s.Interface()(type)
+		// reflect.TypeOf(s).Elem()
+
+		/*s := reflect.ValueOf(output)
+		if s.Kind() == reflect.Ptr {
+			fmt.Println("s.Interface():", s.Interface())
+			s = reflect.Indirect(s).Elem()
+			if s.Kind() != reflect.Slice {
+				return errors.New("Output is not of kind slice.")
+			}
+		} else if s.Kind() != reflect.Slice {
+			return errors.New("Output is not of kind slice.")
+		}*/
+
+		//fmt.Println("reflect.TypeOf(output)", reflect.TypeOf(output))
+
+		switch output_slice := output.(type) {
 		case *[]map[string]string:
-			output_slice := output.(*[]map[string]string)
+			//output_slice := s.Interface().(*[]map[string]string)
 			scanner := bufio.NewScanner(strings.NewReader(input))
 			scanner.Split(bufio.ScanLines)
 			for scanner.Scan() {
@@ -165,7 +182,7 @@ func Deserialize(input string, format string, input_header []string, input_comme
 				}
 			}
 		case *[]map[string]interface{}:
-			output_slice := output.(*[]map[string]interface{})
+			//output_slice := s.Interface().(*[]map[string]interface{})
 			scanner := bufio.NewScanner(strings.NewReader(input))
 			scanner.Split(bufio.ScanLines)
 			for scanner.Scan() {
@@ -179,8 +196,23 @@ func Deserialize(input string, format string, input_header []string, input_comme
 					*output_slice = append(*output_slice, obj)
 				}
 			}
+		case []map[string]interface{}:
+			//output_slice := s.Interface().([]map[string]interface{})
+			scanner := bufio.NewScanner(strings.NewReader(input))
+			scanner.Split(bufio.ScanLines)
+			for scanner.Scan() {
+				line := strings.TrimSpace(scanner.Text())
+				if len(input_comment) == 0 || !strings.HasPrefix(line, input_comment) {
+					obj := map[string]interface{}{}
+					err := json.Unmarshal([]byte(line), &obj)
+					if err != nil {
+						return errors.Wrap(err, "Error reading object from JSON line")
+					}
+					output_slice = append(output_slice, obj)
+				}
+			}
 		default:
-			return errors.New("Cannot deserialize to type " + fmt.Sprint(reflect.ValueOf(output)))
+			return errors.New("Cannot deserialize to type " + fmt.Sprint(reflect.TypeOf(output).String()))
 		}
 	} else if format == "hcl" {
 		obj, err := hcl.Parse(input)
@@ -202,5 +234,6 @@ func Deserialize(input string, format string, input_header []string, input_comme
 	} else if format == "yaml" {
 		return yaml.Unmarshal([]byte(input), output)
 	}
+
 	return nil
 }

gss/Deserialize.go

@@ -1,26 +1,36 @@
+// =================================================================
+//
+// Copyright (C) 2018 Spatial Current, Inc. - All Rights Reserved
+// Released as open source under the MIT License.  See LICENSE file.
+//
+// =================================================================
+
 package gss
 
 import (
 	"strings"
 	"unicode"
 )
 
-func NewObject(content string, format string) interface{} {
+func NewObject(content string, format string) (interface{}, error) {
+
 	if format == "json" {
 		content = strings.TrimLeftFunc(content, unicode.IsSpace)
 		if len(content) > 0 && content[0] == '[' {
-			return []map[string]interface{}{}
+			return []map[string]interface{}{}, nil
 		}
-		return map[string]interface{}{}
+		return map[string]interface{}{}, nil
 	} else if format == "yaml" {
 		content = strings.TrimLeftFunc(content, unicode.IsSpace)
 		if len(content) > 0 && content[0] == '-' {
-			return []map[string]interface{}{}
+			return []map[string]interface{}{}, nil
 		}
-		return map[string]interface{}{}
+		return map[string]interface{}{}, nil
 	} else if format == "bson" || format == "hcl" || format == "hcl2" || format == "properties" || format == "toml" {
-		return map[string]interface{}{}
+		return map[string]interface{}{}, nil
+	} else if format == "jsonl" || format == "csv" || format == "tsv" {
+		return []map[string]interface{}{}, nil
 	}
 
-	return nil
+	return nil, nil
 }

gss/NewObject.go

@@ -34,6 +34,12 @@ func StringifyMapKeys(in interface{}) interface{} {
 			res[k] = StringifyMapKeys(v)
 		}
 		return res
+	case map[interface{}]struct{}:
+		res := make(map[string]interface{})
+		for k, v := range in {
+			res[fmt.Sprintf("%v", k)] = StringifyMapKeys(v)
+		}
+		return res
 	default:
 		return in
 	}

gss/StringifyMapKeys.go

@@ -0,0 +1,10 @@
+// =================================================================
+//
+// Copyright (C) 2018 Spatial Current, Inc. - All Rights Reserved
+// Released as open source under the MIT License.  See LICENSE file.
+//
+// =================================================================
+
+package gss
+
+var VERSION = "0.0.3"

gss/Version.go

@@ -11,8 +11,8 @@
 package main
 
 import (
-  "C"
-  "strings"
+	"C"
+	"strings"
 )
 
 import (
@@ -27,16 +27,16 @@ func main() {}
 func Convert(input_string *C.char, input_format *C.char, input_header *C.char, input_comment *C.char, output_format *C.char, output_string **C.char) *C.char {
 
 	s, err := gss.Convert(
-    C.GoString(input_string),
-    C.GoString(input_format),
-    strings.Split(C.GoString(input_header), ","),
-    C.GoString(input_comment),
-    C.GoString(output_format))
+		C.GoString(input_string),
+		C.GoString(input_format),
+		strings.Split(C.GoString(input_header), ","),
+		C.GoString(input_comment),
+		C.GoString(output_format))
 	if err != nil {
 		return C.CString(err.Error())
 	}
 
-  *output_string = C.CString(s)
+	*output_string = C.CString(s)
 
-  return nil
+	return nil
 }

plugins/gss/main.go

@@ -1,23 +1,21 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DEST=$(realpath ${1:-$DIR/../bin})
 
-mkdir -p $DIR/../bin
+mkdir -p $DEST
 
 echo "******************"
-echo "Formatting $DIR/gss"
+echo "Formatting $(realpath $DIR/../gss)"
 cd $DIR/../gss
 go fmt
-echo "Formatting $DIR/../cmd/gss"
-cd $DIR/../cmd/gss
-go fmt
 echo "Done formatting."
 echo "******************"
 echo "Building AAR for GSS"
-cd $DIR/../bin
+cd $DEST
 gomobile bind -target android -javapkg=com.spatialcurrent -o gss.aar github.com/spatialcurrent/go-simple-serializer/gss
 if [[ "$?" != 0 ]] ; then
     echo "Error building AAR for Android"
     exit 1
 fi
-echo "Executable built at $(realpath $DIR/../bin)"
+echo "AAR built at $DEST"

scripts/build_android.sh

@@ -1,20 +1,21 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DEST=$(realpath ${1:-$DIR/../bin})
 
-mkdir -p $DIR/../bin
+mkdir -p $DEST
 
 echo "******************"
-echo "Formatting $DIR/gss"
+echo "Formatting $(realpath $DIR/../gss)"
 cd $DIR/../gss
 go fmt
-echo "Formatting $DIR/../cmd/gss"
+echo "Formatting $(realpath $DIR/../cmd/gss)"
 cd $DIR/../cmd/gss
 go fmt
 echo "Done formatting."
 echo "******************"
 echo "Building program gss"
-cd $DIR/../bin
+cd $DEST
 ####################################################
 #echo "Building program for darwin"
 #GOTAGS= CGO_ENABLED=1 GOOS=${GOOS} GOARCH=amd64 go build --tags "darwin" -o "gss_darwin_amd64" github.com/spatialcurrent/go-simple-serializer/cmd/gss
@@ -24,18 +25,18 @@ cd $DIR/../bin
 #fi
 #echo "Executable built at $(realpath $DIR/../bin/gss_darwin_amd64)"
 ####################################################
-echo "Building program for linux"
+echo "Building program for Linux"
 GOTAGS= CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build --tags "linux" -o "gss_linux_amd64" github.com/spatialcurrent/go-simple-serializer/cmd/gss
 if [[ "$?" != 0 ]] ; then
     echo "Error building gss for Linux"
     exit 1
 fi
-echo "Executable built at $(realpath $DIR/../bin/gss_linux_amd64)"
+echo "Executable built at $DEST"
 ####################################################
 echo "Building program for Windows"
 GOTAGS= CGO_ENABLED=1 GOOS=windows GOARCH=amd64 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -o "gss_windows_amd64.exe" github.com/spatialcurrent/go-simple-serializer/cmd/gss
 if [[ "$?" != 0 ]] ; then
     echo "Error building gss for Windows"
     exit 1
 fi
-echo "Executable built at $(realpath $DIR/../bin/gss_windows_amd64.exe)"
+echo "Executable built at $DEST"