contour 1.0.0.beta5 → 1.0.0.beta6

data/app/controllers/contour/confirmations_controller.rb

@@ -0,0 +1,3 @@
+class Contour::ConfirmationsController < Devise::ConfirmationsController
+
+end

data/app/controllers/contour/unlocks_controller.rb

@@ -0,0 +1,3 @@
+class Contour::UnlocksController < Devise::UnlocksController
+
+end

data/config/routes.rb

@@ -9,7 +9,9 @@ Rails.application.routes.draw do
 
   # devise_for :users, controllers: { registrations:  'contour/registrations',
   #                                   sessions:       'contour/sessions',
-  #                                   passwords:      'contour/passwords' },
+  #                                   passwords:      'contour/passwords',
+  #                                   confirmations:  'contour/confirmations',
+  #                                   unlocks:        'contour/unlocks' },
   #                    path_names:  { sign_up:        'register',
   #                                   sign_in:        'login' }
 

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta5" # nil, "pre", "rc", "rc2"
+    BUILD = "beta6" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/generators/contour/install_generator.rb

@@ -17,7 +17,7 @@ module Contour
       def copy_omniauth
         template "omniauth.rb", "config/initializers/omniauth.rb"
       end
-      
+
       def install_devise
         generate("devise:install")
         # model_name = ask("What would you like the user model to be called? [user]")
@@ -27,17 +27,17 @@ module Contour
       end
 
       def add_contour_devise_route
-        route "devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords' }, path_names: { sign_up: 'register', sign_in: 'login' }"
+        route "devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords', confirmations: 'contour/confirmations', unlocks: 'contour/unlocks' }, path_names: { sign_up: 'register', sign_in: 'login' }"
       end
 
       def show_readme
         readme "README" if behavior == :invoke
       end
-      
+
       # def copy_locale
       #   copy_file "../../../config/locales/en.yml", "config/locales/contour.en.yml"
       # end
-      # 
+      #
       # def show_readme
       #   readme "README" if behavior == :invoke
       # end

data/test/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Dummy::Application.routes.draw do
 
-  devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords' }, path_names: { sign_up: 'register', sign_in: 'login' }
+  devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords', confirmations: 'contour/confirmations', unlocks: 'contour/unlocks' }, path_names: { sign_up: 'register', sign_in: 'login' }
 
   resources :users
 

data/test/dummy/log/test.log

@@ -33296,3 +33296,267 @@ Completed 401 Unauthorized in 79ms
    (0.0ms)  begin transaction
   User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
    (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "authentications"
+  Fixture Insert (0.1ms)  INSERT INTO "authentications" ("provider", "uid", "created_at", "updated_at", "id", "user_id") VALUES ('open_id', 'open_id@open_id.com', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 949717663, 201799169)
+  Fixture Insert (0.1ms)  INSERT INTO "authentications" ("provider", "uid", "created_at", "updated_at", "id", "user_id") VALUES ('google_apps', 'test@gmail.com', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 876923740, 201799169)
+  Fixture Insert (0.1ms)  INSERT INTO "authentications" ("provider", "uid", "created_at", "updated_at", "id", "user_id") VALUES ('ldap', 'CN=ldapid,CN=Users,DC=example,DC=com', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 864673665, 201799169)
+  Fixture Delete (0.1ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("first_name", "last_name", "status", "deleted", "email", "encrypted_password", "reset_password_token", "reset_password_sent_at", "remember_created_at", "sign_in_count", "current_sign_in_at", "last_sign_in_at", "current_sign_in_ip", "last_sign_in_ip", "created_at", "updated_at", "id") VALUES ('FirstName', 'LastName', 'active', 'f', 'valid@example.com', '$2a$10$ZgXIxDCn.TjuCgsnS9iEp.Z1LlmQ71FGKgZe/kdCaVvgvnAAcUaz2', 'ResetTokenOne', 'MyDate', 'MyDate', 0, 'MyDate', 'MyDate', 'MyString', 'MyString', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 201799169)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("first_name", "last_name", "status", "deleted", "email", "encrypted_password", "reset_password_token", "reset_password_sent_at", "remember_created_at", "sign_in_count", "current_sign_in_at", "last_sign_in_at", "current_sign_in_ip", "last_sign_in_ip", "created_at", "updated_at", "id") VALUES ('MyString', 'MyString', 'inactive', 'f', 'EmailTwo', 'MyString', 'ResetTokenTwo', 'MyDate', 'MyDate', 0, 'MyDate', 'MyDate', 'MyString', 'MyString', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 999914115)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("first_name", "last_name", "status", "deleted", "email", "encrypted_password", "reset_password_token", "reset_password_sent_at", "remember_created_at", "sign_in_count", "current_sign_in_at", "last_sign_in_at", "current_sign_in_ip", "last_sign_in_ip", "created_at", "updated_at", "id") VALUES ('Deleted', 'User', 'active', 't', 'deleted@example.com', 'MyString', 'ResetTokenFive', 'MyDate', '2011-02-23', 0, '2011-02-23', '2011-02-23', 'MyString', 'MyString', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 725306934)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("first_name", "last_name", "status", "deleted", "email", "encrypted_password", "reset_password_token", "reset_password_sent_at", "remember_created_at", "sign_in_count", "current_sign_in_at", "last_sign_in_at", "current_sign_in_ip", "last_sign_in_ip", "created_at", "updated_at", "id") VALUES ('MyString', 'MyString', 'pending', 'f', 'pending@example.com', 'MyString', 'ResetTokenFour', 'MyDate', '2011-02-23', 0, '2011-02-23', '2011-02-23', 'MyString', 'MyString', '2012-05-04 16:57:41', '2012-05-04 16:57:41', 349534908)
+   (1.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  Authentication Load (0.3ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."id" = ? LIMIT 1  [["id", 876923740]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  Authentication Load (0.1ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."id" = ? LIMIT 1  [["id", 949717663]]
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  Authentication Load (0.1ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."id" = ? LIMIT 1  [["id", 949717663]]
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" 
+Processing by Contour::AuthenticationsController#create as HTML
+  Parameters: {"authentication"=>{"id"=>"949717663", "user_id"=>"201799169", "provider"=>"open_id", "uid"=>"open_id@open_id.com", "created_at"=>"2012-05-04 16:57:41 UTC", "updated_at"=>"2012-05-04 16:57:41 UTC"}}
+  Authentication Load (0.1ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."provider" = 'google_apps' AND "authentications"."uid" = 'test@example.com' LIMIT 1
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = 201799169 LIMIT 1
+Logged in user found, creating associated authentication.
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "authentications" ("created_at", "provider", "uid", "updated_at", "user_id") VALUES (?, ?, ?, ?, ?)  [["created_at", Fri, 04 May 2012 16:57:41 UTC +00:00], ["provider", "google_apps"], ["uid", "test@example.com"], ["updated_at", Fri, 04 May 2012 16:57:41 UTC +00:00], ["user_id", 201799169]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/authentications
+Completed 302 Found in 50ms (ActiveRecord: 0.8ms)
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" 
+   (0.8ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  Authentication Load (0.0ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."id" = ? LIMIT 1  [["id", 949717663]]
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" 
+Processing by Contour::AuthenticationsController#destroy as HTML
+  Parameters: {"id"=>"949717663"}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = 201799169 LIMIT 1
+  Authentication Load (0.1ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."user_id" = 201799169 AND "authentications"."id" = ? LIMIT 1  [["id", "949717663"]]
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  DELETE FROM "authentications" WHERE "authentications"."id" = ?  [["id", 949717663]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/authentications
+Completed 302 Found in 4ms (ActiveRecord: 0.6ms)
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" 
+   (0.4ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  Authentication Load (0.0ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."id" = ? LIMIT 1  [["id", 949717663]]
+Processing by Contour::AuthenticationsController#index as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = 201799169 LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" WHERE "authentications"."user_id" = 201799169
+  Authentication Load (0.1ms)  SELECT "authentications".* FROM "authentications" WHERE "authentications"."user_id" = 201799169
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/authentications/_index.html.erb (2.3ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/layouts/_menu.html.erb (4.2ms)
+Completed 200 OK in 73ms (Views: 71.5ms | ActiveRecord: 0.3ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by Contour::PasswordsController#create as HTML
+  Parameters: {"user"=>{"email"=>"valid@example.com"}}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'valid@example.com' LIMIT 1
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."reset_password_token" = 'kNy6yPxUyyVtAcmM8ppy' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "users" SET "reset_password_token" = 'kNy6yPxUyyVtAcmM8ppy', "reset_password_sent_at" = '2012-05-04 16:57:41.553736', "updated_at" = '2012-05-04 16:57:41.554570' WHERE "users"."id" = 201799169
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to valid@example.com (43ms)
+Date: Fri, 04 May 2012 12:57:41 -0400
+From: please-change-me-at-config-initializers-devise@example.com
+Reply-To: please-change-me-at-config-initializers-devise@example.com
+To: valid@example.com
+Message-ID: <4fa40a85a3494_36873fc1f9834cd045750@edge.mail>
+Subject: Reset password instructions
+Mime-Version: 1.0
+Content-Type: text/html;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<p>Hello valid@example.com!</p>
+
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+
+<p><a href="http://localhost:3000/users/password/edit?reset_password_token=kNy6yPxUyyVtAcmM8ppy">Change my password</a></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>
+
+Redirected to http://test.host/users/login
+Completed 302 Found in 162ms (ActiveRecord: 0.0ms)
+   (0.8ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by Contour::PasswordsController#new as HTML
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/_links.html.erb (2.5ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/authentications/_menu.html.erb (2.6ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/layouts/_menu.html.erb (17.0ms)
+Completed 200 OK in 28ms (Views: 27.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 349534908]]
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 725306934]]
+
+
+Started GET "/logged_in_page" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by WelcomeController#logged_in_page as HTML
+Completed 401 Unauthorized in 1ms
+   (0.1ms)  SAVEPOINT active_record_1
+  User Exists (0.1ms)  SELECT 1 FROM "users" WHERE "users"."email" = 'deleted-2@example.com' LIMIT 1
+Binary data inserted for `string` type on column `encrypted_password`
+  SQL (0.6ms)  INSERT INTO "users" ("created_at", "current_sign_in_at", "current_sign_in_ip", "deleted", "email", "encrypted_password", "first_name", "last_name", "last_sign_in_at", "last_sign_in_ip", "remember_created_at", "reset_password_sent_at", "reset_password_token", "sign_in_count", "status", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 04 May 2012 16:57:41 UTC +00:00], ["current_sign_in_at", nil], ["current_sign_in_ip", nil], ["deleted", false], ["email", "deleted-2@example.com"], ["encrypted_password", "$2a$04$qs6NbMtDxDq5czR87fR2veWmhZXsT3o/5.qExueiiusFEGG2lnPhW"], ["first_name", "Deleted"], ["last_name", "User"], ["last_sign_in_at", nil], ["last_sign_in_ip", nil], ["remember_created_at", nil], ["reset_password_sent_at", nil], ["reset_password_token", nil], ["sign_in_count", 0], ["status", "pending"], ["updated_at", Fri, 04 May 2012 16:57:41 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" WHERE "authentications"."user_id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "users" SET "status" = 'active', "updated_at" = '2012-05-04 16:57:41.795482' WHERE "users"."id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "users" SET "deleted" = 't', "updated_at" = '2012-05-04 16:57:41.796642' WHERE "users"."id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+
+Started POST "/users/login" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by Contour::SessionsController#create as HTML
+  Parameters: {"user"=>{"email"=>"deleted-2@example.com", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'deleted-2@example.com' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Completed 401 Unauthorized in 8ms
+
+
+Started GET "/users/login" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by Contour::SessionsController#new as HTML
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/_links.html.erb (0.7ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/layouts/_latest_news.html.erb (0.5ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/authentications/_menu.html.erb (1.4ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/layouts/_menu.html.erb (3.1ms)
+Completed 200 OK in 14ms (Views: 13.4ms | ActiveRecord: 0.0ms)
+   (1.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 349534908]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 725306934]]
+
+
+Started GET "/logged_in_page" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by WelcomeController#logged_in_page as HTML
+Completed 401 Unauthorized in 0ms
+   (0.1ms)  SAVEPOINT active_record_1
+  User Exists (0.1ms)  SELECT 1 FROM "users" WHERE "users"."email" = 'valid-2@example.com' LIMIT 1
+Binary data inserted for `string` type on column `encrypted_password`
+  SQL (0.5ms)  INSERT INTO "users" ("created_at", "current_sign_in_at", "current_sign_in_ip", "deleted", "email", "encrypted_password", "first_name", "last_name", "last_sign_in_at", "last_sign_in_ip", "remember_created_at", "reset_password_sent_at", "reset_password_token", "sign_in_count", "status", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 04 May 2012 16:57:41 UTC +00:00], ["current_sign_in_at", nil], ["current_sign_in_ip", nil], ["deleted", false], ["email", "valid-2@example.com"], ["encrypted_password", "$2a$04$JpvtnIZLbQM6uG7t9IAW4e9..Ey8eis.rf5hEsJPNWBMwzqz/mS9K"], ["first_name", "FirstName"], ["last_name", "LastName"], ["last_sign_in_at", nil], ["last_sign_in_ip", nil], ["remember_created_at", nil], ["reset_password_sent_at", nil], ["reset_password_token", nil], ["sign_in_count", 0], ["status", "pending"], ["updated_at", Fri, 04 May 2012 16:57:41 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" WHERE "authentications"."user_id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "users" SET "status" = 'active', "updated_at" = '2012-05-04 16:57:41.852025' WHERE "users"."id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+
+Started POST "/users/login" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by Contour::SessionsController#create as HTML
+  Parameters: {"user"=>{"email"=>"valid-2@example.com", "password"=>"[FILTERED]"}}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'valid-2@example.com' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "users" SET "last_sign_in_at" = '2012-05-04 16:57:41.862957', "current_sign_in_at" = '2012-05-04 16:57:41.862957', "last_sign_in_ip" = '127.0.0.1', "current_sign_in_ip" = '127.0.0.1', "sign_in_count" = 1, "updated_at" = '2012-05-04 16:57:41.863488' WHERE "users"."id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://www.example.com/logged_in_page
+Completed 302 Found in 8ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/logged_in_page" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by WelcomeController#logged_in_page as HTML
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = 999914116 LIMIT 1
+Completed 200 OK in 5ms (Views: 2.7ms | ActiveRecord: 0.2ms)
+   (0.7ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 349534908]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 725306934]]
+
+
+Started GET "/logged_in_page" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by WelcomeController#logged_in_page as HTML
+Completed 401 Unauthorized in 0ms
+   (0.1ms)  SAVEPOINT active_record_1
+  User Exists (0.1ms)  SELECT 1 FROM "users" WHERE "users"."email" = 'pending-2@example.com' LIMIT 1
+Binary data inserted for `string` type on column `encrypted_password`
+  SQL (0.5ms)  INSERT INTO "users" ("created_at", "current_sign_in_at", "current_sign_in_ip", "deleted", "email", "encrypted_password", "first_name", "last_name", "last_sign_in_at", "last_sign_in_ip", "remember_created_at", "reset_password_sent_at", "reset_password_token", "sign_in_count", "status", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Fri, 04 May 2012 16:57:41 UTC +00:00], ["current_sign_in_at", nil], ["current_sign_in_ip", nil], ["deleted", false], ["email", "pending-2@example.com"], ["encrypted_password", "$2a$04$gvRPW56nqtWFpLbLJke/0uwX.AYySLwJoHinvRiBX0TxFd7XlUcFy"], ["first_name", "MyString"], ["last_name", "MyString"], ["last_sign_in_at", nil], ["last_sign_in_ip", nil], ["remember_created_at", nil], ["reset_password_sent_at", nil], ["reset_password_token", nil], ["sign_in_count", 0], ["status", "pending"], ["updated_at", Fri, 04 May 2012 16:57:41 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "authentications" WHERE "authentications"."user_id" = 999914116
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+
+Started POST "/users/login" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by Contour::SessionsController#create as HTML
+  Parameters: {"user"=>{"email"=>"pending-2@example.com", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'pending-2@example.com' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Completed 401 Unauthorized in 4ms
+
+
+Started GET "/users/login" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by Contour::SessionsController#new as HTML
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/_links.html.erb (32.8ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/layouts/_latest_news.html.erb (0.1ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/authentications/_menu.html.erb (1.5ms)
+  Rendered /Users/remo/code/ruby/gems/contour/app/views/contour/layouts/_menu.html.erb (3.1ms)
+Completed 200 OK in 42ms (Views: 41.5ms | ActiveRecord: 0.0ms)
+   (0.9ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 349534908]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 725306934]]
+
+
+Started GET "/" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by WelcomeController#index as HTML
+Completed 401 Unauthorized in 0ms
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 349534908]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 725306934]]
+
+
+Started GET "/logged_in_page.json" for 127.0.0.1 at 2012-05-04 12:57:41 -0400
+Processing by WelcomeController#logged_in_page as JSON
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'valid@example.com' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.2ms)  UPDATE "users" SET "last_sign_in_at" = '2012-05-04 16:57:42.047531', "current_sign_in_at" = '2012-05-04 16:57:42.047531', "current_sign_in_ip" = '127.0.0.1', "sign_in_count" = 1, "updated_at" = '2012-05-04 16:57:42.048193' WHERE "users"."id" = 201799169
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Completed 200 OK in 84ms (Views: 0.3ms | ActiveRecord: 0.5ms)
+   (0.7ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 349534908]]
+  User Load (0.0ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 725306934]]
+
+
+Started GET "/logged_in_page.json" for 127.0.0.1 at 2012-05-04 12:57:42 -0400
+Processing by WelcomeController#logged_in_page as JSON
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'valid@example.com' LIMIT 1
+Completed 401 Unauthorized in 79ms
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 201799169]]
+   (0.1ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.beta6
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70141383964500 !ruby/object:Gem::Requirement
+  requirement: &70302277205080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70141383964500
+  version_requirements: *70302277205080
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
-  requirement: &70141385459240 !ruby/object:Gem::Requirement
+  requirement: &70302274218560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70141385459240
+  version_requirements: *70302274218560
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70141385458780 !ruby/object:Gem::Requirement
+  requirement: &70302274218100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70141385458780
+  version_requirements: *70302274218100
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70141385458320 !ruby/object:Gem::Requirement
+  requirement: &70302274217640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70141385458320
+  version_requirements: *70302274217640
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70141385457860 !ruby/object:Gem::Requirement
+  requirement: &70302274217180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70141385457860
+  version_requirements: *70302274217180
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &70141385457400 !ruby/object:Gem::Requirement
+  requirement: &70302274216720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70141385457400
+  version_requirements: *70302274216720
 - !ruby/object:Gem::Dependency
   name: omniauth-ldap
-  requirement: &70141385456940 !ruby/object:Gem::Requirement
+  requirement: &70302274216260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70141385456940
+  version_requirements: *70302274216260
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70141385456480 !ruby/object:Gem::Requirement
+  requirement: &70302274215800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70141385456480
+  version_requirements: *70302274215800
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70141385456020 !ruby/object:Gem::Requirement
+  requirement: &70302274215340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70141385456020
+  version_requirements: *70302274215340
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70141385455560 !ruby/object:Gem::Requirement
+  requirement: &70302274214880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70141385455560
+  version_requirements: *70302274214880
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
-  requirement: &70141385455100 !ruby/object:Gem::Requirement
+  requirement: &70302274214420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70141385455100
+  version_requirements: *70302274214420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70141385454720 !ruby/object:Gem::Requirement
+  requirement: &70302274214040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141385454720
+  version_requirements: *70302274214040
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -442,10 +442,12 @@ files:
 - app/assets/stylesheets/jquery-ui-1.8.10.custom.css
 - app/assets/stylesheets/jquery.qtip.css
 - app/controllers/contour/authentications_controller.rb
+- app/controllers/contour/confirmations_controller.rb
 - app/controllers/contour/passwords_controller.rb
 - app/controllers/contour/registrations_controller.rb
 - app/controllers/contour/samples_controller.rb
 - app/controllers/contour/sessions_controller.rb
+- app/controllers/contour/unlocks_controller.rb
 - app/helpers/contour_helper.rb
 - app/models/authentication.rb
 - app/views/contour/_links.html.erb