Merge branch 'master' of git://github.com/hoisie/web.go

hoisie · hoisie · commit e0de8debcfc5 · 2010-01-03T20:07:04.000Z
diff --git a/Readme.md b/Readme.md
@@ -6,75 +6,46 @@ web.go is the simplest way to write web applications in the Go programming langu
 
 web.go should be familiar to people who've developed websites with higher-level web frameworks like sinatra, pylons, or web.py. It is designed to be a lightweight web framework that doesn't impose any scaffolding on the user. Some features include:
 
-* routing to url handlers based on regular expressions
-* helper methods for rendering templates
-* web applications are compiled to native code, which means very fast page render times (order-of-magnitude improvement over python or ruby frameworks)
-
-To use web.go, simply install it and import the "web" package. You then need to map url routes to function handlers using web.Get, web.Post, etc.. Finally, you need to call web.Run with the address of the host. (see the example below)
+* Routing to url handlers based on regular expressions
+* User sessions
+* Support for fastcgi and scgi
+* Web applications are compiled to native code. This means very fast execution and page render speed ( benchmarks coming soon :)
 
 ## Installation
 
-1. Make sure you have the latest Go sources (hg sync in the go tree), and your environment is set up correctly: $GOROOT, $GOARCH, $GOBIN, etc.
-2. Checkout the code
+1. Make sure you have the a working Go environment. See the [install instructions](http://golang.org/doc/install.html)
+2. git clone git://github.com/hoisie/web.go.git
 3. cd web.go && make install
 
 ## Example
     
     package main
     
     import (
-        "fmt"
         "web"
     )
     
-    func hello(val string) string { 
-        return fmt.Sprintf("hello %s", val) 
-    }
+    func hello(val string) string { return "hello " + val } 
     
     func main() {
         web.Get("/(.*)", hello)
         web.Run("0.0.0.0:9999")
     }
 
 
-### Adding route handlers
-
-We add a handler that matches the url path "/today". This will return the current url path. 
-
-    package main
-    
-    import (
-        "fmt"
-        "time"
-        "web"
-    )
-
-    func index() string {
-        return "Welcome!"
-    }
+To run the application, put the code in a file called hello.go and run:
 
-    func today() string {
-        return fmt.Sprintf("The time is currently %s", time.LocalTime().Asctime())
-    }
-    
-    func main() {
-        web.Get("/today", today)
-        web.Get("/", index)
-        web.Run("0.0.0.0:9999")
-    }
-    
-Then stop the application and recompile it . You can point your browser to http://localhost:9999/today to see the new route. 
+    8g hello.go && 8l -o hello hello.8 && ./hello
 
-## Roadmap
+You can point your browser to http://localhost:9999/world . 
 
-Future releases will support:
+## Documentation
 
-* fastcgi and proxying support
-* an interface to write real-time applications (for long-polling)
-* a better template system
-* cookie-based sessions with storage
+More documentation, including a tutorial and API docs, is available on [web.go's home page](http://www.getwebgo.com)
 
 ## About
 
-web.go was written by Michael Hoisie. Follow me on [Twitter](http://www.twitter.com/hoisie)!
+web.go was written by [Michael Hoisie](http://hoisie.com). 
+
+Follow me on [Twitter](http://www.twitter.com/hoisie)!
 
diff --git a/examples/hello.go b/examples/hello.go
@@ -4,7 +4,7 @@ import (
     "web"
 )
 
-func hello(val string) string { return "hello " + val } 
+func hello(val string) string { return "hello " + val }
 
 func main() {
     web.Get("/(.*)", hello)
diff --git a/servefile.go b/servefile.go
@@ -11,6 +11,7 @@ var contentByExt = map[string]string{
     ".css": "text/css",
     ".gif": "image/gif",
     ".html": "text/html; charset=utf-8",
+    ".htm": "text/html; charset=utf-8",
     ".jpg": "image/jpeg",
     ".js": "application/x-javascript",
     ".pdf": "application/pdf",

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"web"`
`5`	`5`	`)`
`6`	`6`
`7`		`-func hello(val string) string { return "hello " + val }`
	`7`	`+func hello(val string) string { return "hello " + val }`
`8`	`8`
`9`	`9`	`func main() {`
`10`	`10`	`web.Get("/(.*)", hello)`