Merge pull request #2 from HamiTrip/develop

Code cleaning and lint acceptable...

Author: sabloger

builder.go

@@ -1,20 +1,26 @@
 package json2schema
 
+/*
+TypeNeededSchema is one of builder methods
+ */
 type TypeNeededSchema interface {
-	Type(string) NameNeededSchema
+	Type(string) nameNeededSchema
 }
 
-type NameNeededSchema interface {
+type nameNeededSchema interface {
 	Name(string) SchemaFactory
 }
 
+/*
+Kind will run builder and set kind
+ */
 func Kind(kind string) TypeNeededSchema {
 	var schemaFactory = new(schemaFactory)
 	schemaFactory.Kind = kind
 	return schemaFactory
 }
 
-func (schemaFactory *schemaFactory) Type(t string) NameNeededSchema {
+func (schemaFactory *schemaFactory) Type(t string) nameNeededSchema {
 	schemaFactory.schema.Type = t
 	return schemaFactory
 }

consts.go

@@ -1,5 +1,8 @@
 package json2schema
 
+/*
+Json to schema constants
+ */
 const (
 	TypeArray       = "array"
 	TypeObject      = "object"

factory.go

@@ -6,6 +6,9 @@ import (
 	"fmt"
 )
 
+/*
+SchemaFactory is factory
+ */
 type SchemaFactory interface {
 	Make() Schema
 }
@@ -43,7 +46,7 @@ func (schemaFactory *schemaFactory) Make() Schema {
 		rSchema.FieldByName("Kind").Set(reflect.ValueOf(schemaFactory.Kind))
 		rSchema.FieldByName("Type").Set(reflect.ValueOf(schemaFactory.schema.Type))
 		rSchema.FieldByName("Name").Set(reflect.ValueOf(schemaFactory.schema.Name))
-		rSchema.FieldByName("Validations").Set(reflect.ValueOf([]string{}))//"required"
+		rSchema.FieldByName("Validations").Set(reflect.ValueOf([]string{"required"}))//"required"
 
 		var enTitle = strings.Replace(schemaFactory.schema.Name, "_" , " " , -1)
 		enTitle = strings.Title(enTitle)

j2s.go

@@ -3,7 +3,9 @@ package json2schema
 //TODO:: Make it interactive!! Ask Titles and validations per each field!!!
 // ->Of course it only can used in cmd mode in this case!!
 
-
+/*
+MakeSchema is base starter method
+ */
 func MakeSchema(jsonData interface{}) Schema {
 	//panic(fmt.Sprintf("Excepted types was 'map[string]interface{}' and '[]interface{}' got: %T", jsonData))
 	var root = hub(VarRoot, jsonData)

schema.go

@@ -4,31 +4,37 @@ import (
 	"encoding/json"
 )
 
+/*
+Schema interface
+ */
 type Schema interface {
 	ToMap() map[string]interface{}
 }
 
 type schema struct {
-	Attributes basicAttributes `json:"attributes"`
+	Attributes  basicAttributes `json:"attributes"`
 	Validations `json:"validations"`
-	Kind       string `json:"kind"`
-	Name       string `json:"name"`
-	Type       string `json:"type"`
+	Kind        string `json:"kind"`
+	Name        string `json:"name"`
+	Type        string `json:"type"`
 }
 
 type basicAttributes struct {
-	Title       struct {
-			    language
-		    } `json:"title"`
+	Title struct {
+		language
+	} `json:"title"`
 	Placeholder struct {
-			    language
-		    } `json:"placeholder"`
+		language
+	} `json:"placeholder"`
 }
 
 type language struct {
 	En string `json:"en"`
 }
 
+/*
+Validations is list of validator conditions
+ */
 type Validations []string
 
 func (schema schema) ToMap() map[string]interface{} {

types.go

@@ -8,6 +8,9 @@ type field struct {
 	schema
 }
 
+/*
+ArrayGroupSchema is interface of array group schemas
+ */
 type ArrayGroupSchema interface {
 	SetChildrenSchema(Schema) ArrayGroupSchema
 }
@@ -22,6 +25,9 @@ func (arrayGroupSchema arrayGroupSchema) SetChildrenSchema(schema Schema) ArrayG
 	return arrayGroupSchema
 }
 
+/*
+ObjectGroupSchema is interface of object group schemas
+ */
 type ObjectGroupSchema interface {
 	AppendChild(...Schema) ObjectGroupSchema
 }