go-aah/aah#6 controller namespace, go-aah/aah#11 context

aah/aah.go

@@ -26,10 +26,11 @@ const (
    aah framework -  https://aahframework.org
 –––––––––––––––––––––––––––––––––––––––––––––––
 `
-	isWindows     = (runtime.GOOS == "windows")
-	aahImportPath = "aahframework.org/aah.v0-unstable"
-	permRWXRXRX   = 0755
-	permRWRWRW    = 0666
+	isWindows        = (runtime.GOOS == "windows")
+	aahImportPath    = "aahframework.org/aah.v0-unstable"
+	aahCLIImportPath = "aahframework.org/tools.v0/aah"
+	permRWXRXRX      = 0755
+	permRWRWRW       = 0666
 )
 
 var (

aah/ast.go

@@ -484,10 +484,9 @@ func findMethods(pkg *packageInfo, routeMethods map[string]map[string]uint8, fn
 
 	// processed so set to level 2, used to display unimplemented action details
 	for k, v := range routeMethods {
-		if strings.HasSuffix(k, "."+controllerName) {
+		if strings.HasSuffix(k, controllerName) {
 			if _, found := v[actionName]; found {
 				v[actionName] = 2
-				break
 			}
 		}
 	}

aah/build.go

@@ -68,8 +68,8 @@ func buildApp(buildCfg *config.Config) (string, error) {
 			strings.Join(missingActions, "\n\t"))
 	}
 
-	// get all the types info referred aah framework controller
-	appControllers := prg.FindTypeByEmbeddedType(fmt.Sprintf("%s.Controller", aahImportPath))
+	// get all the types info referred aah framework context embedded
+	appControllers := prg.FindTypeByEmbeddedType(fmt.Sprintf("%s.Context", aahImportPath))
 	appImportPaths := prg.CreateImportPaths(appControllers)
 
 	// prepare aah application version and build date
@@ -216,9 +216,6 @@ import (
 )
 
 var (
-	AppBinaryName = "{{.AppBinaryName}}"
-	AppVersion = "{{.AppVersion}}"
-	AppBuildDate = "{{.AppBuildDate}}"
 	_ = reflect.Invalid
 )
 
@@ -228,11 +225,17 @@ func main() {
 	configPath := flag.String("config", "", "Absolute path of external config file.")
 	flag.Parse()
 
+	aah.SetAppBuildInfo(&aah.BuildInfo{
+		BinaryName: "{{.AppBinaryName}}",
+		Version:    "{{.AppVersion}}",
+		Date:       "{{.AppBuildDate}}",
+	})
+
 	// display application information
 	if *version {
-		fmt.Printf("%-12s: %s\n", "Binary Name", AppBinaryName)
-		fmt.Printf("%-12s: %s\n", "Version", AppVersion)
-		fmt.Printf("%-12s: %s\n", "Build Date", AppBuildDate)
+		fmt.Printf("%-12s: %s\n", "Binary Name", aah.AppBuildInfo().BinaryName)
+		fmt.Printf("%-12s: %s\n", "Version", aah.AppBuildInfo().Version)
+		fmt.Printf("%-12s: %s\n", "Build Date", aah.AppBuildInfo().Date)
 		return
 	}
 
@@ -248,12 +251,6 @@ func main() {
 		aah.MergeAppConfig(externalConfig)
 	}
 
-	aah.SetAppBuildInfo(&aah.BuildInfo{
-		BinaryName: AppBinaryName,
-		Version:    AppVersion,
-		Date:       AppBuildDate,
-	})
-
 	// Adding all the controllers which refers 'aah.Controller' directly
 	// or indirectly from app/controllers/** {{ range $i, $c := .AppControllers }}
 	aah.AddController((*{{index $.AppImportPaths .ImportPath}}.{{.Name}})(nil),

aah/new.go

@@ -80,7 +80,7 @@ func newRun(args []string) {
 }
 
 func createAahApp(appDir, importPath, mode, appName string) error {
-	aahToolsPath, err := build.Import("aahframework.org/tools/aah", "", build.FindOnly)
+	aahToolsPath, err := build.Import(aahCLIImportPath, "", build.FindOnly)
 	if err != nil {
 		log.Fatal(err)
 	}