From f3482afcd0014f4cffebd06581212c98f4ca37de Mon Sep 17 00:00:00 2001 From: oliveagle Date: Thu, 14 May 2015 17:40:59 +0800 Subject: [PATCH] replace bytes.Buffer with io.Reader --- viper.go | 13 ++++++++++--- viper_test.go | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/viper.go b/viper.go index 351e30c..946f9c1 100644 --- a/viper.go +++ b/viper.go @@ -716,13 +716,20 @@ func (v *Viper) ReadInConfig() error { return nil } -func ReadBufConfig(buf *bytes.Buffer) error { return v.ReadBufConfig(buf) } -func (v *Viper) ReadBufConfig(buf *bytes.Buffer) error { +func ReadConfig(in io.Reader) error { return v.ReadConfig(in) } +func (v *Viper) ReadConfig(in io.Reader) error { v.config = make(map[string]interface{}) - v.marshalReader(buf, v.config) + v.marshalReader(in, v.config) return nil } +// func ReadBufConfig(buf *bytes.Buffer) error { return v.ReadBufConfig(buf) } +// func (v *Viper) ReadBufConfig(buf *bytes.Buffer) error { +// v.config = make(map[string]interface{}) +// v.marshalReader(buf, v.config) +// return nil +// } + // Attempts to get configuration from a remote source // and read it in the remote configuration registry. func ReadRemoteConfig() error { return v.ReadRemoteConfig() } diff --git a/viper_test.go b/viper_test.go index 85e571c..7ad0245 100644 --- a/viper_test.go +++ b/viper_test.go @@ -541,7 +541,7 @@ func TestFindsNestedKeys(t *testing.T) { func TestReadBufConfig(t *testing.T) { v := New() v.SetConfigType("yaml") - v.ReadBufConfig(bytes.NewBuffer(yamlExample)) + v.ReadConfig(bytes.NewBuffer(yamlExample)) t.Log(v.AllKeys()) assert.True(t, v.InConfig("name"))