Merge branch 'master' of https://github.com/robfig/revel

router.go

@@ -282,8 +282,8 @@ func (router *Router) validate(route *Route) *Error {
 // 5: action
 var routePattern *regexp.Regexp = regexp.MustCompile(
 	"(?i)^(GET|POST|PUT|DELETE|OPTIONS|HEAD|WS|\\*)" +
-		"[(]?([^)]*)(\\))? +" +
-		"(.*/[^ ]*) +([^ (]+)(.+)?( *)$")
+		"[(]?([^)]*)(\\))?[ \t]+" +
+		"(.*/[^ \t]*)[ \t]+([^ \t(]+)(.+)?([ \t]*)$")
 
 func parseRouteLine(line string) (method, path, action string, found bool) {
 	var matches []string = routePattern.FindStringSubmatch(line)

router_test.go

@@ -147,8 +147,8 @@ GET  /                       Application.Index
 GET  /app/{id}               Application.Show
 POST /app/{id}               Application.Save
 
-GET  /public/                staticDir:www
-*    /{controller}/{action}  {controller}.{action}
+GET	/public/	                staticDir:www
+*		/{controller}/{action}		{controller}.{action}
 
 GET  /favicon.ico            404
 `

samples/booking/app/controllers/hotels.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"code.google.com/p/go.crypto/bcrypt"
 	"database/sql"
 	"fmt"
 	"github.com/robfig/revel"
@@ -124,17 +125,21 @@ func (c Hotels) Settings() rev.Result {
 }
 
 func (c Hotels) SaveSettings(password, verifyPassword string) rev.Result {
-	user := connected(c.Controller)
-	user.Password = password
-	user.Validate(c.Validation)
-	c.Validation.Required(verifyPassword).Message("VerifyPassword is required")
-	c.Validation.Required(password == verifyPassword).Message("Your password doesn't match")
+	models.ValidatePassword(c.Validation, password).Key("password")
+	c.Validation.Required(verifyPassword).
+		Key("verifyPassword").
+		Message("Please verify your password")
+	c.Validation.Required(password == verifyPassword).
+		Key("verifyPassword").
+		Message("Your password doesn't match")
 	if c.Validation.HasErrors() {
 		c.Validation.Keep()
 		return c.Redirect(Hotels.Settings)
 	}
-	_, err := c.Txn.Exec("update User set Password = ? where UserId = ?",
-		password, user.UserId)
+
+	bcryptPassword, _ := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	_, err := c.Txn.Exec("update User set HashedPassword = ? where UserId = ?",
+		bcryptPassword, connected(c.Controller).UserId)
 	if err != nil {
 		panic(err)
 	}

samples/booking/app/models/user.go

@@ -26,14 +26,18 @@ func (u *User) Validate(v *rev.Validation) {
 		rev.Match{userRegex},
 	).Key("user.Username")
 
-	v.Check(u.Password,
-		rev.Required{},
-		rev.MaxSize{15},
-		rev.MinSize{5},
-	).Key("user.Password")
+	ValidatePassword(v, u.Password).Key("user.Password")
 
 	v.Check(u.Name,
 		rev.Required{},
 		rev.MaxSize{100},
 	).Key("user.Name")
 }
+
+func ValidatePassword(v *rev.Validation, password string) *rev.ValidationResult {
+	return v.Check(password,
+		rev.Required{},
+		rev.MaxSize{15},
+		rev.MinSize{5},
+	)
+}

samples/booking/app/views/Hotels/Settings.html

@@ -4,17 +4,17 @@
 <h1>Change your password</h1>
 
 <form method="POST" action="{{url "Hotels.SaveSettings"}}">
-  {{with $field := field "connected.Password" .}}
+  {{with $field := field "password" .}}
     <p class="{{$field.ErrorClass}}">
       <strong>Password:</strong>
-      <input type="password" name="Password" size="16" value="{{.connected.Password}}"> *
+      <input type="password" name="{{$field.Name}}" size="16"> *
       <span class="error">{{$field.Error}}</span>
     </p>
   {{end}}
   {{with $field := field "verifyPassword" .}}
     <p class="{{$field.ErrorClass}}">
       <strong>Verify password:</strong>
-      <input type="password" name="{{$field.Name}}" size="16" value="{{.verifyPassword}}"> *
+      <input type="password" name="{{$field.Name}}" size="16"> *
       <span class="error">{{$field.Error}}</span>
     </p>
   {{end}}

watcher.go

@@ -1,7 +1,7 @@
 package rev
 
 import (
-	"github.com/howeyc/fsnotify"
+	"github.com/robfig/fsnotify"
 	"os"
 	"path"
 	"path/filepath"