Expose vars pkg and some interfaces

Author: jmartin82

.gitignore

@@ -6,3 +6,5 @@ data/*
 coverage.txt
 .github
 dist
+.vscode
+.idea

README.md

@@ -244,7 +244,7 @@ You can extract information from the request body too, using a dot notation path
  - request.body."*key*" (support for `application/json`, `application/xml` and `application/x-www-form-urlencoded` requests)
  - request.body."*deep*"."*key*" (support for `application/json`, `application/xml` requests)
 
-Quick overview of the path syntax available to extract values form the request: [https://github.com/tidwall/gjson#path-syntax] (https://github.com/tidwall/gjson#path-syntax)
+Quick overview of the path syntax available to extract values form the request: [https://github.com/tidwall/gjson#path-syntax](https://github.com/tidwall/gjson#path-syntax)
 
 **External streams:** Perfect for embedding big payloads or getting data from another service.
 

cmd/mmock/main.go

@@ -10,16 +10,17 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jmartin82/mmock/internal/config"
-	"github.com/jmartin82/mmock/internal/config/parser"
 	"github.com/jmartin82/mmock/internal/console"
+	"github.com/jmartin82/mmock/internal/fs"
+	"github.com/jmartin82/mmock/internal/fs/parser"
 	"github.com/jmartin82/mmock/internal/server"
 	"github.com/jmartin82/mmock/internal/statistics"
-	"github.com/jmartin82/mmock/internal/vars"
-	"github.com/jmartin82/mmock/internal/vars/fake"
+	"github.com/jmartin82/mmock/pkg/config"
 	"github.com/jmartin82/mmock/pkg/match"
 	"github.com/jmartin82/mmock/pkg/match/payload"
 	"github.com/jmartin82/mmock/pkg/mock"
+	"github.com/jmartin82/mmock/pkg/vars"
+	"github.com/jmartin82/mmock/pkg/vars/fake"
 )
 
 //VERSION of the application
@@ -95,16 +96,16 @@ func getMapping(path string) config.Mapping {
 		log.Fatalln(ErrNotFoundPath.Error())
 	}
 
-	fsMapper := config.NewFileSystemMapper()
+	fsMapper := fs.NewFileSystemMapper()
 	fsMapper.AddParser(parser.JSONReader{})
 	fsMapper.AddParser(parser.YAMLReader{})
 
 	fsUpdate := make(chan struct{})
 
-	watcher := config.NewFileWatcher(path, fsUpdate)
+	watcher := fs.NewFileWatcher(path, fsUpdate)
 	watcher.Bind()
 
-	return config.NewConfigMapping(path, fsMapper, fsUpdate)
+	return fs.NewConfigMapping(path, fsMapper, fsUpdate)
 }
 
 func getRouter(mapping config.Mapping, checker match.Matcher) *server.Router {

internal/console/dispatcher.go

@@ -3,7 +3,6 @@ package console
 import (
 	"errors"
 	"fmt"
-	"github.com/jmartin82/mmock/internal/config"
 	"log"
 	"net/http"
 	"regexp"
@@ -12,9 +11,11 @@ import (
 	"strings"
 
 	assetfs "github.com/elazarl/go-bindata-assetfs"
-	"github.com/jmartin82/mmock/pkg/mock"
+	"github.com/jmartin82/mmock/pkg/config"
 	"github.com/jmartin82/mmock/pkg/match"
-		"github.com/jmartin82/mmock/internal/statistics"
+	"github.com/jmartin82/mmock/pkg/mock"
+
+	"github.com/jmartin82/mmock/internal/statistics"
 	"github.com/labstack/echo"
 	"golang.org/x/net/websocket"
 )

internal/config/filesystem.go renamed to internal/fs/filesystem.go

@@ -1,4 +1,4 @@
-package config
+package fs
 
 import (
 	"encoding/json"

internal/config/filesystem_test.go renamed to internal/fs/filesystem_test.go

@@ -1,4 +1,4 @@
-package config
+package fs
 
 import (
 	"errors"

internal/config/mapping.go renamed to internal/fs/mapping.go

@@ -1,4 +1,4 @@
-package config
+package fs
 
 import (
 	"errors"
@@ -15,13 +15,6 @@ import (
 var ErrFilePathIsNotUnderConfigPath = errors.New("File path is not under config path")
 var ErrMockDoesntExist = errors.New("Definition doesn't exist")
 
-type Mapping interface {
-	Set(URI string, mock mock.Definition) error
-	Delete(URI string) error
-	Get(URI string) (mock.Definition, bool)
-	List() []mock.Definition
-}
-
 //PrioritySort mock array sorted by priority
 type PrioritySort []mock.Definition
 

internal/config/mapping_test.go renamed to internal/fs/mapping_test.go

@@ -1,4 +1,4 @@
-package config
+package fs
 
 import (
 	"github.com/jmartin82/mmock/pkg/mock"

internal/config/parser/json_reader.go renamed to internal/fs/parser/json_reader.go

@@ -1,4 +1,4 @@
-package config
+package fs
 
 import (
 	"log"

internal/config/parser/json_reader_test.go renamed to internal/fs/parser/json_reader_test.go

@@ -1,4 +1,4 @@
-package config
+package fs
 
 import (
 	"io/ioutil"

internal/config/parser/yaml_reader.go renamed to internal/fs/parser/yaml_reader.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/jmartin82/mmock/internal/statistics"
-	"github.com/jmartin82/mmock/internal/vars"
+	"github.com/jmartin82/mmock/pkg/vars"
 	"github.com/jmartin82/mmock/pkg/mock"
 )
 

internal/config/parser/yaml_reader_test.go renamed to internal/fs/parser/yaml_reader_test.go

@@ -3,10 +3,13 @@ package server
 import (
 	"bytes"
 	"encoding/gob"
-	"github.com/jmartin82/mmock/internal/config"
-	"github.com/jmartin82/mmock/pkg/mock"
+
+	"github.com/jmartin82/mmock/pkg/config"
+
 	"log"
 
+	"github.com/jmartin82/mmock/pkg/mock"
+
 	"github.com/jmartin82/mmock/pkg/match"
 )
 

internal/config/watcher.go renamed to internal/fs/watcher.go

@@ -0,0 +1,10 @@
+package config
+
+import "github.com/jmartin82/mmock/pkg/mock"
+
+type Mapping interface {
+	Set(URI string, mock mock.Definition) error
+	Delete(URI string) error
+	Get(URI string) (mock.Definition, bool)
+	List() []mock.Definition
+}

internal/config/watcher_test.go renamed to internal/fs/watcher_test.go

@@ -2,7 +2,7 @@ package vars
 
 import (
 	"errors"
-	"github.com/jmartin82/mmock/internal/vars/fake"
+	"github.com/jmartin82/mmock/pkg/vars/fake"
 	"log"
 	"reflect"
 	"regexp"

internal/server/dispatcher.go

@@ -1,7 +1,7 @@
 package vars
 
 import (
-	"github.com/jmartin82/mmock/internal/vars/fake"
+	"github.com/jmartin82/mmock/pkg/vars/fake"
 	"github.com/jmartin82/mmock/pkg/mock"
 )