clearance_http_auth 0.0.1 → 0.1.0

data/lib/clearance_http_auth/current_user_override.rb

@@ -11,7 +11,7 @@ module Clearance
       #
       # @return [User, nil]
       def current_user
-        env['clearance.current_user'] || @_current_user || user_from_cookie
+        (env['clearance.current_user'] rescue nil) || @_current_user || user_from_cookie
       end
     end
 

data/lib/clearance_http_auth/version.rb

@@ -1,5 +1,5 @@
 module Clearance
   module HttpAuth
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/test/dummy/log/test.log

@@ -9429,3 +9429,131 @@ Started GET "/" for 127.0.0.1 at Sun Dec 26 10:30:36 +0100 2010
 #<User id: 1, email: "test@example.com", encrypted_password: "e1d7a7e6c9372c1931caca3c284090535979dff8", salt: "a00f12eb264ebc6536ce7b1eac8a2ae77c9d28e3", confirmation_token: "de646e9450c29c5598acee25942e96cfca7c0d91", remember_token: "c7454a991419472209f844a7c1983a92cef9c69c", email_confirmed: true, created_at: "2010-12-26 09:30:36", updated_at: "2010-12-26 09:30:36">
 Rendered text template (0.0ms)
 Completed 200 OK in 3ms (Views: 0.5ms | ActiveRecord: 0.6ms)
+  SQL (0.5ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+Migrating to ClearanceCreateUsers (20101221153914)
+  User Load (0.5ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (1.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:55.977783', 't', 'c327e9ad06d7d80651723d0e6fa96ac317b396aa', '2011-01-10 22:15:55.977783', 'd50651ae04d9834b28eae973e77a3de0b09f8d5e', '7cf972499f375c2557ed9afdc18d0f33bf032390', 'test@example.com', '1de02258ca32ae96a50b5358991b041ba83e5bc1')
+
+
+Started GET "/entrances.json" for 127.0.0.1 at Mon Jan 10 23:15:55 +0100 2011
+  User Load (70.5ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+  User Load (0.2ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.075980', 't', '01b69fb990740b2126de6dc1f6922a15381174d6', '2011-01-10 22:15:56.075980', 'c7ba1e3aaf036145bf77a47ccb1fb19b59e256cb', '1d20946d0aa6694611d1456f5d36f90bea48928f', 'test@example.com', 'a2a1e5a4bf4fcf94db4d1c3196df763fc87edcbe')
+
+
+Started GET "/entrances.json" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  User Load (0.1ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.081259', 't', '16137802b15d31221d0c656aa0e6b2e33170c090', '2011-01-10 22:15:56.081259', '43c51c9dd4218c4d6c4de9b6dd35ad8322c608b7', '9dffb06b7451d9dc175e2681fc603b5fca9c318e', 'test@example.com', '56c87cbe2c76d88129e70d748a984e2b17fbc4c5')
+
+
+Started POST "/entrances.json" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+  Processing by EntrancesController#create as JSON
+Completed 201 Created in 10ms (Views: 8.9ms | ActiveRecord: 74.1ms)
+  User Load (0.2ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.105955', 't', '77ecde5d166d95ab30cfb25cec253a7305eb8817', '2011-01-10 22:15:56.105955', '41bead98cae1524d22fab758457b215a5cf7185d', 'ef2d041824f5cbce2da4473bcaf22fb3044a1ac9', 'test@example.com', 'ab3046097480190308b2bb0be0144b800b743538')
+
+
+Started GET "/entrances.json" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+  Processing by EntrancesController#index as JSON
+#<User id: 1, email: "test@example.com", encrypted_password: "ef2d041824f5cbce2da4473bcaf22fb3044a1ac9", salt: "41bead98cae1524d22fab758457b215a5cf7185d", confirmation_token: "77ecde5d166d95ab30cfb25cec253a7305eb8817", remember_token: "ab3046097480190308b2bb0be0144b800b743538", email_confirmed: true, created_at: "2011-01-10 22:15:56", updated_at: "2011-01-10 22:15:56">
+Completed 200 OK in 1ms (Views: 0.3ms | ActiveRecord: 0.7ms)
+  User Load (0.1ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.117238', 't', '2cd74f379ed25fc3805c730eaeeda11fe85100fb', '2011-01-10 22:15:56.117238', 'e62ea665fd66d26e74e2150718294a007d0763c1', 'e3542abdbbd4c83d6b011d06219d426e56b74020', 'test@example.com', 'b0a6d0103cad839a5d4203e00489da07172ddf69')
+
+
+Started GET "/entrances.csv" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+  Processing by EntrancesController#index as CSV
+#<User id: 1, email: "test@example.com", encrypted_password: "e3542abdbbd4c83d6b011d06219d426e56b74020", salt: "e62ea665fd66d26e74e2150718294a007d0763c1", confirmation_token: "2cd74f379ed25fc3805c730eaeeda11fe85100fb", remember_token: "b0a6d0103cad839a5d4203e00489da07172ddf69", email_confirmed: true, created_at: "2011-01-10 22:15:56", updated_at: "2011-01-10 22:15:56">
+Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.2ms | ActiveRecord: 0.6ms)
+  User Load (0.2ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.130857', 't', '8ecb23515e45fdeb3d8cf26a4354ee639567d029', '2011-01-10 22:15:56.130857', '1f8afbe388212d4fef0d3f0e13bb6b7b095ba772', '26e455ed3efc79c71d3f503cdf9fab7f44c12c3b', 'test@example.com', '345f2fac323930e41a53649f64218ef7fcb793d0')
+
+
+Started GET "/entrances.santa" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by EntrancesController#index as 
+Redirected to http://example.org/sign_in
+Completed 302 Found in 1ms
+
+
+Started GET "/sign_in" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by Clearance::SessionsController#new as HTML
+Rendered /opt/local/lib/ruby/gems/1.8/gems/gems/clearance-0.9.1/app/views/sessions/new.html.erb within layouts/application (8.9ms)
+Completed 200 OK in 22ms (Views: 21.8ms | ActiveRecord: 0.5ms)
+  User Load (0.2ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.168026', 't', '3ef461d5c8368669c48706753b4c1a67a7f17222', '2011-01-10 22:15:56.168026', 'd1f3205c728884296990b39593a2b18d178d959b', 'ed690ce909f5ba3f6a3e1bd3bded1f558db0aa25', 'test@example.com', 'e43cb7a4ac6b9ae2ad8e1e50fe4fbb506e746952')
+
+
+Started GET "/" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by EntrancesController#index as HTML
+Redirected to http://www.example.com/sign_in
+Completed 302 Found in 1ms
+
+
+Started GET "/sign_in" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by Clearance::SessionsController#new as HTML
+Rendered /opt/local/lib/ruby/gems/1.8/gems/gems/clearance-0.9.1/app/views/sessions/new.html.erb within layouts/application (3.5ms)
+Completed 200 OK in 5ms (Views: 4.7ms | ActiveRecord: 0.5ms)
+
+
+Started POST "/session" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by Clearance::SessionsController#create as HTML
+  Parameters: {"commit"=>"Sign in", "session"=>{"password"=>"[FILTERED]", "email"=>"test@example.com"}, "utf8"=>"✓"}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+Rendered /opt/local/lib/ruby/gems/1.8/gems/gems/clearance-0.9.1/app/views/sessions/new.html.erb within layouts/application (3.5ms)
+Completed 401 Unauthorized in 6ms (Views: 4.8ms | ActiveRecord: 0.2ms)
+  User Load (0.2ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.4ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.227820', 't', '3afd7f01ad509e218bcbcc027781171df5baebaa', '2011-01-10 22:15:56.227820', '28847889880389f7a964f74d0e27ece4bb784bc7', '9b2a5438587984cf165b82724de1e3142c34f5bf', 'test@example.com', '04f4d3b437e4a4fa6516deaa384efea6375c315d')
+
+
+Started GET "/" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by EntrancesController#index as HTML
+Redirected to http://www.example.com/sign_in
+Completed 302 Found in 1ms
+
+
+Started GET "/sign_in" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by Clearance::SessionsController#new as HTML
+Rendered /opt/local/lib/ruby/gems/1.8/gems/gems/clearance-0.9.1/app/views/sessions/new.html.erb within layouts/application (3.9ms)
+Completed 200 OK in 5ms (Views: 4.6ms | ActiveRecord: 0.5ms)
+  User Load (0.2ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "users" ("created_at", "email_confirmed", "confirmation_token", "updated_at", "salt", "encrypted_password", "email", "remember_token") VALUES ('2011-01-10 22:15:56.245308', 't', '7c338fff176c3809d8c678f96534bb5da20c5010', '2011-01-10 22:15:56.245308', '7fe07f1f882e4f184b03b6ea49ae4d114b224925', '86a47619327e652b97e11d2644737e4f0b17bf17', 'test@example.com', '108007178bcb8cf8f949168e40bda18d4aa99350')
+
+
+Started GET "/" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by EntrancesController#index as HTML
+Redirected to http://www.example.com/sign_in
+Completed 302 Found in 1ms
+
+
+Started GET "/sign_in" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by Clearance::SessionsController#new as HTML
+Rendered /opt/local/lib/ruby/gems/1.8/gems/gems/clearance-0.9.1/app/views/sessions/new.html.erb within layouts/application (3.8ms)
+Completed 200 OK in 5ms (Views: 4.5ms | ActiveRecord: 0.5ms)
+
+
+Started POST "/session" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by Clearance::SessionsController#create as HTML
+  Parameters: {"commit"=>"Sign in", "session"=>{"password"=>"[FILTERED]", "email"=>"test@example.com"}, "utf8"=>"✓"}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+Redirected to http://www.example.com/
+Completed 302 Found in 6ms
+
+
+Started GET "/" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
+  Processing by EntrancesController#index as HTML
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE ("users"."remember_token" = '108007178bcb8cf8f949168e40bda18d4aa99350') LIMIT 1
+  CACHE (0.0ms)  SELECT "users".* FROM "users" WHERE ("users"."remember_token" = '108007178bcb8cf8f949168e40bda18d4aa99350') LIMIT 1
+#<User id: 1, email: "test@example.com", encrypted_password: "86a47619327e652b97e11d2644737e4f0b17bf17", salt: "7fe07f1f882e4f184b03b6ea49ae4d114b224925", confirmation_token: "7c338fff176c3809d8c678f96534bb5da20c5010", remember_token: "108007178bcb8cf8f949168e40bda18d4aa99350", email_confirmed: true, created_at: "2011-01-10 22:15:56", updated_at: "2011-01-10 22:15:56">
+Rendered text template (0.0ms)
+Completed 200 OK in 3ms (Views: 0.5ms | ActiveRecord: 0.5ms)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clearance_http_auth
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Karel Minarik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,7 @@ dependencies:
   requirement: *id006
   name: shoulda
   type: :development
-description: "   Simple, instant HTTP Basic Authentication for applications\n   using Clearance [https://github.com/thoughtbot/clearance].\n"
+description: "   Simple, instant HTTP Basic Authentication for applications using Clearance.\n"
 email: karmi@karmi.cz
 executables: []
 
@@ -170,7 +170,6 @@ files:
 - test/dummy/script/rails
 - test/dummy/test/factories/clearance.rb
 - test/dummy/tmp/capybara/capybara-20101221172010.html
-- test/dummy/tmp/pids/server.pid
 - test/integration/api_test.rb
 - test/integration/navigation_test.rb
 - test/support/integration_case.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-18440