From d1a285fd120d7a2111e259bcf97a4c4b842de441 Mon Sep 17 00:00:00 2001
From: yosssi <yoshida.keiji.84@gmail.com>
Date: Sat, 14 Jun 2014 03:42:50 +0900
Subject: [PATCH] Add the `protobuf` package

---
 session.pb.go => protobuf/session.pb.go |  4 ++--
 session.proto => protobuf/session.proto |  2 +-
 session.go                              | 10 +++++++---
 store.go                                |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)
 rename session.pb.go => protobuf/session.pb.go (93%)
 rename session.proto => protobuf/session.proto (80%)

diff --git a/session.pb.go b/protobuf/session.pb.go
similarity index 93%
rename from session.pb.go
rename to protobuf/session.pb.go
index ce984e3..dfdc55f 100644
--- a/session.pb.go
+++ b/protobuf/session.pb.go
@@ -3,7 +3,7 @@
 // DO NOT EDIT!
 
 /*
-Package boltstore is a generated protocol buffer package.
+Package protobuf is a generated protocol buffer package.
 
 It is generated from these files:
 	session.proto
@@ -11,7 +11,7 @@ It is generated from these files:
 It has these top-level messages:
 	Session
 */
-package boltstore
+package protobuf
 
 import proto "code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
diff --git a/session.proto b/protobuf/session.proto
similarity index 80%
rename from session.proto
rename to protobuf/session.proto
index cba2072..c565435 100644
--- a/session.proto
+++ b/protobuf/session.proto
@@ -1,4 +1,4 @@
-package boltstore;
+package protobuf;
 
 message Session {
 	optional bytes Values = 1;
diff --git a/session.go b/session.go
index d70b3cc..77c9aa7 100644
--- a/session.go
+++ b/session.go
@@ -1,12 +1,16 @@
 package boltstore
 
-import "time"
+import (
+	"time"
+
+	"github.com/yosssi/boltstore/protobuf"
+)
 
 // NewSession creates and returns a session data.
-func NewSession(values []byte, maxAge int) *Session {
+func NewSession(values []byte, maxAge int) *protobuf.Session {
 	var expiresAt int64
 	if maxAge > 0 {
 		expiresAt = time.Now().Unix() + int64(maxAge)
 	}
-	return &Session{Values: values, ExpiresAt: &expiresAt}
+	return &protobuf.Session{Values: values, ExpiresAt: &expiresAt}
 }
diff --git a/store.go b/store.go
index 9b313db..c1d9d80 100644
--- a/store.go
+++ b/store.go
@@ -12,6 +12,7 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
+	"github.com/yosssi/boltstore/protobuf"
 )
 
 // store represents a session store.
@@ -108,7 +109,7 @@ func (s *store) load(session *sessions.Session) (bool, error) {
 		if data == nil {
 			return nil
 		}
-		sessionData := &Session{}
+		sessionData := &protobuf.Session{}
 		// Convert the byte slice to the Session struct value.
 		if err := proto.Unmarshal(data, sessionData); err != nil {
 			return err