fixed tags

Author: mediabakery

README.md

@@ -8,12 +8,22 @@ There are two way you can use ratlog.
 
 ```golang
 var b bytes.Buffer
-ratlog := Ratlog{writer: &b}
-ratlog.Log(Props{message: test.Data.Message, tags: test.Data.Tags, fields: fields})
+rlog := ratlog.New(&b)
+rlog.Log(Props{message: test.Data.Message, tags: test.Data.Tags, fields: fields})
 ```
 
 ```golang
 var b bytes.Buffer
-ratlog := Ratlog{writer: &b}
-ratlog.Message("Hello World").Fields("a": "1", "b": "2").Tag("debug", "error").Log()
+rlog := ratlog.New(&b)
+rlog.Message("Hello World").Fields("a": "1", "b": "2").Tag("debug", "error").Log()
+```
+
+You can provide a log instance with an additional tag
+
+```golang
+var b bytes.Buffer
+rlog := ratlog.New(&b)
+errorLog := rlog.Tag("error")
+errorLog.Message("Hello World").Fields("a": "2", "b": "3").Tag("bla", "baz").Log()
+// [error|debug|bla|baz] Hello World | a: 2 | b: 3
 ```

ratlog.go

@@ -17,9 +17,14 @@ type Ratlog struct {
 // https://github.com/ratlog/ratlog-spec#fields
 type Fields map[string]string
 
+// New returns a new instance of Ratlog without any tags
+func New(writer io.Writer) Ratlog {
+	return Ratlog{writer: writer, tags: []string{}}
+}
+
 // Tag returns a new Ratlog instance with appended tags
 // https://github.com/ratlog/ratlog-spec#tags
-func (log Ratlog) Tag(tags []string) Ratlog {
+func (log Ratlog) Tag(tags ...string) Ratlog {
 	return Ratlog{writer: log.writer, tags: append(log.tags, tags...)}
 }
 
@@ -96,15 +101,11 @@ type Props struct {
 
 // Log writes a log to the writer
 func (log *Ratlog) Log(properties Props) error {
-	_, err := log.writer.Write([]byte(getLogMessage(properties.message, properties.fields, properties.tags)))
+	content := getLogMessage(properties.message, properties.fields, append(log.tags, properties.tags...))
+	_, err := log.writer.Write([]byte(content))
 	return err
 }
 
-// New returns a new instance of Ratlog without any tags
-func New(writer io.Writer) Ratlog {
-	return Ratlog{writer: writer, tags: []string{}}
-}
-
 // LogItem represents a log.
 type LogItem struct {
 	props Props

ratlog_test.go

@@ -64,7 +64,7 @@ func runTestsuite(t *testing.T, tests []Test, name string) {
 			fields = getStringMap(test.Data.Fields.(map[string]interface{}))
 		}
 		var b bytes.Buffer
-		ratlog := Ratlog{writer: &b}
+		ratlog := New(&b)
 		ratlog.Log(Props{message: test.Data.Message, tags: test.Data.Tags, fields: fields})
 		if test.Log != b.String() {
 			t.Errorf("%s test # %d failed\nExpected: %#v\nReceived: %#v\n\n", name, index+1, test.Log, b.String())
@@ -82,9 +82,24 @@ func TestSuite(t *testing.T) {
 	runTestsuite(t, testsuite.Parsing, "Parsing")
 }
 
+func TestTag(t *testing.T) {
+	var b bytes.Buffer
+	ratlog := New(&b)
+	errorLag := ratlog.Tag("error", "debug")
+	err := errorLag.Message("Hello World").Tag("bla", "baz").Fields("a", "2", "b", "3").Log()
+
+	if err != nil {
+		t.Error(err)
+	}
+	expected := "[error|debug|bla|baz] Hello World | a: 2 | b: 3\n"
+	if b.String() != expected {
+		t.Errorf("failed\nExpected: %#v\nReceived: %#v\n\n", expected, b.String())
+	}
+}
+
 func TestBuilder(t *testing.T) {
 	var b bytes.Buffer
-	ratlog := Ratlog{writer: &b}
+	ratlog := New(&b)
 	err := ratlog.Message("Hello World").Tag("bla", "baz").Fields("a", "2", "b", "3").Log()
 
 	if err != nil {