devise_oauth2_canvas_facebook 0.0.3 → 0.0.4

data/app/controllers/devise/facebook_consumer_controller.rb

@@ -21,9 +21,9 @@ class Devise::FacebookConsumerController < ApplicationController
     token = client.access_token
     fb_user = client.selection.me.info!
 
-    resource = resource_class.find_with_facebook_user(fb_user, token)
+    resource = resource_class.find_with_facebook_user(fb_user, token, client)
     unless resource
-      resource = resource_class.create_with_facebook_user(fb_user, token)
+      resource = resource_class.create_with_facebook_user(fb_user, token, client)
     end
     if resource_class.respond_to?(:serialize_into_cookie)
       resource.remember_me!

data/lib/devise_oauth2_canvas_facebook/model.rb

@@ -4,15 +4,15 @@ module Devise
     module DeviseOauth2CanvasFacebook
       extend ActiveSupport::Concern
 
-      def do_update_facebook_user(fb_user, token)
+      def do_update_facebook_user(fb_user, token, client)
         self.send("#{self.class.facebook_uid_field}=".to_sym, fb_user.id)
         self.send("#{self.class.facebook_token_field}=".to_sym, token)
         self.email = fb_user.email.to_s.downcase if fb_user.email.present?
-        update_facebook_user(fb_user)
+        update_facebook_user(fb_user, client)
         self.save(:validate => false)
       end
       
-      def update_facebook_user(fb_user)
+      def update_facebook_user(fb_user, client)
         # override me
       end
 
@@ -25,18 +25,18 @@ module Devise
       module ClassMethods
         Devise::Models.config(self, :facebook_uid_field, :facebook_token_field)
 
-        def find_with_facebook_user(fb_user, token)
+        def find_with_facebook_user(fb_user, token,client)
           user = where(facebook_uid_field.to_sym => fb_user.id).first
           if user
-            user.do_update_facebook_user(fb_user, token)
+            user.do_update_facebook_user(fb_user, token, client)
           end
           user
         end
         
-        def create_with_facebook_user(fb_user, token)
+        def create_with_facebook_user(fb_user, token,client)
           user = new(facebook_uid_field.to_sym => fb_user.id, :password => "fakepass", :password_confirmation => "fakepass")
           user.skip_confirmation! if user.respond_to?(:skip_confirmation!)
-          user.do_update_facebook_user(fb_user, token)
+          user.do_update_facebook_user(fb_user, token, client)
           user
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_oauth2_canvas_facebook
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nina Jansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency