Draft of v2

Author: dim

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{json,rb,md,yml,yaml,feature}]
+indent_style = space
+indent_size = 2

.travis.yml

@@ -4,4 +4,4 @@ go:
   - 1.2
   - 1.3
   - 1.4
-
+  - 1.5

README.md

@@ -1,4 +1,4 @@
-# Go OpenRTB 2.3
+# Go OpenRTB v2.x
 
 [![Build Status](https://travis-ci.org/bsm/openrtb.svg?branch=master)](https://travis-ci.org/bsm/openrtb)
 
@@ -8,39 +8,40 @@ OpenRTB implementation for Go
 
 To install, use `go get`:
 
-    go get github.com/bsm/openrtb
-
-To update, use `go get -u`:
-
-    go get -u github.com/bsm/openrtb
+```shell
+go get github.com/bsm/openrtb
+```
 
 Import the package:
 
-    package main
+```go
+package main
 
-    import (
-      "github.com/bsm/openrtb"
-    )
+import (
+  "log"
+  "github.com/bsm/openrtb"
+)
 
-## Example
+func main() {
+  file, err := os.Open("stored.json")
+  if err != nil {
+    log.Fatal(err)
+  }
+  defer file.Close()
 
-    // Handle a HTTP request
-    http.HandleFunc("/bid", func(w http.ResponseWriter, r *http.Request) {
-      defer r.Body().Close()
+  var req *openrtb.BidRequest
+  err = json.NewDecoder(file).Decode(&req)
+  if err != nil {
+    log.Fatal(err)
+  }
 
-      req, err := openrtb.ParseRequest(r.Body(), true)
-      if err != nil {
-        log.Println("ERROR %s", err.Error())
-      } else {
-        log.Println("INFO  Received bid request %s", *req.Id)
-      }
-
-      w.WriteHeader(204) // respond with 'no bid'
-    })
+  log.Printf("%+v\n", req)
+}
+```
 
 ## Licence
 
-    Copyright (c) 2014 Black Square Media Ltd. All rights reserved.
+    Copyright (c) 2015 Black Square Media Ltd. All rights reserved.
     (The MIT License)
 
     Permission is hereby granted, free of charge, to any person obtaining
@@ -61,3 +62,6 @@ Import the package:
     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Some test examples were taken from:
+    https://code.google.com/p/openrtb/wiki/OpenRTB_Examples

app.go

@@ -1,54 +1,27 @@
 package openrtb
 
+import "encoding/json"
+
 // The "banner" object must be included directly in the impression object if the impression offered
 // for auction is display or rich media, or it may be optionally embedded in the video object to
 // describe the companion banners available for the linear or non-linear video ad.  The banner
 // object may include a unique identifier; this can be useful if these IDs can be leveraged in the
 // VAST response to dictate placement of the companion creatives when multiple companion ad
 // opportunities of the same size are available on a page.
 type Banner struct {
-	W        *int       `json:"w,omitempty"`        // Width
-	H        *int       `json:"h,omitempty"`        // Height
-	Wmax     *int       `json:"wmax,omitempty"`     // Width maximum
-	Hmax     *int       `json:"hmax,omitempty"`     // Height maximum
-	Wmin     *int       `json:"wmin,omitempty"`     // Width minimum
-	Hmin     *int       `json:"hmin,omitempty"`     // Height minimum
-	Id       *string    `json:"id,omitempty"`       // A unique identifier
-	Pos      *int       `json:"pos,omitempty"`      // Ad Position
-	Btype    []int      `json:"btype,omitempty"`    // Blocked creative types
-	Battr    []int      `json:"battr,omitempty"`    // Blocked creative attributes
-	Mimes    []string   `json:"mimes,omitempty"`    // Whitelist of content MIME types supported
-	Topframe *int       `json:"topframe,omitempty"` // Default: 0 ("1": Delivered in top frame, "0": Elsewhere)
-	Expdir   []int      `json:"expdir,omitempty"`   // Specify properties for an expandable ad
-	Api      []int      `json:"api,omitempty"`      // List of supported API frameworks
-	Ext      Extensions `json:"ext,omitempty"`
-}
-
-// Returns topframe status, with default fallback
-func (b *Banner) IsTopFrame() bool {
-	if b.Topframe != nil {
-		return *b.Topframe == 1
-	}
-	return false
-}
-
-// Returns the position, with default fallback
-func (b *Banner) Position() int {
-	if b.Pos != nil {
-		return *b.Pos
-	}
-	return AD_POS_UNKNOWN
-}
-
-// Applies defaults
-func (b *Banner) WithDefaults() *Banner {
-	if b.Topframe == nil {
-		b.Topframe = new(int)
-		*b.Topframe = 0
-	}
-	if b.Pos == nil {
-		b.Pos = new(int)
-		*b.Pos = AD_POS_UNKNOWN
-	}
-	return b
+	W        int             `json:"w,omitempty"`        // Width
+	H        int             `json:"h,omitempty"`        // Height
+	WMax     int             `json:"wmax,omitempty"`     // Width maximum
+	HMax     int             `json:"hmax,omitempty"`     // Height maximum
+	WMin     int             `json:"wmin,omitempty"`     // Width minimum
+	HMin     int             `json:"hmin,omitempty"`     // Height minimum
+	ID       string          `json:"id,omitempty"`       // A unique identifier
+	Pos      int             `json:"pos,omitempty"`      // Ad Position
+	BType    []int           `json:"btype,omitempty"`    // Blocked creative types
+	BAttr    []int           `json:"battr,omitempty"`    // Blocked creative attributes
+	Mimes    []string        `json:"mimes,omitempty"`    // Whitelist of content MIME types supported
+	TopFrame int             `json:"topframe,omitempty"` // Default: 0 ("1": Delivered in top frame, "0": Elsewhere)
+	ExpDir   []int           `json:"expdir,omitempty"`   // Specify properties for an expandable ad
+	Api      []int           `json:"api,omitempty"`      // List of supported API frameworks
+	Ext      json.RawMessage `json:"ext,omitempty"`
 }

app_test.go

@@ -9,17 +9,19 @@ var _ = Describe("Banner", func() {
 	var subject *Banner
 
 	BeforeEach(func() {
-		subject = new(Banner)
+		err := fixture("banner", &subject)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should have accessors", func() {
-		Expect(subject.IsTopFrame()).To(BeFalse())
-		Expect(subject.Position()).To(Equal(0))
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Banner{
+			W:     728,
+			H:     90,
+			Pos:   AdPosAboveFold,
+			BType: []int{4},
+			BAttr: []int{14},
+			Api:   []int{3},
+		}))
 	})
 
-	It("should have defaults", func() {
-		subject.WithDefaults()
-		Expect(*subject.Topframe).To(Equal(0))
-		Expect(*subject.Pos).To(Equal(AD_POS_UNKNOWN))
-	})
 })