Merge branch 'master' of github.com:hailsryan/openrtb

Author: hailsryan

bid.go

@@ -42,6 +42,7 @@ type Bid struct {
 	WRatio         int            `json:"wratio,omitempty"`         // Relative width of the creative when expressing size as a ratio.
 	HRatio         int            `json:"hratio,omitempty"`         // Relative height of the creative when expressing size as a ratio.
 	Exp            int            `json:"exp,omitempty"`            // Advisory as to the number of seconds the bidder is willing to wait between the auction and the actual impression.
+	ContentType    string         `json:"-"`                        // content of the bid
 	Ext            Extension      `json:"ext,omitempty"`
 }
 

impression.go

@@ -17,6 +17,7 @@ var (
 // subordinate to the Imp object indicates the type of impression being offered.
 type Impression struct {
 	ID                string         `json:"id"` // A unique identifier for this impression
+	Metric            []*Metric      `json:"metric,omitempty"`
 	Banner            *Banner        `json:"banner,omitempty"`
 	Video             *Video         `json:"video,omitempty"`
 	Audio             *Audio         `json:"audio,omitempty"`
@@ -31,6 +32,7 @@ type Impression struct {
 	Secure            NumberOrString `json:"secure,omitempty"`            // Flag to indicate whether the impression requires secure HTTPS URL creative assets and markup.
 	Exp               int            `json:"exp,omitempty"`               // Advisory as to the number of seconds that may elapse between the auction and the actual impression.
 	IFrameBuster      []string       `json:"iframebuster,omitempty"`      // Array of names for supportediframe busters.
+	ContentType       string         `json:"-"`                           // Used to attribute bid to a content - not sent in request
 	Ext               Extension      `json:"ext,omitempty"`
 }
 

impression_test.go

@@ -16,6 +16,18 @@ var _ = Describe("Impression", func() {
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&Impression{
 			ID: "1",
+			Metric: []*Metric{
+				{
+					Type:   "viewable_percentage_1",
+					Value:  0.99,
+					Vendor: "MOAT",
+				},
+				{
+					Type:   "viewable_percentage_2",
+					Value:  0.98,
+					Vendor: "MOAT",
+				},
+			},
 			Banner: &Banner{
 				W: 300,
 				H: 250,

metric.go

@@ -0,0 +1,12 @@
+package openrtb
+
+// Metric object is associated with an impression as an array of metrics. These metrics can offer insight into
+// the impression to assist with decisioning such as average recent viewability, click-through rate, etc. Each
+// metric is identified by its type, reports the value of the metric, and optionally identifies the source or
+// vendor measuring the value.
+type Metric struct {
+	Type   string    `json:"type"`
+	Value  float64   `json:"value"`
+	Vendor string    `json:"vendor"`
+	Ext    Extension `json:"ext,omitempty"`
+}

metric_test.go

@@ -0,0 +1,24 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Metric", func() {
+	var metric *Metric
+
+	BeforeEach(func() {
+		err := fixture("metric", &metric)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(metric).To(Equal(&Metric{
+			Type:   "viewable_percentage",
+			Value:  0.99,
+			Vendor: "MOAT",
+		}))
+	})
+
+})

testdata/impression.json

@@ -1,5 +1,17 @@
 {
   "id": "1",
+  "metric": [
+    {
+      "type": "viewable_percentage_1",
+      "value": 0.99,
+      "vendor": "MOAT"
+    },
+    {
+      "type": "viewable_percentage_2",
+      "value": 0.98,
+      "vendor": "MOAT"
+    }
+  ],
   "banner": {
     "h": 250,
     "w": 300,

testdata/metric.json

@@ -0,0 +1,5 @@
+{
+  "type": "viewable_percentage",
+  "value": 0.99,
+  "vendor": "MOAT"
+}