Merge branch 'pr/50'

Change-Id: I29c60cc92d841532d0f822e1fc00683a7fd476d2

Author: skriptble

bson/encode.go

@@ -522,6 +522,10 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 		}
 		field = e.underlyingVal(field)
 
+		if omitempty && e.isZero(field) {
+			continue
+		}
+		
 		if inline {
 			switch sf.Type.Kind() {
 			case reflect.Map:
@@ -543,9 +547,6 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 			}
 		}
 
-		if omitempty && e.isZero(field) {
-			continue
-		}
 		elem, err := e.elemFromValue(key, field, minsize)
 		if err != nil {
 			return nil, err

bson/encode_test.go

@@ -816,6 +816,18 @@ func reflectionEncoderTest(t *testing.T) {
 			docToBytes(NewDocument(EC.String("foo", "bar"))),
 			nil,
 		},
+		{
+			"inline, omitempty",
+			struct {
+				A   string
+				Foo zeroTest `bson:"omitempty,inline"`
+			}{
+				A:   "bar",
+				Foo: zeroTest{true},
+			},
+			docToBytes(NewDocument(EC.String("a", "bar"))),
+			nil,
+		},
 		{
 			"struct{}",
 			struct {