gokart 0.0.4 → 0.0.5

data/assets/config/config-debug.json

@@ -0,0 +1,22 @@
+{
+  "templates": "./bin/assets/templates/*.gotmpl",
+  "assets":    "./bin/assets/www-debug",
+
+  "urlAssets": "/assets/",
+  "urlRoot":   "/",
+
+  "static": true,
+  "debug": true,
+
+  "http": {
+    "port": 8080,
+    "address": ""
+  },
+
+  "https": {
+    "port": 8081,
+    "address": "",
+    "key": "",
+    "cert": ""
+  }
+}

data/assets/config/config-release.json

@@ -0,0 +1,22 @@
+{
+  "templates": "./bin/assets/templates/*.gotmpl",
+  "assets":    "./bin/assets/www-min",
+
+  "urlAssets": "/assets/",
+  "urlRoot":   "/",
+
+  "static": true,
+  "debug": false,
+
+  "http": {
+    "port": 8080,
+    "address": ""
+  },
+
+  "https": {
+    "port": 8081,
+    "address": "",
+    "key": "",
+    "cert": ""
+  }
+}

data/assets/config.rb

@@ -6,7 +6,7 @@ Bundler.require
 unless defined? ROOT
   ROOT = Pathname(File.dirname(__FILE__))
 
-  ASSET_BUNDLES = %w( application.css application.js )
+  ASSET_BUNDLES = %w( application.css application.js  )
   GO_APP_NAME =   'server'
   GO_BUILD_PATH = ROOT.join('bin')
 

data/assets/src/server/config/config.go

@@ -0,0 +1,46 @@
+package config
+
+import (
+	"fmt"
+	"github.com/jasondelponte/golib/config"
+	"net"
+	"path"
+)
+
+type Config struct {
+	Http struct {
+		Address string `json:"address"`
+		Port    int    `json:"port"`
+	} `json:"http"`
+
+	Templates string `json:"templates"`
+	Assets    string `json:"assets"`
+
+	URLRoot      string `json:"urlRoot"`
+	URLRelAssets string `json:"urlAssets"`
+
+	Debug bool `json:"debug"`
+
+	URLFullAssetsPath string
+}
+
+func LoadConfig(fileName string) (*Config, error) {
+	loader := config.NewJsonLoader(fileName)
+	c := new(Config)
+
+	if err := loader.Load(c); err != nil {
+		return nil, err
+	}
+
+	c.URLFullAssetsPath = c.buildURLFullAssetsPath()
+
+	return c, nil
+}
+
+func (c Config) GetAddressWithPort() string {
+	return net.JoinHostPort(c.Http.Address, fmt.Sprintf("%d", c.Http.Port))
+}
+
+func (c Config) buildURLFullAssetsPath() string {
+	return path.Join(c.URLRoot, c.URLRelAssets) + "/"
+}

data/assets/src/server/controller/home.go

@@ -0,0 +1,43 @@
+package controller
+
+import (
+	"github.com/jasondelponte/golib/net/conn/httpserver"
+	"log"
+	"net/http"
+	"server/config"
+	"server/view"
+)
+
+type HomeController struct {
+	view         *view.HomeView
+	config       *config.Config
+	HandlerFuncs struct {
+		Welcome httpserver.HandlerFunc
+	}
+}
+
+func NewHomeController(view *view.HomeView, cfg *config.Config) *HomeController {
+	c := &HomeController{
+		view:   view,
+		config: cfg,
+	}
+
+	c.HandlerFuncs.Welcome = c.buildWelcomeHandler()
+
+	return c
+}
+
+func (c HomeController) buildWelcomeHandler() httpserver.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if c.config.Debug {
+			log.Println("HomeController: DEBUG, Request received. Path:", r.URL.Path)
+		}
+		b, err := c.view.RenderWelcome()
+		if err != nil {
+			// TODO error response
+			return
+		}
+
+		w.Write(b)
+	}
+}

data/assets/src/server/controller/static_assets.go

@@ -0,0 +1,57 @@
+package controller
+
+import (
+	"github.com/jasondelponte/golib/net/conn/httpserver"
+	"log"
+	"net/http"
+	"os"
+	"path"
+	"server/config"
+)
+
+type StaticAssetController struct {
+	HandlerFuncs struct {
+		StaticAssets httpserver.HandlerFunc
+	}
+
+	config          *config.Config
+	urlAssetPathLen int
+}
+
+func NewStaticAssetController(cfg *config.Config) *StaticAssetController {
+	c := &StaticAssetController{
+		config:          cfg,
+		urlAssetPathLen: len(cfg.URLFullAssetsPath),
+	}
+
+	c.HandlerFuncs.StaticAssets = c.buildStaticHandler()
+
+	return c
+}
+
+func (c StaticAssetController) buildStaticHandler() httpserver.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if c.config.Debug {
+			log.Println("StaticAssetController: DEBUG, Request received. Path:", r.URL.Path)
+		}
+
+		asset := r.URL.Path[c.urlAssetPathLen:]
+		fullAssetPath := path.Join(c.config.Assets, asset)
+
+		c.serveStaticAsset(fullAssetPath, w, r)
+	}
+}
+
+func (c StaticAssetController) serveStaticAsset(asset string, w http.ResponseWriter, r *http.Request) {
+	file, err := os.Open(asset)
+	if err != nil {
+		httpserver.ErrHttpResourceNotFound.Report(w)
+		return
+	}
+	stat, err := file.Stat()
+	if err != nil {
+		httpserver.ErrHttpInternalError.Report(w)
+		return
+	}
+	http.ServeContent(w, r, asset, stat.ModTime(), file)
+}

data/assets/src/server/main.go

@@ -2,30 +2,72 @@ package main
 
 import (
 	"flag"
+	"github.com/jasondelponte/golib/net/conn/httpserver"
+	"github.com/jasondelponte/golib/text/html/template"
 	"log"
+	"server/config"
+	"server/controller"
+	"server/view"
 )
 
-var addr = flag.String("addr", "", "IP address the server is to run on")
-var port = flag.Uint("port", 0, "Port address to run the server on")
-var rootURLPath = flag.String("root", "", "URL Path root of the webapp")
-var tmplPath = flag.String("tmpl", "assets/templates", "Specifies the directory to use for template assets.")
-var wwwPath = flag.String("www", "assets/www-debug", "Specifies the directory to use for web assest.")
-var debug = flag.Bool("debug", false, "Enable debug mode where extra loging is produce, each request will reload templates, and all assets are served from non-concaticated files.")
-var static = flag.Bool("static", false, "Enables serving up static content from disk")
+var cfgFile = flag.String("config", "", "Configuration JSON file")
 
 func main() {
 	flag.Parse()
 
-	httpHndlr := &HttpHandler{
-		Addr:        *addr,
-		Port:        *port,
-		RootURLPath: *rootURLPath,
-		TmplPath:    *tmplPath,
-		WwwPath:     *wwwPath,
-		Debug:       *debug,
-		ServStatic:  *static,
+	var (
+		cfg    *config.Config
+		server *httpserver.HTTPServer
+		tmpl   *template.Template
+		err    error
+	)
+
+	if cfg, err = config.LoadConfig(*cfgFile); err != nil {
+		log.Fatalln("Failed to load config, ", *cfgFile, ", because", err)
+		return
+	}
+
+	if err = initDatabase(cfg); err != nil {
+		log.Fatalln("Failed to initialize database, because", err)
+		return
+	}
+
+	if tmpl, err = loadTemplates(cfg); err != nil {
+		log.Fatalln("Failed to load HTML templates, because", err)
+		return
+	}
+
+	if server, err = initServer(cfg, tmpl); err != nil {
+		log.Fatalln("Failed to initialize HTTP(s) server configuration, because", err)
+		return
+	}
+
+	server.Run()
+}
+
+func initDatabase(cfg *config.Config) error {
+	return nil
+}
+
+func loadTemplates(cfg *config.Config) (*template.Template, error) {
+	tmpl := new(template.Template)
+
+	if err := tmpl.Load(cfg.Templates); err != nil {
+		return tmpl, err
 	}
 
-	httpHndlr.HandleHttpConnection()
-	log.Println("")
+	return tmpl, nil
+}
+
+func initServer(cfg *config.Config, tmpl *template.Template) (*httpserver.HTTPServer, error) {
+
+	server := httpserver.NewHTTPServer(cfg.GetAddressWithPort(), cfg.Debug)
+
+	home := controller.NewHomeController(view.NewHomeView(tmpl, cfg), cfg)
+	server.AddHandlerFunc(cfg.URLRoot, home.HandlerFuncs.Welcome)
+
+	static := controller.NewStaticAssetController(cfg)
+	server.AddHandlerFunc(cfg.URLFullAssetsPath, static.HandlerFuncs.StaticAssets)
+
+	return server, nil
 }

data/assets/src/server/view/home.go

@@ -0,0 +1,28 @@
+package view
+
+import (
+	"github.com/jasondelponte/golib/text/html/template"
+	"server/config"
+)
+
+type HomeView struct {
+	template *template.Template
+	config   *config.Config
+}
+
+func NewHomeView(tmpl *template.Template, cfg *config.Config) *HomeView {
+	return &HomeView{
+		template: tmpl,
+		config:   cfg,
+	}
+}
+
+func (v *HomeView) RenderWelcome() ([]byte, error) {
+	common := template.CommonProps{
+		Title:   "GoKart",
+		Debug:   v.config.Debug,
+		RootURL: v.config.URLRoot,
+	}
+
+	return v.template.Render("home", common, nil)
+}

data/assets/src/www/app/erb_helpers/erb_helper.rb

@@ -1,10 +1,12 @@
 
 module ErbHelper
   def ErbHelper.asset_link(asset, prefix)
+    src = "{{PathJoin .RootURL \"/assets/\" \"#{asset}\"}}"
     if (prefix == 'js')
-      return "<script type=\"text/javascript\" src=\"{{.RootURL}}/assets/#{asset}\"></script>"
+      return "<script type=\"text/javascript\" src=\"#{src}\"></script>"
+
     elsif (prefix == 'css')
-      return "<link rel=\"stylesheet\" type=\"text/css\" src=\"{{.RootURL}}/assets/#{asset}\">"
+      return "<link rel=\"stylesheet\" type=\"text/css\" src=\"#{src}\">"
     end
   end
 

data/assets/src/www/app/scripts/application.js.coffee

@@ -1,5 +1,10 @@
 #= require utilities/require
-#= require utilities/deferred
-#= require utilities/logger
-#= require utilities/properties
-#= require main
+#= require vendor_wrapper
+#= require underscore
+#= require backbone
+#= require mustache
+#= require_tree ./controllers
+#= require_tree ./models
+#= require_tree ./pages
+#= require_tree ./utilities
+#= require_tree ./views

data/assets/src/www/app/scripts/pages/home.js

@@ -0,0 +1,6 @@
+define('pages/home', [
+    'mustache',
+    'utilities/logger'
+], function HomePageModule(Mustache, Logger) {
+
+});

data/assets/src/www/app/scripts/vendor_wrapper.js

@@ -0,0 +1,11 @@
+define('underscore', [], function UnderscoreModule() {
+   return _;
+});
+
+define('jquery', [], function jQueryModule() {
+    return jQuery;
+});
+
+define('backbone', [], function BackboneModule() {
+    return Backbone;
+});

data/assets/src/www/app/templates/application.gotmpl

@@ -1,2 +1,5 @@
-//= require base
-//= require home
+#= require base
+#= require partials_start
+#= require_tree ./partials
+#= require partials_end
+#= require_tree ./pages

data/assets/src/www/app/templates/base.gotmpl.erb

@@ -6,6 +6,7 @@
 		{{if .Debug}}{{template "base.header.assets.debug" .}}{{else}}{{template "base.header.assets" .}}{{end}}
 	</head>
 	<body>
+  {{template "html_templates"}}
 {{end}}
 
 {{define "base.header.assets"}}
@@ -22,7 +23,6 @@
 	<% end %>
 {{end}}
 
-
 {{define "base.footer"}}
 	</body>
 </html>

data/assets/src/www/app/templates/{home.gotmpl → pages/home.gotmpl}

@@ -1,16 +1,17 @@
 {{define "home.contents"}}
 	<div class="info-block">
 		<h3>Go Kart</h3>
-		<p>Combination of tooks which will make developing webapps using go easier.  The gokart gem by default combines SASS, Coffee Script, Rake, and Sprokets with Go to provide a great development environment.  This environment supports test driven development (TDD) with ruby guard and jasmine.</p>
-		<p>There are no external dependancies other than Go and ruby (which I expect you already have...).  All dependancies are installed via bundler after the project directory is created.</p>
+		<p>Combination of tools which will make developing webapps using go easier.  The gokart gem by default combines SASS, Javascript, Coffee Script, Rake, and Sprokets with Go to provide a great development environment.  This environment supports test driven development (TDD) with ruby guard and jasmine.</p>
+		<p>There are no external dependencies other than Go and ruby (which I expect you already have...).  All dependencies are installed via bundler after the project directory is created.</p>
 	</div>
 	<div class="info-block">
 		<h3>Usage</h3>
 		<p>With ruby (1.9.1 min maybe?) all you need to do is:</p>
 		<p class="code">gem install gokart</p>
-		<p>Once installed to create a new go + sprockets enviornment:</p>
+		<p>Once installed to create a new go + sprockets environment:</p>
 		<p class="code">gokart APP_NAME</p>
-		<p>This will create a folder of APP_NAME, build the environment, and run bundle install to pull in the gem files that are needed for the environment if you don't already have them.  There are also several rake commands you can use to build/run/deploy the environment. Checkout rake --tasks for a list of them.  In general you'll probably only ever need the app:x commands not app:server:x or app:www:x.</p>
+		<p>This utility/framework depends on the github.com/jasondelponte/go-utils to run out of the box, but if you choose it would be simple to remove and place with utilities of your choice.<p>
+		<p>There are several rake commands you can use to build/run/deploy the environment. Checkout rake --tasks for a list of them.  In general you'll probably only ever need the app:x commands not app:server:x or app:www:x.</p>
 	</div>
 	<div class="info-block">
 		<h4>Environment Structure</h4>
@@ -20,18 +21,22 @@
 			<li><strong>bin/server/</strong> - Compiled Go http server.</li>
 			<li><strong>bin/assets/templates/</strong> - Compiled Go HTML templates</li>
 			<li><strong>bin/assets/www-min/</strong> - Compiled and minified CSS/JS/images using sprockets</li>
-			<li><strong>bin/assets/www-debug/</strong> - Compiled, but non-minified/concatonated CSS/JS source, images are here also</li>
+			<li><strong>bin/assets/www-debug/</strong> - Compiled, but non-minified/concatenated CSS/JS source, images are here also</li>
 			<li><strong>lib/</strong> - Where any Go libraries your app depends on will be installed by running 'go get'.  Note: You'll need to set the project into your GOPATH, I haven't figured out a good solution for this yet.</li>
 			<li><strong>spec/javascripts/</strong> - Where all of the compiled JS specs will be written to, and run from. Note: Currently these do not go through sprockets, but only the coffee-script compiler. So no preprocessing is available</li>
-			<li><strong>spec/javascripts/support</strong> - Configuration files for Jasmine. jasmin.yml contains the script specifiing the source files to load, and what order to load them in.</li>
+			<li><strong>spec/javascripts/support</strong> - Configuration files for Jasmine. jasmin.yml contains the script specifying the source files to load, and what order to load them in.</li>
 			<li><strong>src/server/</strong> - All of your Go code will go here following the normal Go 1.0 directory pattern</li>
 			<li><strong>src/www/app/</strong> - All of you Coffee script, sass, and Go Template are found here</li>
 			<li><strong>src/www/spec/</strong> - All coffee script spec files which will be compiled into js and run using jasmine.</li>
 			<li><strong>src/www/vendor/</strong> - js/css/image files for third party tools and libraries</li>
-			<li><strong>tasks/</strong> - Rake tasks to build, run, and test the application.  There are sevearl tasks which you can run do 'rake --tasks' to see a complete list of them. 'rake app:test' to run test units, 'rake app:start' to build and run, use startdebug for a debug build.  Note: when you do 'rake jasmine' or rake 'app:guard' you probably want to start these tasks in different tabs because they run until killed.</li>
+			<li><strong>tasks/</strong> - Rake tasks to build, run, and test the application.  There are several tasks which you can run do 'rake --tasks' to see a complete list of them. 'rake app:test' to run test units, 'rake app:start' to build and run, use startdebug for a debug build.  Note: when you do 'rake jasmine' or rake 'app:guard' you probably want to start these tasks in different tabs because they run until killed.</li>
 		</ul>
 	</div>
 
+    <script type="text/javascript">
+        var HomePage = require('pages/home');
+    </script>
+
 {{end}}
 
 {{define "home"}}

data/assets/src/www/app/templates/partials/test.gotmpl

@@ -0,0 +1,3 @@
+<script id="TestTemplate" type="text/html">
+
+</script>

data/assets/src/www/app/templates/partials/test2.gotmpl

@@ -0,0 +1,5 @@
+<script id="test2Template" type="text/html">
+    <div>
+
+    </div>
+</script>

data/assets/src/www/app/templates/partials_end.gotmpl

@@ -0,0 +1 @@
+{{end}}

data/assets/src/www/app/templates/partials_start.gotmpl

@@ -0,0 +1 @@
+{{define "html_templates"}}

data/assets/src/www/spec/all-spec.js

@@ -1,5 +1,5 @@
 define('spec/all', [
-    'spec/mocks',
+    'spec/helpers/mocks',
     'spec/utilities/test',
     'spec/utilities/deferred',
     'spec/utilities/properties'

data/assets/src/www/spec/helpers/mocks.coffee

@@ -1,4 +1,4 @@
-define 'spec/mocks', [], ->
+define 'spec/helpers/mocks', [], ->
 
   Mocks = {}