Merge pull request #8 from ewgRa/ISSUE-3-group-stdlib-import

group stdlib import (#3)

cmd/gocsfixer/.gocsfixer.yml

@@ -18,3 +18,11 @@ fixers:
        recommend: true
        lint: true
        fix: true
+
+   group_import:
+       recommend: true
+       lint: true
+       fix: true
+       options:
+            stdLib: true
+            lintText: Group stdLib imports

fixers/file_header.go

@@ -1,34 +1,21 @@
 package fixers
 
 import (
-	"errors"
 	"strings"
 )
 
 func init() {
 	AddFixer("file_header", func(options FixerOptions) (CsFixer, error) {
-		headerOption, ok := options["header"]
+		header, err := options.extractRequiredString("header")
 
-		if !ok {
-			return nil, errors.New("Header option is required")
+		if err != nil {
+			return nil, err
 		}
 
-		header, ok := headerOption.(string)
+		lintText, err := options.extractString("lintText", "File header")
 
-		if !ok {
-			return nil, errors.New("Wrong header option")
-		}
-
-		lintText := "File header"
-
-		lintTextOption, ok := options["lintText"]
-
-		if ok {
-			lintText, ok = lintTextOption.(string)
-
-			if !ok {
-				return nil, errors.New("Wrong header option")
-			}
+		if err != nil {
+			return nil, err
 		}
 
 		return &FileHeaderCsFixer{header: header, lintText: lintText}, nil
@@ -41,7 +28,7 @@ type FileHeaderCsFixer struct {
 }
 
 func (l *FileHeaderCsFixer) Lint(content string) (Problems, error) {
-	var problems []*Problem
+	var problems Problems
 
 	if !strings.HasPrefix(content, l.header) {
 		lines := strings.Split(content, "\n")

fixers/file_header_test.go

@@ -14,28 +14,29 @@ func TestFileHeaderFix(t *testing.T) {
 }
 
 func fileHeaderTestTable() []fixerTestCase {
-	cases := []fixerTestCase{
+	return []fixerTestCase{
 		{
-			"\npackage main\n\n" +
-				"func main() {\n\n" +
-				"}",
-			"// Header\n\n" +
-				"package main\n\n" +
-				"func main() {\n\n" +
-				"}",
+			`package main
+
+func main() {
+}`,
+			`// Header
+
+package main
+
+func main() {
+}`,
 			fixers.Problems{
 				&fixers.Problem{Position: &fixers.Position{Line: 1}, Text: "License header required"},
 			},
 		},
 	}
-
-	return cases
 }
 
 func createFileHeaderFixer() *fixers.FileHeaderCsFixer {
 	mapFixer, _ := fixers.CreateFixer(
 		"file_header",
-		fixers.FixerOptions{"header": "// Header\n", "lintText": "License header required"},
+		fixers.FixerOptions{"header": "// Header\n\n", "lintText": "License header required"},
 	)
 
 	return mapFixer.(*fixers.FileHeaderCsFixer)

fixers/fixer.go

@@ -1,8 +1,54 @@
 package fixers
 
-import "fmt"
+import (
+	"errors"
+	"fmt"
+)
 
 type FixerOptions map[interface{}]interface{}
+
+func (o FixerOptions) extractRequiredString(name string) (string, error) {
+	_, ok := o[name]
+
+	if !ok {
+		return "", errors.New(name + " option is required")
+	}
+
+	return o.extractString(name, "")
+}
+
+func (o FixerOptions) extractString(name string, defaultValue string) (string, error) {
+	v, ok := o[name]
+
+	if !ok {
+		return defaultValue, nil
+	}
+
+	value, ok := v.(string)
+
+	if !ok {
+		return "", errors.New("Wrong " + name + " option")
+	}
+
+	return value, nil
+}
+
+func (o FixerOptions) extractBool(name string, defaultValue bool) (bool, error) {
+	v, ok := o[name]
+
+	if !ok {
+		return defaultValue, nil
+	}
+
+	value, ok := v.(bool)
+
+	if !ok {
+		return false, errors.New("Wrong " + name + " option")
+	}
+
+	return value, nil
+}
+
 type FixerCreateFunc func(options FixerOptions) (CsFixer, error)
 
 var FixersMap map[string]FixerCreateFunc