Feature/view factory

app/app.go

@@ -8,16 +8,15 @@ import (
 	"os"
 	"path/filepath"
 
+	_ "github.com/cznic/ql/driver"
 	"github.com/gernest/qlstore"
-	"github.com/gernest/utron/config"
-	"github.com/gernest/utron/controller"
-	"github.com/gernest/utron/logger"
-	"github.com/gernest/utron/models"
-	"github.com/gernest/utron/router"
-	"github.com/gernest/utron/view"
 	"github.com/gorilla/sessions"
-	// load ql drier
-	_ "github.com/cznic/ql/driver"
+	"github.com/joesteel2010/utron/config"
+	"github.com/joesteel2010/utron/controller"
+	"github.com/joesteel2010/utron/logger"
+	"github.com/joesteel2010/utron/models"
+	"github.com/joesteel2010/utron/router"
+	"github.com/joesteel2010/utron/view"
 )
 
 //StaticServerFunc is a function that returns the static assetsfiles server.
@@ -104,8 +103,7 @@ func (a *App) init() error {
 		return err
 	}
 	a.Config = appConfig
-
-	views, err := view.NewSimpleView(appConfig.ViewsDir)
+	views, err := view.GetView(appConfig.ViewsDir)
 	if err != nil {
 		return err
 	}
@@ -129,7 +127,7 @@ func (a *App) init() error {
 	}
 
 	a.Router.Options = a.options()
-	a.Router.LoadRoutes(a.ConfigPath) // Load a routes file if available.	
+	a.Router.LoadRoutes(a.ConfigPath) // Load a routes file if available.
 	a.isInit = true
 
 	// In case the StaticDir is specified in the Config file, register

app/app_test.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gernest/utron/config"
-	"github.com/gernest/utron/controller"
+	"github.com/joesteel2010/utron/config"
+	"github.com/joesteel2010/utron/controller"
 )
 
 const notFoundMsg = "nothing"

base/context.go

@@ -9,10 +9,10 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/gernest/utron/config"
-	"github.com/gernest/utron/logger"
-	"github.com/gernest/utron/models"
-	"github.com/gernest/utron/view"
+	"github.com/joesteel2010/utron/config"
+	"github.com/joesteel2010/utron/logger"
+	"github.com/joesteel2010/utron/models"
+	"github.com/joesteel2010/utron/view"
 	"github.com/gorilla/context"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"

base/context_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gernest/utron/config"
+	"github.com/joesteel2010/utron/config"
 	"github.com/gorilla/mux"
 )
 

controller/controller.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"reflect"
 
-	"github.com/gernest/utron/base"
+	"github.com/joesteel2010/utron/base"
 )
 
 // Controller is an interface for utron controllers

controller/controller_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gernest/utron/base"
+	"github.com/joesteel2010/utron/base"
 )
 
 func TestBaseController(t *testing.T) {

flash/flash.go

@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"errors"
 
-	"github.com/gernest/utron/base"
+	"github.com/joesteel2010/utron/base"
 )
 
 const (

flash/flash_test.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/gernest/utron/controller"
-	"github.com/gernest/utron/logger"
-	"github.com/gernest/utron/router"
+	"github.com/joesteel2010/utron/controller"
+	"github.com/joesteel2010/utron/logger"
+	"github.com/joesteel2010/utron/router"
 	"github.com/gorilla/sessions"
 )
 

models/models.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gernest/utron/config"
+	"github.com/joesteel2010/utron/config"
 	"github.com/jinzhu/gorm"
 
 	// support mysql, sqlite3 and postgresql

router/middleware.go

@@ -3,7 +3,7 @@ package router
 import (
 	"net/http"
 
-	"github.com/gernest/utron/base"
+	"github.com/joesteel2010/utron/base"
 )
 
 //MiddlewareType is the kind of middleware. Utron support middleware with

router/middleware_test.go

@@ -6,8 +6,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gernest/utron/base"
-	"github.com/gernest/utron/controller"
+	"github.com/joesteel2010/utron/base"
+	"github.com/joesteel2010/utron/controller"
 	"github.com/gorilla/context"
 )
 

router/routes.go

@@ -13,15 +13,15 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/gernest/ita"
-	"github.com/gernest/utron/base"
-	"github.com/gernest/utron/config"
-	"github.com/gernest/utron/controller"
-	"github.com/gernest/utron/logger"
-	"github.com/gernest/utron/models"
-	"github.com/gernest/utron/view"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"
 	"github.com/hashicorp/hcl"
+	"github.com/joesteel2010/utron/base"
+	"github.com/joesteel2010/utron/config"
+	"github.com/joesteel2010/utron/controller"
+	"github.com/joesteel2010/utron/logger"
+	"github.com/joesteel2010/utron/models"
+	"github.com/joesteel2010/utron/view"
 	"github.com/justinas/alice"
 	"gopkg.in/yaml.v2"
 )

router/routes_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gernest/utron/controller"
+	"github.com/joesteel2010/utron/controller"
 )
 
 var msg = "gernest"

utron.go

@@ -1,6 +1,6 @@
 package utron
 
-import "github.com/gernest/utron/app"
+import "utron/app"
 
 // NewApp creates a new bare-bone utron application. To use the MVC components, you should call
 // the Init method before serving requests.

view/view.go

@@ -10,17 +10,32 @@ import (
 	"strings"
 )
 
+var viewFactory ViewFactoryFunc = func(viewDir string) (View, error) {
+	return NewSimpleView(viewDir)
+}
+
 // View is an interface for rendering templates.
 type View interface {
 	Render(out io.Writer, name string, data interface{}) error
 }
 
+// Type to allow is to override the default view implementation
+type ViewFactoryFunc func(viewDir string) (View, error)
+
 // SimpleView implements View interface, but based on golang templates.
 type SimpleView struct {
 	viewDir string
 	tmpl    *template.Template
 }
 
+func SetViewFactory(viewFactoryImpl ViewFactoryFunc) {
+	viewFactory = viewFactoryImpl
+}
+
+func GetView(viewDir string) (View, error) {
+	return viewFactory(viewDir)
+}
+
 //NewSimpleView returns a SimpleView with templates loaded from viewDir
 func NewSimpleView(viewDir string) (View, error) {
 	info, err := os.Stat(viewDir)
@@ -43,7 +58,6 @@ func NewSimpleView(viewDir string) (View, error) {
 // should be relative to the dir. That is, if  dir is foo, you don't have to refer to
 // foo/bar.tpl, instead just use bar.tpl
 func (s *SimpleView) load(dir string) (View, error) {
-
 	// supported is the list of file extensions that will be parsed as templates
 	supported := map[string]bool{".tpl": true, ".html": true, ".tmpl": true}
 
@@ -80,7 +94,7 @@ func (s *SimpleView) load(dir string) (View, error) {
 		name = strings.TrimSuffix(name, extension) // remove extension
 
 		t := s.tmpl.New(name)
-		
+
 		if _, err = t.Parse(string(data)); err != nil {
 			return err
 		}