Merge pull request #1 from Dal-Papa/master

Cluster params & Context name

README.md

@@ -10,7 +10,7 @@ Depends on [Gorilla Context Package](http://www.gorillatoolkit.org/pkg/context)
 
 ### Usage
 
-```
+~~~ go
 import(
 
 "github.com/mikebthun/negronicql"
@@ -19,11 +19,6 @@ import(
 
 )
 
-```
-
-
-```
- 
  router := mux.NewRouter()
 
  router.HandleFunc("/", MyHandler ).Methods("POST")
@@ -49,20 +44,40 @@ func MyHandler(w http.ResponseWriter, req *http.Request) {
 
      //grab the session here
 
-     session = context.Get( req, "Session" ).(*gocql.Session)
+     session = context.Get( req, "CQLSession" ).(*gocql.Session)
 
 
 
 }
-```
+~~~
 
 Run your queries like normal on the gocql session:
 
-```
+~~~ go
 
 session.Query( `SELECT * FROM blah` ).Exec()
 
-```
+~~~
+
+If you want to customize your ClusterConfig object, you can instantiate one, give it its attributes and Connect().
+
+~~~ go
+  cqldb := negronicql.New()
+  cqldb.Cluster = gocql.NewCluster("127.0.0.1", "127.0.0.2")
+  cqldb.Cluster.Authenticator = gocql.PasswordAuthenticator{"user", "password"}
+  cqldb.Cluster.Port = 4242
+  cqldb.Cluster.Keyspace = "MyKeySpace"
+  cqldb.Cluster.Consistency = gocql.Quorum
+  // ...
+  cqldb.Connect()
+
+~~~
+
+### Contributors
+
+Author : Mike B Thun @mikebthun
+
+Contrib : Clem DalPalu @Dal-Papa
 
 ### License 
 

negronicql.go

@@ -29,8 +29,12 @@ func (m *Negronicql) Connect() error {
 
 	}
 
-	//create cluster config
-	m.Cluster = gocql.NewCluster(m.Ips[0])
+	//create cluster config if not created by user
+	if m.Cluster == nil {
+		m.Cluster = gocql.NewCluster(m.Ips...)
+		m.Cluster.Keyspace = m.Keyspace
+		m.Cluster.Consistency = m.Consistency
+	}
 
 	session, err := m.Cluster.CreateSession()
 
@@ -50,7 +54,7 @@ func (m *Negronicql) Connect() error {
 func (m *Negronicql) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 
 	//attach the session
-	context.Set(r, "Session", m.Session)
+	context.Set(r, "CQLSession", m.Session)
 
 	// Call the next middleware handler
 	next(rw, r)