authlogic_facebook_shim 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authlogic_facebook_shim (0.4.0)
+    authlogic_facebook_shim (0.5.1)
       authlogic (~> 3.0)
 
 GEM
@@ -37,7 +37,7 @@ GEM
       multi_json (~> 1.0)
     addressable (2.2.6)
     arel (2.2.1)
-    authlogic (3.0.3)
+    authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
     builder (3.0.0)
@@ -45,10 +45,10 @@ GEM
     faraday (0.7.5)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.1)
+    json (1.6.3)
     koala (1.2.1)
       faraday (~> 0.7.0)
       multi_json (~> 1.0)
@@ -57,8 +57,8 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    minitest (2.8.1)
-    multi_json (1.0.3)
+    minitest (2.9.1)
+    multi_json (1.0.4)
     multipart-post (1.1.4)
     override (0.0.10)
     polyglot (0.3.3)
@@ -93,7 +93,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)

data/lib/authlogic_facebook_shim/adapters/koala_adapter.rb

@@ -12,7 +12,8 @@ module AuthlogicFacebookShim
               user_info = oauth.get_user_from_cookie(controller.cookies)
             end
             OpenStruct.new( user_info ) if user_info
-            
+          rescue Koala::Facebook::APIError
+            nil
           end
         end
 

data/lib/authlogic_facebook_shim/version.rb

@@ -1,3 +1,3 @@
 module AuthlogicFacebookShim
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/dummy/log/test.log

@@ -1384,3 +1384,61 @@ Migrating to CreateUsers (20101217000008)
    (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-13 22:14:15.268187', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-13 22:14:15.268404', "perishable_token" = 'WrobOHEJ6GczZIEq72nR', "updated_at" = '2011-12-13 22:14:15.269103', "lock_version" = 1 WHERE ("users"."id" = 3 AND "users"."lock_version" = 0)
    (0.1ms)  UPDATE "users" SET "perishable_token" = 'VGmuut4JhgIxbLItkf2B', "updated_at" = '2011-12-13 22:14:15.272839', "lock_version" = 2 WHERE ("users"."id" = 3 AND "users"."lock_version" = 1)
    (0.1ms)  UPDATE "users" SET "login_count" = 2, "last_login_at" = '2011-12-13 22:14:15.268187', "current_login_at" = '2011-12-13 22:14:15.274920', "last_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-13 22:14:15.275527', "perishable_token" = 'InNZ7YbWxRyWgCMTicO', "updated_at" = '2011-12-13 22:14:15.276338', "lock_version" = 3 WHERE ("users"."id" = 3 AND "users"."lock_version" = 2)
+   (0.1ms)  select sqlite_version(*)
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (0.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateUsers (20101217000008)
+   (0.4ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime, "lock_version" integer DEFAULT 0, "company_id" integer, "login" varchar(255), "crypted_password" varchar(255), "password_salt" varchar(255), "persistence_token" varchar(255), "single_access_token" varchar(255), "perishable_token" varchar(255), "email" varchar(255), "first_name" varchar(255), "last_name" varchar(255), "login_count" integer DEFAULT 0 NOT NULL, "failed_login_count" integer DEFAULT 0 NOT NULL, "last_request_at" datetime, "current_login_at" datetime, "last_login_at" datetime, "current_login_ip" varchar(255), "last_login_ip" varchar(255), "active" boolean DEFAULT 't', "approved" boolean DEFAULT 't', "confirmed" boolean DEFAULT 't', "facebook_uid" varchar(255)) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20101217000008')
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."persistence_token" = '4b9911154b44453619ef29420dec6d1d67fc99c33d03e6907a3d9fb5269e2a706741c2b3132d52e773a7d88809d673268a2f9d18bb4def59971cb3d26d141ea7' LIMIT 1
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."single_access_token" = 'aVXjlpW5jUs4V19IRzp' LIMIT 1
+  SQL (2.5ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:27:51 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "U3uMDRr8xmoVmsM62Y"], ["persistence_token", "4b9911154b44453619ef29420dec6d1d67fc99c33d03e6907a3d9fb5269e2a706741c2b3132d52e773a7d88809d673268a2f9d18bb4def59971cb3d26d141ea7"], ["single_access_token", "aVXjlpW5jUs4V19IRzp"], ["updated_at", Wed, 14 Dec 2011 05:27:51 UTC +00:00]]
+   (0.2ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:27:51.546023', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:27:51.546244', "perishable_token" = 'tuQlV7duFesiUQpZPKSp', "updated_at" = '2011-12-14 05:27:51.547325', "lock_version" = 1 WHERE ("users"."id" = 1 AND "users"."lock_version" = 0)
+   (0.2ms)  SELECT 1 FROM "users" WHERE "users"."persistence_token" = '4135ec8f2ed81375cd0861e9faf52dec8bca91a0fcc830711db3e3a7db5edc81e40a925ddc871b3370875caab9ce665d0f22b2846d3576ae11002922a8c99673' LIMIT 1
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."single_access_token" = 'MmU1WjP9SYqXcbvbWB' LIMIT 1
+  SQL (2.4ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:27:51 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "RDYFbO3qqeCeegeh0HK"], ["persistence_token", "4135ec8f2ed81375cd0861e9faf52dec8bca91a0fcc830711db3e3a7db5edc81e40a925ddc871b3370875caab9ce665d0f22b2846d3576ae11002922a8c99673"], ["single_access_token", "MmU1WjP9SYqXcbvbWB"], ["updated_at", Wed, 14 Dec 2011 05:27:51 UTC +00:00]]
+   (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:27:51.610719', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:27:51.610937', "perishable_token" = '5zCo3dXxAQw6aZeldhL', "updated_at" = '2011-12-14 05:27:51.611647', "lock_version" = 1 WHERE ("users"."id" = 2 AND "users"."lock_version" = 0)
+  SQL (2.5ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:27:51 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "DfZFETx7OssKno4Twi5u"], ["persistence_token", nil], ["single_access_token", nil], ["updated_at", Wed, 14 Dec 2011 05:27:51 UTC +00:00]]
+   (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:27:51.624568', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:27:51.624787', "perishable_token" = 'YLrrLknEHmTgevPzNms', "updated_at" = '2011-12-14 05:27:51.625490', "lock_version" = 1 WHERE ("users"."id" = 3 AND "users"."lock_version" = 0)
+   (0.1ms)  UPDATE "users" SET "perishable_token" = 'Mc7uiRcR0YrrPkNfQHU', "updated_at" = '2011-12-14 05:27:51.629135', "lock_version" = 2 WHERE ("users"."id" = 3 AND "users"."lock_version" = 1)
+   (0.1ms)  UPDATE "users" SET "login_count" = 2, "last_login_at" = '2011-12-14 05:27:51.624568', "current_login_at" = '2011-12-14 05:27:51.631167', "last_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:27:51.631584', "perishable_token" = '1J14M8CcjSqTkmn6ssPw', "updated_at" = '2011-12-14 05:27:51.632350', "lock_version" = 3 WHERE ("users"."id" = 3 AND "users"."lock_version" = 2)
+   (0.1ms)  select sqlite_version(*)
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateUsers (20101217000008)
+   (0.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime, "lock_version" integer DEFAULT 0, "company_id" integer, "login" varchar(255), "crypted_password" varchar(255), "password_salt" varchar(255), "persistence_token" varchar(255), "single_access_token" varchar(255), "perishable_token" varchar(255), "email" varchar(255), "first_name" varchar(255), "last_name" varchar(255), "login_count" integer DEFAULT 0 NOT NULL, "failed_login_count" integer DEFAULT 0 NOT NULL, "last_request_at" datetime, "current_login_at" datetime, "last_login_at" datetime, "current_login_ip" varchar(255), "last_login_ip" varchar(255), "active" boolean DEFAULT 't', "approved" boolean DEFAULT 't', "confirmed" boolean DEFAULT 't', "facebook_uid" varchar(255)) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20101217000008')
+   (0.2ms)  SELECT 1 FROM "users" WHERE "users"."persistence_token" = 'cff1b8f8906c9ce6b0ca59c0fdc77541ffa39b66cd0495ec5f2a6d6f58bcd7a85d29959c66c230d2b0823d153d3cedc5e0772d802a593138f427afe2e87b5cf1' LIMIT 1
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."single_access_token" = 'uV7BM2FXsOlBaHHjVrPa' LIMIT 1
+  SQL (2.8ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:29:40 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "3DA7EBNBi2H9A3Sday3"], ["persistence_token", "cff1b8f8906c9ce6b0ca59c0fdc77541ffa39b66cd0495ec5f2a6d6f58bcd7a85d29959c66c230d2b0823d153d3cedc5e0772d802a593138f427afe2e87b5cf1"], ["single_access_token", "uV7BM2FXsOlBaHHjVrPa"], ["updated_at", Wed, 14 Dec 2011 05:29:40 UTC +00:00]]
+   (0.2ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:29:40.910831', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:29:40.911069', "perishable_token" = 'shiTOYeIhbAvtk9RfI', "updated_at" = '2011-12-14 05:29:40.912163', "lock_version" = 1 WHERE ("users"."id" = 1 AND "users"."lock_version" = 0)
+   (0.2ms)  SELECT 1 FROM "users" WHERE "users"."persistence_token" = '0a53879402e7af4f16b3de97a5c230c385d658d40d14fad281aa548e5f8168caae714259fb3fe0dbc3a391a3ae253865680a3561c242c1c16b80dde42459a51f' LIMIT 1
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."single_access_token" = 'sN85gW4leKlBIQ2BInT3' LIMIT 1
+  SQL (2.4ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:29:40 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "QINaRZg5lS11pcg1BeYb"], ["persistence_token", "0a53879402e7af4f16b3de97a5c230c385d658d40d14fad281aa548e5f8168caae714259fb3fe0dbc3a391a3ae253865680a3561c242c1c16b80dde42459a51f"], ["single_access_token", "sN85gW4leKlBIQ2BInT3"], ["updated_at", Wed, 14 Dec 2011 05:29:40 UTC +00:00]]
+   (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:29:40.978382', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:29:40.978618', "perishable_token" = '7blTLnYfmouwFMc8ZzD', "updated_at" = '2011-12-14 05:29:40.979325', "lock_version" = 1 WHERE ("users"."id" = 2 AND "users"."lock_version" = 0)
+  SQL (2.5ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:29:40 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "xpUhbSfopLD6MsHWzIG"], ["persistence_token", nil], ["single_access_token", nil], ["updated_at", Wed, 14 Dec 2011 05:29:40 UTC +00:00]]
+   (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:29:40.992865', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:29:40.993098', "perishable_token" = 'etugFtiHLapWGcBWSamm', "updated_at" = '2011-12-14 05:29:40.993815', "lock_version" = 1 WHERE ("users"."id" = 3 AND "users"."lock_version" = 0)
+   (0.1ms)  UPDATE "users" SET "perishable_token" = 'ZuPwR4Z86TS8dnadg', "updated_at" = '2011-12-14 05:29:40.997567', "lock_version" = 2 WHERE ("users"."id" = 3 AND "users"."lock_version" = 1)
+   (0.1ms)  UPDATE "users" SET "login_count" = 2, "last_login_at" = '2011-12-14 05:29:40.992865', "current_login_at" = '2011-12-14 05:29:40.999658', "last_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:29:41.000089', "perishable_token" = '2l4cdwsBMtVKdJ1XM8Zq', "updated_at" = '2011-12-14 05:29:41.000869', "lock_version" = 3 WHERE ("users"."id" = 3 AND "users"."lock_version" = 2)
+   (0.1ms)  select sqlite_version(*)
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (0.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateUsers (20101217000008)
+   (0.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime, "lock_version" integer DEFAULT 0, "company_id" integer, "login" varchar(255), "crypted_password" varchar(255), "password_salt" varchar(255), "persistence_token" varchar(255), "single_access_token" varchar(255), "perishable_token" varchar(255), "email" varchar(255), "first_name" varchar(255), "last_name" varchar(255), "login_count" integer DEFAULT 0 NOT NULL, "failed_login_count" integer DEFAULT 0 NOT NULL, "last_request_at" datetime, "current_login_at" datetime, "last_login_at" datetime, "current_login_ip" varchar(255), "last_login_ip" varchar(255), "active" boolean DEFAULT 't', "approved" boolean DEFAULT 't', "confirmed" boolean DEFAULT 't', "facebook_uid" varchar(255)) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20101217000008')
+   (0.2ms)  SELECT 1 FROM "users" WHERE "users"."persistence_token" = '3919f8a06fa5b52d6873e05576d3a7b7e99203553f5b332bd3559b8651f104bec67255acc2dc4181b238de1cdadf62704326d89ea9c525266f5e04d3471074aa' LIMIT 1
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."single_access_token" = '4mlkqn4CT26F9nTk6yl' LIMIT 1
+  SQL (3.0ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:32:30 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "hwq0ComHntpvotEoPO17"], ["persistence_token", "3919f8a06fa5b52d6873e05576d3a7b7e99203553f5b332bd3559b8651f104bec67255acc2dc4181b238de1cdadf62704326d89ea9c525266f5e04d3471074aa"], ["single_access_token", "4mlkqn4CT26F9nTk6yl"], ["updated_at", Wed, 14 Dec 2011 05:32:30 UTC +00:00]]
+   (0.2ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:32:30.806358', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:32:30.806625', "perishable_token" = 'Km5mkC0fpr2ZUe4r9Od', "updated_at" = '2011-12-14 05:32:30.807951', "lock_version" = 1 WHERE ("users"."id" = 1 AND "users"."lock_version" = 0)
+   (0.2ms)  SELECT 1 FROM "users" WHERE "users"."persistence_token" = '745c5238b081c306d5a137396083cf783493665ad31426b7903e52ba0f491bcc4829bcc91cf45757d39b8069caf30e648d028efdb7c5a087c592ada0866cd192' LIMIT 1
+   (0.1ms)  SELECT 1 FROM "users" WHERE "users"."single_access_token" = 'qjhp4y8okjTws0HTlMee' LIMIT 1
+  SQL (2.4ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:32:30 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "hti0yEL1e7OJPkYcud"], ["persistence_token", "745c5238b081c306d5a137396083cf783493665ad31426b7903e52ba0f491bcc4829bcc91cf45757d39b8069caf30e648d028efdb7c5a087c592ada0866cd192"], ["single_access_token", "qjhp4y8okjTws0HTlMee"], ["updated_at", Wed, 14 Dec 2011 05:32:30 UTC +00:00]]
+   (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:32:30.875372', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:32:30.875592', "perishable_token" = 'Hv7FlGQqNLbr6UCeNyw', "updated_at" = '2011-12-14 05:32:30.876306', "lock_version" = 1 WHERE ("users"."id" = 2 AND "users"."lock_version" = 0)
+  SQL (2.5ms)  INSERT INTO "users" ("active", "approved", "company_id", "confirmed", "created_at", "crypted_password", "current_login_at", "current_login_ip", "email", "facebook_uid", "failed_login_count", "first_name", "last_login_at", "last_login_ip", "last_name", "last_request_at", "lock_version", "login", "login_count", "password_salt", "perishable_token", "persistence_token", "single_access_token", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["active", true], ["approved", true], ["company_id", nil], ["confirmed", true], ["created_at", Wed, 14 Dec 2011 05:32:30 UTC +00:00], ["crypted_password", nil], ["current_login_at", nil], ["current_login_ip", nil], ["email", nil], ["facebook_uid", nil], ["failed_login_count", 0], ["first_name", nil], ["last_login_at", nil], ["last_login_ip", nil], ["last_name", nil], ["last_request_at", nil], ["lock_version", 0], ["login", nil], ["login_count", 0], ["password_salt", nil], ["perishable_token", "6BFCMNjHtPhqI2Xgr4"], ["persistence_token", nil], ["single_access_token", nil], ["updated_at", Wed, 14 Dec 2011 05:32:30 UTC +00:00]]
+   (0.1ms)  UPDATE "users" SET "login_count" = 1, "current_login_at" = '2011-12-14 05:32:30.889736', "current_login_ip" = '1.1.1.1', "last_request_at" = '2011-12-14 05:32:30.889968', "perishable_token" = 'GY1dZk3XrFwxp7FXuvhv', "updated_at" = '2011-12-14 05:32:30.890680', "lock_version" = 1 WHERE ("users"."id" = 3 AND "users"."lock_version" = 0)

data/test/units/adapters/koala_adapter_test.rb

@@ -148,6 +148,19 @@ describe AuthlogicFacebookShim::Adapters::KoalaAdapter do
       
     end
     
+    describe "with expired facebook cookie" do
+  
+      before do
+        @oauth.expect :respond_to?, :true, [:get_user_info_from_cookie]
+        override @oauth, :get_user_info_from_cookie => lambda { |cookies| raise Koala::Facebook::APIError.new('expired') }
+      end
+  
+      it "should return nil" do
+        @session.facebook_session.must_be_nil 
+      end
+      
+    end
+    
   end
   
   describe "facebook_session?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authlogic_facebook_shim
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &2156316240 !ruby/object:Gem::Requirement
+  requirement: &2157500500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156316240
+  version_requirements: *2157500500
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156315740 !ruby/object:Gem::Requirement
+  requirement: &2157500000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2156315740
+  version_requirements: *2157500000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156315280 !ruby/object:Gem::Requirement
+  requirement: &2157499540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2156315280
+  version_requirements: *2157499540
 - !ruby/object:Gem::Dependency
   name: override
-  requirement: &2156314900 !ruby/object:Gem::Requirement
+  requirement: &2157499160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156314900
+  version_requirements: *2157499160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156314440 !ruby/object:Gem::Requirement
+  requirement: &2157498700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156314440
+  version_requirements: *2157498700
 - !ruby/object:Gem::Dependency
   name: koala
-  requirement: &2156314020 !ruby/object:Gem::Requirement
+  requirement: &2157498280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156314020
+  version_requirements: *2157498280
 description: Authlogic extension to support Facebook OAuth2 javascript sessions. Currently
   requires koala but is easily extended for other facebook api wrappers.
 email: james2mccarthy@gmail.com