Merge pull request #17 from colegion/new_controller_conf

Updated definition of Init magic function
goaltools · Oct 16, 2015 · 7fbad28 · 7fbad28
2 parents 5863795 + 85b65ad
commit 7fbad28
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 422 deletions.
diff --git a/config/config.go b/config/config.go
diff --git a/config/config_test.go b/config/config_test.go
diff --git a/config/testdata/base.ini b/config/testdata/base.ini
diff --git a/config/testdata/incorrect.ini b/config/testdata/incorrect.ini
diff --git a/config/testdata/loop.ini b/config/testdata/loop.ini
diff --git a/config/testdata/loop2.ini b/config/testdata/loop2.ini
diff --git a/config/testdata/test.ini b/config/testdata/test.ini
diff --git a/internal/skeleton/assets/handlers/app.go b/internal/skeleton/assets/handlers/app.go
@@ -7,7 +7,6 @@ import (
 
 	contr "github.com/colegion/goal/internal/skeleton/controllers"
 
-	"github.com/colegion/goal/config"
 	"github.com/colegion/goal/strconv"
 )
 
@@ -145,7 +144,14 @@ func (t tApp) PostGreet(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func initApp(g config.Getter) {
+// Init is used to initialize controllers of "github.com/colegion/goal/internal/skeleton/controllers"
+// and its parents.
+func Init() {
+	initApp()
+	initControllers()
+}
+
+func initApp() {
 }
 
 func init() {

diff --git a/internal/skeleton/assets/handlers/controllers.go b/internal/skeleton/assets/handlers/controllers.go
@@ -10,7 +10,6 @@ import (
 	c2 "github.com/colegion/goal/internal/skeleton/assets/handlers/github.com/colegion/contrib/controllers/sessions"
 	contr "github.com/colegion/goal/internal/skeleton/controllers"
 
-	"github.com/colegion/goal/config"
 	"github.com/colegion/goal/strconv"
 )
 
@@ -104,17 +103,10 @@ func (t tControllers) Finally(c *contr.Controllers, w http.ResponseWriter, r *ht
 	return
 }
 
-// Init is used to initialize controllers of "github.com/colegion/goal/internal/skeleton/controllers"
-// and its parents.
-func Init(g config.Getter) {
-	initApp(g)
-	initControllers(g)
-}
-
-func initControllers(g config.Getter) {
-	c0.Init(g)
-	c1.Init(g)
-	c2.Init(g)
+func initControllers() {
+	c0.Init()
+	c1.Init()
+	c2.Init()
 }
 
 func init() {