Merge branch 'master' of github.com:golobby/config

feeder/json.go

@@ -2,7 +2,8 @@ package feeder
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
+	"path/filepath"
 )
 
 // Json is a feeder that feeds using a single json file.
@@ -12,14 +13,15 @@ type Json struct {
 
 // Feed returns all the content.
 func (j Json) Feed() (map[string]interface{}, error) {
-	content, err := ioutil.ReadFile(j.Path)
+	fl, err := os.Open(filepath.Clean(j.Path))
 	if err != nil {
 		return nil, err
 	}
+	defer fl.Close()
 
 	items := map[string]interface{}{}
 
-	if err := json.Unmarshal(content, &items); err != nil {
+	if err := json.NewDecoder(fl).Decode(&items); err != nil {
 		return nil, err
 	}
 

feeder/yaml.go

@@ -1,24 +1,27 @@
 package feeder
 
 import (
+	"os"
+	"path/filepath"
+
 	"gopkg.in/yaml.v2"
-	"io/ioutil"
 )
 
 type Yaml struct {
 	Path string
 }
 
 func (y *Yaml) Feed() (map[string]interface{}, error) {
-	bs, err := ioutil.ReadFile(y.Path)
+	fl, err := os.Open(filepath.Clean(y.Path))
 	if err != nil {
-	    return nil, err
+		return nil, err
 	}
+	defer fl.Close()
+
 	items := make(map[string]interface{})
 
-	err = yaml.Unmarshal(bs, items)
-	if err != nil {
-	    return nil, err
+	if err := yaml.NewDecoder(fl).Decode(&items); err != nil {
+		return nil, err
 	}
 	return items, nil
 }