clearance_http_auth 0.1.0 → 0.2.0

data/lib/clearance_http_auth/current_user_override.rb

@@ -7,11 +7,11 @@ module Clearance
     #
     module CurrentUserOverride
 
-      # User in the current cookie
+      # Returns user authenticated from HTTP Auth or cookie
       #
       # @return [User, nil]
       def current_user
-        (env['clearance.current_user'] rescue nil) || @_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.1.0"
+    VERSION = "0.2.0"
   end
 end

data/test/dummy/log/test.log

@@ -9557,3 +9557,130 @@ Started GET "/" for 127.0.0.1 at Mon Jan 10 23:15:56 +0100 2011
 #<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)
+  SQL (1.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   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.6ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (4.4ms)  INSERT INTO "users" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.459989', '807bedde3c3849cd711dc9b45b6241fceee06f1d', '249f557d736a45a8782cf0ccd1f15e958591594a', '3317798e1845440fce479212b8b75658be06e789', '2011-03-12 16:15:58.459989', 'a49e6cc3dea19fc1681b58d3c7f03e5b29bc2d45')
+
+
+Started GET "/entrances.json" for 127.0.0.1 at Sat Mar 12 17:15:58 +0100 2011
+  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+  User Load (0.1ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.4ms)  INSERT INTO "users" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.495978', '624bf518c38bf88bd048674b6435e9fdcf014e4c', '3d54584b20f7c0de946abff213a8e1fad109de77', 'dd41eb11c3922059fac1c52272d957a5ba68dd22', '2011-03-12 16:15:58.495978', '361921b8c3983ab1410e198a42cea07939bb3594')
+
+
+Started GET "/entrances.json" for 127.0.0.1 at Sat Mar 12 17:15:58 +0100 2011
+  User Load (0.1ms)  SELECT "users"."id" FROM "users" WHERE (LOWER("users"."email") = LOWER('test@example.com')) LIMIT 1
+  AREL (0.4ms)  INSERT INTO "users" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.502571', '847e56ca59f4e441a64163c4010d7abd8ee369a7', '3184aec80b72dea609d837b8b3fde43ec14f2db9', 'f5891edde2b28e294da941f2e807beb028192a70', '2011-03-12 16:15:58.502571', 'a952b676f314fe9757d9a6b48d0a70409157b62e')
+
+
+Started POST "/entrances.json" for 127.0.0.1 at Sat Mar 12 17:15:58 +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 11ms (Views: 10.3ms | ActiveRecord: 8.0ms)
+  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" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.624555', '878224f7dcd476762563e5abf5e10ead300eee46', '9d56db80963bc1c6253c6efb9ed8cdb02d1decdb', 'ea712b2cefdd9b502eb388b53135e0681aee6325', '2011-03-12 16:15:58.624555', '3b883120bc5ef6b9e91aef25f38e22d3be14705a')
+
+
+Started GET "/entrances.json" for 127.0.0.1 at Sat Mar 12 17:15:58 +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: "3b883120bc5ef6b9e91aef25f38e22d3be14705a", salt: "878224f7dcd476762563e5abf5e10ead300eee46", confirmation_token: "9d56db80963bc1c6253c6efb9ed8cdb02d1decdb", remember_token: "ea712b2cefdd9b502eb388b53135e0681aee6325", email_confirmed: true, created_at: "2011-03-12 16:15:58", updated_at: "2011-03-12 16:15:58">
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.8ms)
+  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" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.639929', '7a4d46103bd235cda6b11512c68d185a658db01c', '220d5a6189bee40507473ae9303e053ef8b8ae33', '7435b6c4763e7394e3b83bff5f40eb57d8b4d310', '2011-03-12 16:15:58.639929', '29b73a63b9e22e73053b2e0ec7b6b5783457415f')
+
+
+Started GET "/entrances.csv" for 127.0.0.1 at Sat Mar 12 17:15:58 +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: "29b73a63b9e22e73053b2e0ec7b6b5783457415f", salt: "7a4d46103bd235cda6b11512c68d185a658db01c", confirmation_token: "220d5a6189bee40507473ae9303e053ef8b8ae33", remember_token: "7435b6c4763e7394e3b83bff5f40eb57d8b4d310", email_confirmed: true, created_at: "2011-03-12 16:15:58", updated_at: "2011-03-12 16:15:58">
+Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 2.9ms | ActiveRecord: 0.8ms)
+  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" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.655308', '1524f9e8fc4ea3085d75f78ebe04243d54ad7275', 'd967399db956d08fae984cd5f22650e85f9044ec', '482f1c3f77a3243039cd05f8d273dd52af70e840', '2011-03-12 16:15:58.655308', '3f28047440306b0472873018b9a3b6a1e44fab6a')
+
+
+Started GET "/entrances.santa" for 127.0.0.1 at Sat Mar 12 17:15:58 +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 Sat Mar 12 17:15:58 +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 (10.6ms)
+Completed 200 OK in 27ms (Views: 26.8ms | ActiveRecord: 0.6ms)
+  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" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.701168', '0d91ca24f782112088da8f91b2070829cbce5f02', '2b1169437feee58a2d4b598edcbc473568e3ae0c', 'abaed8f8b125b7a45d55a1353be762c58487471b', '2011-03-12 16:15:58.701168', '8e26b7cf88efb6fdebc7a756315c56c0e674e3f0')
+
+
+Started GET "/" for 127.0.0.1 at Sat Mar 12 17:15:58 +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 Sat Mar 12 17:15:58 +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 (4.1ms)
+Completed 200 OK in 5ms (Views: 5.0ms | ActiveRecord: 0.6ms)
+
+
+Started POST "/session" for 127.0.0.1 at Sat Mar 12 17:15:58 +0100 2011
+  Processing by Clearance::SessionsController#create as HTML
+  Parameters: {"commit"=>"Sign in", "session"=>{"password"=>"[FILTERED]", "email"=>"test@example.com"}, "utf8"=>"✓"}
+  User Load (0.3ms)  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 (4.2ms)
+Completed 401 Unauthorized in 7ms (Views: 5.2ms | ActiveRecord: 0.3ms)
+  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" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.771605', '107b9884f1dbbd8af0a0f52b5486563288c07e38', '13dc73576a257e73e749ee3a4f6b83b28e298004', 'c6f75523acb5b8126d70e573bf0cde45d0469795', '2011-03-12 16:15:58.771605', '8cef314d3b01642c41f01c600c8c7ef0c3fd9777')
+
+
+Started GET "/" for 127.0.0.1 at Sat Mar 12 17:15:58 +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 Sat Mar 12 17:15:58 +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 (4.4ms)
+Completed 200 OK in 6ms (Views: 5.3ms | ActiveRecord: 0.6ms)
+  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" ("email_confirmed", "email", "created_at", "salt", "confirmation_token", "remember_token", "updated_at", "encrypted_password") VALUES ('t', 'test@example.com', '2011-03-12 16:15:58.792216', 'd7fa5f49879eb03db571b62149ade081fd819291', 'f65ab6f86d7fc232a3f8eb60b1cd893eace3e814', 'a8439016de823df2c74412dcb5233c4914bc2cc6', '2011-03-12 16:15:58.792216', '635719ac8aef01b7f2975ebf8e7cbe01bcd64c35')
+
+
+Started GET "/" for 127.0.0.1 at Sat Mar 12 17:15:58 +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 Sat Mar 12 17:15:58 +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 (5.1ms)
+Completed 200 OK in 10ms (Views: 10.0ms | ActiveRecord: 0.5ms)
+
+
+Started POST "/session" for 127.0.0.1 at Sat Mar 12 17:15:58 +0100 2011
+  Processing by Clearance::SessionsController#create as HTML
+  Parameters: {"commit"=>"Sign in", "session"=>{"password"=>"[FILTERED]", "email"=>"test@example.com"}, "utf8"=>"✓"}
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE ("users"."email" = 'test@example.com') LIMIT 1
+Redirected to http://www.example.com/
+Completed 302 Found in 7ms
+
+
+Started GET "/" for 127.0.0.1 at Sat Mar 12 17:15:58 +0100 2011
+  Processing by EntrancesController#index as HTML
+  User Load (0.4ms)  SELECT "users".* FROM "users" WHERE ("users"."remember_token" = 'a8439016de823df2c74412dcb5233c4914bc2cc6') LIMIT 1
+#<User id: 1, email: "test@example.com", encrypted_password: "635719ac8aef01b7f2975ebf8e7cbe01bcd64c35", salt: "d7fa5f49879eb03db571b62149ade081fd819291", confirmation_token: "f65ab6f86d7fc232a3f8eb60b1cd893eace3e814", remember_token: "a8439016de823df2c74412dcb5233c4914bc2cc6", email_confirmed: true, created_at: "2011-03-12 16:15:58", updated_at: "2011-03-12 16:15:58">
+Rendered text template (0.0ms)
+Completed 200 OK in 3ms (Views: 0.6ms | ActiveRecord: 0.9ms)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clearance_http_auth
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Karel Minarik
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id001
   name: bundler
-  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -46,12 +47,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  requirement: *id002
   name: clearance
-  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -61,12 +62,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  requirement: *id003
   name: rack
-  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,12 +76,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   name: thin
-  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,12 +90,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   name: turn
-  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,9 +104,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   name: shoulda
-  type: :development
+  version_requirements: *id006
 description: "   Simple, instant HTTP Basic Authentication for applications using Clearance.\n"
 email: karmi@karmi.cz
 executables: []
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: HTTP Basic Authentication for Clearance