devise_facebook_connectable 0.1.5 → 0.1.6

data/Rakefile

@@ -27,7 +27,7 @@ begin
     gemspec.extra_rdoc_files = SUPPORT_FILES
     
     gemspec.add_dependency 'activesupport',   '>= 2.3.0'
-    gemspec.add_dependency 'devise',          '>= 0.7.1'
+    gemspec.add_dependency 'devise',          '>= 0.7.3'
     gemspec.add_dependency 'facebooker',      '>= 1.0.55'
   end
   Jeweler::GemcutterTasks.new

data/generators/devise_facebook_connectable/devise_facebook_connectable_generator.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class DeviseFacebookConnectableGenerator < Rails::Generator::Base
+class DeviseFacebookConnectableGenerator < Rails::Generator::Base #:nodoc:
 
   default_options :api_key => "YOUR_APP_API_KEY",
                   :secret_key => "YOUR_APP_SECRET_KEY"

data/generators/devise_facebook_connectable/templates/devise.facebook_connectable.js

@@ -1,6 +1,6 @@
 /**
  *  JavaScript Helpers for devise_facebook_connectable,
- *  to make connect/login/logout with Devise seamless.
+ *  to make sign in/out (connect) with Devise seamless.
  *  
  *  Note: JavaScript framework agnostic.
  */
@@ -16,32 +16,32 @@ if (typeof devise.facebook_connectable === 'undefined' || devise.facebook_connec
 /* 
  *  Connect/Login.
  */
-devise.facebook_connectable.login = function fbc_login() {
-  document.getElementById('fb_connect_login_form').submit();
+devise.facebook_connectable.sign_in = function fbc_sign_in() {
+  document.getElementById('fb_connect_sign_in_form').submit();
   return false;
 };
 
 /* 
  *  Connect/Login - with callback.
  */
-devise.facebook_connectable.login_with_callback = function fbc_login_with_callback() {
-  FB.Connect.requireSession(devise.facebook_connectable.login);
+devise.facebook_connectable.sign_in_with_callback = function fbc_sign_in_with_callback() {
+  FB.Connect.requireSession(devise.facebook_connectable.sign_in);
   return false;
 };
 
 /* 
  *  Logout.
  */
-devise.facebook_connectable.logout = function fbc_logout() {
-  document.getElementById('fb_connect_logout_form').submit();
+devise.facebook_connectable.sign_out = function fbc_sign_out() {
+  document.getElementById('fb_connect_sign_out_form').submit();
   return false;
 };
 
 /* 
  *  Logout - with callback.
  */
-devise.facebook_connectable.logout_with_callback = function fbc_logout_with_callback() {
-  FB.Connect.logout(devise.facebook_connectable.logout);
+devise.facebook_connectable.sign_out_with_callback = function fbc_sign_out_with_callback() {
+  FB.Connect.logout(devise.facebook_connectable.sign_out);
   return false;
 };
 

data/lib/devise_facebook_connectable.rb

@@ -14,7 +14,6 @@ rescue
 end
 
 require 'devise_facebook_connectable/model'
-require 'devise_facebook_connectable/serializer'
 require 'devise_facebook_connectable/strategy'
 require 'devise_facebook_connectable/schema'
 require 'devise_facebook_connectable/routes'
@@ -42,11 +41,14 @@ end
 
 # Load core I18n locales: en
 #
-I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[devise_facebook_connectable locales en.yml]))
+I18n.load_path.unshift File.join(File.dirname(__FILE__), *%w[devise_facebook_connectable locales en.yml])
 
-# Add +:facebook_connectable+ serializers and strategies to defaults.
+# Add +:facebook_connectable+ strategies to defaults.
 #
 Devise::ALL.unshift :facebook_connectable
 Devise::STRATEGIES.unshift :facebook_connectable
-Devise::SERIALIZERS.unshift :facebook_connectable
 Devise::CONTROLLERS[:sessions].unshift :facebook_connectable
+
+Devise::Models.module_eval do
+  autoload :FacebookConnectable, 'devise_facebook_connectable/model'
+end

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -1,16 +1,21 @@
 # encoding: utf-8
 require 'facebooker/session'
 
-module Devise
-  module FacebookConnectable
-    module Controllers
+module Devise #:nodoc:
+  module FacebookConnectable #:nodoc:
+    module Controllers #:nodoc:
+      
+      # Controller filters (extensions) needed for Facebook Connect.
+      #
       module Filters
 
-        def self.included(base)
+        def self.included(base) #:nodoc:
           base.class_eval do
             before_filter :expired_session_hack
             before_filter :set_facebook_session
+
             rescue_from ::Facebooker::Session::SessionExpired, :with => :facebook_session_expired
+            rescue_from ::ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
 
             helper_method :facebook_session
 
@@ -26,7 +31,15 @@ module Devise
             #
             def facebook_session_expired
               reset_session
-              redirect_to root_url
+              set_flash_message :failure, :facebook_timeout
+              render_with_scope :new, :controller => :sessions
+            end
+
+            # Handle expired Facebook sessions automatically.
+            #
+            def invalid_authenticity_token
+              set_now_flash_message :failure, :facebook_authenticity_token
+              render_with_scope :new, :controller => :sessions
             end
 
           end

data/lib/devise_facebook_connectable/locales/en.yml

@@ -2,6 +2,8 @@ en:
   devise:
     sessions:
       facebook_invalid: "Could not login. Invalid account."
-      facebook_session_expired: "Could not login. Facebook Connect session expired."
-      facebook_login: "Connect"
-      facebook_logout: "Logout"
+      facebook_timeout: "Facebook session expired., please sign in again to continue."
+      facebook_authenticity_token: "Something went wrong. For security reasons, please sign in again." # Revise this message =)
+      facebook_actions:
+        sign_in: "Sign in" # NOTE: Not used for the default Facebook Connect button.
+        sign_out: "Sign out"

data/lib/devise_facebook_connectable/model.rb

@@ -2,35 +2,34 @@
 require 'devise/models'
 require 'facebooker/session'
 require 'devise_facebook_connectable/strategy'
-require 'devise_facebook_connectable/serializer'
 
-module Devise
-  module FacebookConnectable
-    module Model
+module Devise #:nodoc:
+  # module FacebookConnectable #:nodoc:
+    module Models #:nodoc:
 
       # Facebook Connectable Module, responsible for validating authenticity of a 
       # user and storing credentials while signing in using their Facebook account.
       #
-      # Configuration:
+      # == Configuration:
       #
       # You can overwrite configuration values by setting in globally in Devise (+Devise.setup+),
       # using devise method, or overwriting the respective instance method.
       #
-      #   facebook_uid_field: Defines the name of the Facebook user UID database attribute/column.
+      # +facebook_uid_field+ - Defines the name of the Facebook user UID database attribute/column.
       #
-      #   facebook_session_key_field: Defines the name of the Facebook session key database attribute/column.
+      # +facebook_session_key_field+ - Defines the name of the Facebook session key database attribute/column.
       #
-      #   facebook_auto_create_account: Speifies if account should automatically be created upon connect
+      # +facebook_auto_create_account+ - Speifies if account should automatically be created upon connect
       #                                 if not already exists.
       #
-      # Examples:
+      # == Examples:
       #
       #    User.facebook_connect(:uid => '123456789')     # returns authenticated user or nil
       #    User.find(1).facebook_connected?               # returns true/false
       #
       module FacebookConnectable
 
-        def self.included(base)
+        def self.included(base) #:nodoc:
           base.class_eval do
             extend ClassMethods
             extend ::Devise::Models::SessionSerializer
@@ -43,14 +42,17 @@ module Devise
           self.send(:"#{self.class.facebook_uid_field}=", attributes[:uid])
           self.send(:"#{self.class.facebook_session_key_field}=", attributes[:session_key])
 
-          # Only populate +email+ field if it's available (say, if +authenticable+ module is used).
+          # Confirm without e-mail - if confirmable module is loaded.
+          self.skip_confirmation! if self.respond_to?(:skip_confirmation!)
+
+          # Only populate +email+ field if it's available (e.g. if +authenticable+ module is used).
           self.email = attributes[:email] || '' if self.respond_to?(:email)
 
           # Lazy hack: These database fields are required if +authenticable+/+confirmable+
-          # module(s) is used.
+          # module(s) is used. Could be avoided with :null => true for authenticatable
+          # migration, but keeping this to avoid unnecessary problems.
           self.password_salt = '' if self.respond_to?(:password_salt)
           self.encrypted_password = '' if self.respond_to?(:encrypted_password)
-          self.confirmed_at = ::Time.now if self.respond_to?(:confirmed_at)
         end
 
         # Checks if Facebook Connect:ed.
@@ -60,12 +62,12 @@ module Devise
         end
         alias :is_facebook_connected? :facebook_connected?
 
-        # Hook that gets called before connect (each time). Useful for
+        # Hook that gets called *before* connect (each time). Useful for
         # fetching additional user info (etc.) from Facebook.
         #
         # Default: Do nothing.
         #
-        # Examples:
+        # == Examples:
         #
         #   # Overridden in Facebook Connect:able model, e.g. "User".
         #   #
@@ -97,11 +99,33 @@ module Devise
         #     
         #   end
         #
-        # For more info:
-        #   http://facebooker.pjkh.com/user/populate
+        # == For more info:
+        #
+        #   * http://facebooker.pjkh.com/user/populate
         #
-        def on_before_facebook_connect(fb_session)
-          self.send(:before_facebook_connect, fb_session) rescue nil
+        def on_before_facebook_connect(facebook_session)
+          if self.respond_to?(:before_facebook_connect)
+            self.send(:before_facebook_connect, facebook_session) rescue nil
+          end
+        end
+        
+        # Hook that gets called *after* connect (each time). Useful for
+        # fetching additional user info (etc.) from Facebook.
+        #
+        # Default: Do nothing.
+        #
+        # == Example:
+        #
+        #   # Overridden in Facebook Connect:able model, e.g. "User".
+        #   #
+        #   def after_facebook_connect(fb_session)
+        #     # See "on_before_facebook_connect" example.
+        #   end
+        #
+        def on_after_facebook_connect(facebook_session)
+          if self.respond_to?(:after_facebook_connect)
+            self.send(:after_facebook_connect, facebook_session) rescue nil
+          end
         end
 
         # Optional: Store session key.
@@ -115,10 +139,10 @@ module Devise
         # Optional: Recreate Facebook session for this account/user.
         #
         def new_facebook_session
+          timeout_in = ::Devise.respond_to?(:timeout_in) ? ::Devise.timeout_in : 1.hour.from_now
           returning(::Facebooker::Session.create) do |new_session|
             new_session.secure_with!(self.send(:"#{self.class.facebook_session_key_field}"),
-                self.send(:"#{self.class.facebook_uid_field}"),
-                1.hour.from_now
+                self.send(:"#{self.class.facebook_uid_field}"), timeout_in
               )
             ::Facebooker::Session.current = new_session
           end
@@ -135,7 +159,7 @@ module Devise
 
           # Configuration params accessible within +Devise.setup+ procedure (in initalizer).
           #
-          # Example:
+          # == Example:
           #
           #   Devise.setup do |config|
           #     config.facebook_uid_field = :facebook_uid
@@ -151,6 +175,7 @@ module Devise
 
           # Alias don't work for some reason, so...a more Ruby-ish alias
           # for +facebook_auto_create_account+.
+          #
           def facebook_auto_create_account?
             self.facebook_auto_create_account
           end
@@ -169,7 +194,7 @@ module Devise
             # Overwrite to add customized conditions, create a join, or maybe use a
             # namedscope to filter records while authenticating.
             #
-            # Example:
+            # == Example:
             #
             #   def self.find_for_facebook_connect(conditions = {})
             #     conditions[:active] = true
@@ -191,9 +216,5 @@ module Devise
 
       end
     end
-  end
-end
-
-Devise::Models.module_eval do
-  include ::Devise::FacebookConnectable::Model
+  # end
 end

data/lib/devise_facebook_connectable/routes.rb

@@ -3,7 +3,9 @@
 ActionController::Routing::RouteSet::Mapper.class_eval do
 
   protected
-    # Re-use "authenticatable"-stuff.
+
+    # Setup routes for +FacebookSessionsController+.
+    #
     alias :facebook_connectable :authenticatable
 
 end

data/lib/devise_facebook_connectable/schema.rb

@@ -2,11 +2,12 @@
 require 'devise/schema'
 require 'devise_facebook_connectable/model'
 
-module Devise
-  module FacebookConnectable
+module Devise #:nodoc:
+  module FacebookConnectable #:nodoc:
+
     module Schema
 
-      # Creates facebook_uid and facebook_session_key (for Facebook Connect authentication/management).
+      # Database migration schema for Facebook Connect.
       #
       def facebook_connectable
         apply_schema ::Devise.facebook_uid_field, Integer, :limit => 8  # BIGINT unsigned / 64-bit int

data/lib/devise_facebook_connectable/strategy.rb

@@ -2,62 +2,65 @@
 require 'devise/strategies/base'
 require 'facebooker/session'
 
-module Devise
-  module FacebookConnectable
+module Devise #:nodoc:
+  module FacebookConnectable #:nodoc:
+    module Strategies #:nodoc:
 
-    # Default strategy for signing in a user using Facebook Connect (a Facebook account).
-    # Redirects to sign_in page if it's not authenticated
-    #
-    class Strategy < ::Warden::Strategies::Base
+      # Default strategy for signing in a user using Facebook Connect (a Facebook account).
+      # Redirects to sign_in page if it's not authenticated
+      #
+      class FacebookConnectable < ::Warden::Strategies::Base
 
-      include ::Devise::Strategies::Base
+        include ::Devise::Strategies::Base
 
-      # Without a Facebook session authentication cannot proceed.
-      #
-      def valid?
-        ::Facebooker::Session.current.present?
-      end
+        # Without a Facebook session authentication cannot proceed.
+        #
+        def valid?
+          ::Facebooker::Session.current.present?
+        end
 
-      # Authenticate user with Facebook Connect.
-      #
-      def authenticate!
-        klass = mapping.to
-        begin
-          facebook_session = ::Facebooker::Session.current # session[:facebook_session]
-          facebook_user = facebook_session.user
-
-          user = klass.facebook_connect(:uid => facebook_user.uid)
-
-          if user.present?
-            success!(user)
-          else
-            if klass.facebook_auto_create_account?
-              user = returning(klass.new) do |u|
-                u.store_facebook_credentials!(
-                    :session_key => facebook_session.session_key,
-                    :uid => facebook_user.uid
-                  )
-                u.on_before_facebook_connect(facebook_session)
-              end
+        # Authenticate user with Facebook Connect.
+        #
+        def authenticate!
+          klass = mapping.to
+          begin
+            facebook_session = ::Facebooker::Session.current # session[:facebook_session]
+            facebook_user = facebook_session.user
 
-              begin
-                user.save_with_validation(false)
-                success!(user)
-              rescue
+            user = klass.facebook_connect(:uid => facebook_user.uid)
+
+            if user.present?
+              success!(user)
+            else
+              if klass.facebook_auto_create_account?
+                user = returning(klass.new) do |u|
+                  u.store_facebook_credentials!(
+                      :session_key => facebook_session.session_key,
+                      :uid => facebook_user.uid
+                    )
+                  u.on_before_facebook_connect(facebook_session)
+                end
+
+                begin
+                  user.save_with_validation(false)
+                  user.on_after_facebook_connect(facebook_session)
+                  success!(user)
+                rescue
+                  fail!(:facebook_invalid)
+                end
+              else
                 fail!(:facebook_invalid)
               end
-            else
-              fail!(:facebook_invalid)
             end
+          # NOTE: Facebooker::Session::SessionExpired errors handled in the controller.
+          rescue => e
+            fail!(e.message)
           end
-        # NOTE: Handled in the controller.
-        rescue # ::Facebooker::Session::SessionExpired
-          fail!(:facebook_invalid)
         end
-      end
 
+      end
     end
   end
 end
 
-Warden::Strategies.add(:facebook_connectable, Devise::FacebookConnectable::Strategy)
+Warden::Strategies.add(:facebook_connectable, Devise::FacebookConnectable::Strategies::FacebookConnectable)

data/lib/devise_facebook_connectable/view_helpers.rb

@@ -1,101 +1,113 @@
 # encoding: utf-8
 require 'devise/mapping'
+require 'facebooker/rails/helpers'
 
-# Facebook Connect view helpers, i.e. connect/login/logout links, etc.
-#
-# Dependencies:
-#
-#   +devise.facebook_connectable.js+  (is generated with the generator)
-#
-module Devise
-  module FacebookConnectable
+module Devise #:nodoc:
+  module FacebookConnectable #:nodoc:
+
+    # Facebook Connect view helpers, i.e. sign in/out (connect) links, etc.
+    #
+    # == Dependencies:
+    #
+    #   * devise.facebook_connectable.js  (is generated with the generator)
+    #
     module Helpers
 
-      # References:
+      # == References:
       #
       #   * http://facebooker.rubyforge.org/
       #   * http://wiki.developers.facebook.com/index.php/Connect/Authorization_Websites
       #   * http://developers.facebook.com/docs/?u=facebook.jslib.FB.Connect
       #
 
-      # Known issues:
+      # == Known issues:
       #
-      #   * autologoutlink -  There's no onlogout callback - only onlogin, so it's not straightforward
-      #                       to trigger submit on the logout form to destroy the Warden session.
-      #                       Best solution now is either to hook the even manually on click,
-      #                       or use regular link like propsed here:
+      #   * *autologoutlink* -  There's no onlogout callback - only onlogin, so it's not straightforward
+      #                         to trigger submit on the sign out form to destroy the Warden session.
+      #                         Best solution now is either to hook the even manually on click,
+      #                         or use regular link like propsed here:
       #                         
       #                         http://forum.developers.facebook.com/viewtopic.php?pid=121283
       #
 
-      # Make the Facebook Connect strings localized with current locale
-      # by default. Just for convenience.
-      #
-      def localized_fb_connect_javascript_tag(options = {})
-        fb_connect_javascript_tag(options.reverse_merge(:lang => ::I18n.locale))
-      end
-
-      # Convenient connect/login/logout method. See below.
+      # Convenient sign in/out (connect) method. See below.
       #
       def facebook_link(options = {})
-        unless signed_in?(options[:for])
-          facebook_login_or_connect_link(options)
+        scope = auto_detect_scope(options.slice(:scope, :for))
+        options.except!(:scope, :for)
+
+        unless signed_in?(scope)
+          facebook_sign_in_link(options.merge(:scope => scope))
         else
-          facebook_logout_link(options)
+          facebook_sign_out_link(options.merge(:scope => scope))
         end
       end
 
-      # Agnostic Facebook Connect login/connect button/link.
+      # Deprecated in favor for +facebook_sign_in_link+.
       #
-      # Case 1: If Facebook account already connected to the app/site, this is same as
-      # a traditional "account login" but with the Facebook dialog unless already
+      def facebook_login_link(options = {})
+        ::ActiveSupport::Deprecation.warn("facebook_login_link is deprecated. Use: facebook_sign_in_link")
+        facebook_sign_in_link(options)
+      end
+
+      # Deprecated in favor for +facebook_sign_in_link+.
+      #
+      def facebook_logout_link(options = {})
+        ::ActiveSupport::Deprecation.warn("facebook_logout_link is deprecated. Use: facebook_sign_out_link")
+        facebook_sign_out_link(options)
+      end
+
+      # Agnostic Facebook Connect sign in/out (connect) button/link.
+      #
+      # *Case 1:* If Facebook account already connected to the app/site, this is same as
+      # a traditional "account sign in" but with the Facebook dialog unless already
       # logged in to Facebook.
       # 
-      # Case 2: If account is not connected to the app/site already;
+      # *Case 2:* If account is not connected to the app/site already;
       # then this is the same as a traditional "create account".
       #
-      def facebook_login_or_connect_link(options = {})
-        resource = options.delete(:for)
+      def facebook_sign_in_link(options = {})
+        scope = auto_detect_scope(options.slice(:scope, :for))
+        options.except!(:scope, :for)
         options.reverse_merge!(
-            :label => ::I18n.t(:facebook_login, :scope => [:devise, :sessions]),
+            :label => ::I18n.t(:sign_in, :scope => [:devise, :sessions, :facebook_actions]),
             :size => :large,
             :length => :long,
             :background => :white,
             :button => true,
             :autologoutlink => false
           )
+        options.merge!(:sign_out => true) if options[:autologoutlink] && signed_in?(scope)
 
-        # It seems Devise using :get method for session destroy. Not really RESTful?
-        # options.merge!(:method => :delete) if options[:autologoutlink] && signed_in?(options[:for])
-
-        content_tag(:span, :class => 'fb_connect_login_link') do
-          facebook_connect_form(resource, options.slice(:method)) <<
+        content_tag(:div, :class => 'facebook_connect_link sign_in') do
+          facebook_connect_form(scope, options.slice(:method)) <<
           if options[:button]
-            fb_login_button('devise.facebook_connectable.login();', options)
+            fb_login_button('devise.facebook_connectable.sign_in();', options)
           else
-            fb_logout_link(options[:label], 'devise.facebook_connectable.login_with_callback();')
+            fb_logout_link(options[:label], 'devise.facebook_connectable.sign_in_with_callback();')
           end
         end
       end
-      alias :facebook_login_link :facebook_login_or_connect_link
-      alias :facebook_connect_link :facebook_login_or_connect_link
+      alias :facebook_connect_link :facebook_sign_in_link
 
-      # Agnostic Facebook Connect logout button/link. Logs out the current
+      # Agnostic Facebook Connect sign_out button/link. Logs out the current
       # user from both the app/site and Facebook main site (for security reasons).
       #
-      def facebook_logout_link(options = {})
+      def facebook_sign_out_link(options = {})
+        scope = auto_detect_scope(options.slice(:scope, :for))
+        options.except!(:scope, :for)
         options.reverse_merge!(
-            :label => ::I18n.t(:facebook_logout, :scope => [:devise, :sessions]),
+            :label => ::I18n.t(:sign_out, :scope => [:devise, :sessions, :facebook_actions]),
             :size => :large,
             :length => :long,
             :background => :white,
             :button => false
           )
 
-        content_tag(:span, :class => 'fb_connect_logout_link') do
-          facebook_connect_form(options.delete(:for), :logout => true, :method => :get) <<
+        content_tag(:div, :class => 'facebook_connect_link sign_out') do
+          facebook_connect_form(scope, :sign_out => true, :method => :get) <<
           if options[:button]
-            fb_login_button('devise.facebook_connectable.logout();', options.merge(:autologoutlink => true))
+            fb_login_button('devise.facebook_connectable.sign_out();', options.merge(:autologoutlink => true))
           else
             fb_logout_link(options[:label], destroy_session_path(:user))
           end
@@ -106,7 +118,7 @@ module Devise
       # Disconnects, i.e. deletes, user account. Identical as "Delete my account",
       # but for Facebook Connect (which "un-installs" the app/site for the current user).
       #
-      # References:
+      # == References:
       #
       #   * http://wiki.developers.facebook.com/index.php/Auth.revokeAuthorization
       #
@@ -114,7 +126,7 @@ module Devise
         raise "facebook_disconnect_link: Not implemented yet."
         # TODO: 
         # options.reverse_merge!(
-        #     :label => ::I18n.t(:facebook_logout, :scope => [:devise, :sessions]),
+        #     :label => ::I18n.t(:facebook_disconnect, :scope => [:devise, :sessions, :actions]),
         #   )
         # content_tag(:div, :class => 'fb_connect_disconnect_link') do
         #   link_to_function(options[:label], 'devise.facebook_connectable.disconnect_with_callback();')
@@ -123,21 +135,49 @@ module Devise
 
       protected
 
-        # Generate agnostic hidden login/logout form for Facebook Connect.
+        # Auto-detect Devise scope using +Warden::Manager.default_scope+.
+        # Used to make the link-helpers smart if - like in most cases -
+        # only one devise scope will be used, e.g. "user" or "account".
+        #
+        def auto_detect_scope(options = {})
+          scope = options[:scope] || options[:for]
+          scope ||= ::Warden::Manager.default_scope
+          mapping = ::Devise::Mapping.new(scope, {})
+
+          if mapping.for.include?(:facebook_connectable)
+            scope
+          else
+            error_message = 
+              "devise/facebook_connectable: %s" <<
+              " Did you forget to devise facebook_connect in your model? Like this: devise :facebook_connectable." <<
+              " You can also specify scope explicitly, e.g.: facebook_*link :for => :customer."
+            error_message %=
+              if scope.present?
+                "#{scope.inspect} is not a valid facebook_connectable devise scope. " <<
+                "Loaded modules for this scope: #{mapping.for.inspect}."
+              else
+                "Could not auto-detect any facebook_connectable devise-model."
+              end
+            raise error_message
+          end
+        end
+
+        # Generate agnostic hidden sign in/out (connect) form for Facebook Connect.
         #
-        def facebook_connect_form(for_resource, options = {})
-          logout_form = options.delete(:logout) || (options[:method] == :delete)
+        def facebook_connect_form(scope, options = {})
+          sign_out_form = options.delete(:sign_out)
           options.reverse_merge!(
-              :id => (logout_form ? 'fb_connect_logout_form' : 'fb_connect_login_form'),
+              :id => (sign_out_form ? 'fb_connect_sign_out_form' : 'fb_connect_sign_in_form'),
               :style => 'display:none;'
             )
-          resource = ::Devise::Mapping.find_by_path(request.path).to rescue for_resource
-          url = logout_form ? destroy_session_path(resource) : session_path(resource)
-          form_for(resource, :url => url, :html => options) { |f| }
+          scope = ::Devise::Mapping.find_by_path(request.path).to rescue scope
+          url = sign_out_form ? destroy_session_path(scope) : session_path(scope)
+
+          form_for(scope, :url => url, :html => options) { |f| }
         end
 
     end
   end
 end
 
-::ActionView::Base.send :include, ::Devise::FacebookConnectable::Helpers
+::ActionView::Base.send :include, Devise::FacebookConnectable::Helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_facebook_connectable
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 +01:00
+date: 2009-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.7.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: facebooker
@@ -59,7 +59,6 @@ extra_rdoc_files:
 - lib/devise_facebook_connectable/model.rb
 - lib/devise_facebook_connectable/routes.rb
 - lib/devise_facebook_connectable/schema.rb
-- lib/devise_facebook_connectable/serializer.rb
 - lib/devise_facebook_connectable/strategy.rb
 - lib/devise_facebook_connectable/view_helpers.rb
 files: 
@@ -73,7 +72,6 @@ files:
 - lib/devise_facebook_connectable/model.rb
 - lib/devise_facebook_connectable/routes.rb
 - lib/devise_facebook_connectable/schema.rb
-- lib/devise_facebook_connectable/serializer.rb
 - lib/devise_facebook_connectable/strategy.rb
 - lib/devise_facebook_connectable/view_helpers.rb
 has_rdoc: true

data/lib/devise_facebook_connectable/serializer.rb

@@ -1,4 +0,0 @@
-# encoding: utf-8
-require 'devise/serializers/authenticatable'
-
-Warden::Serializers.add(:facebook_connectable, Devise::Serializers::Authenticatable)