devise_facebook_connectable 0.1.6 → 0.1.7

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -9,6 +9,13 @@ module Devise #:nodoc:
       #
       module Filters
 
+        # == References
+        #
+        # For more info about the available Facebooker controller methods:
+        #
+        #   * http://github.com/mmangino/facebooker/blob/master/lib/facebooker/rails/controller.rb
+        #
+
         def self.included(base) #:nodoc:
           base.class_eval do
             before_filter :expired_session_hack
@@ -24,7 +31,12 @@ module Devise #:nodoc:
             def expired_session_hack
               clear_facebook_session_information
             rescue
-              # rescue in ruby 1.9
+              if RUBY_VERSION >= '1.9' && RAILS_GEM_VERSION == '2.3.4'
+                # Rails 2.3.4 on Ruby 1.9 issue. Should not happen in Rails 2.3.5+
+                # See: https://rails.lighthouseapp.com/projects/8994/tickets/3144
+                raise "Error caused by a known session handling bug in Rails 2.3.4 on Ruby 1.9." <<
+                  " Please try to install Rails 2.3.5+ to be on the safe side."
+              end
             end
 
             # Handle expired Facebook sessions automatically.

data/lib/devise_facebook_connectable/strategy.rb

@@ -16,7 +16,7 @@ module Devise #:nodoc:
         # Without a Facebook session authentication cannot proceed.
         #
         def valid?
-          ::Facebooker::Session.current.present?
+          super && ::Facebooker::Session.current.present?
         end
 
         # Authenticate user with Facebook Connect.
@@ -42,7 +42,7 @@ module Devise #:nodoc:
                 end
 
                 begin
-                  user.save_with_validation(false)
+                  user.save(false)
                   user.on_after_facebook_connect(facebook_session)
                   success!(user)
                 rescue

data/lib/devise_facebook_connectable/view_helpers.rb

@@ -32,28 +32,28 @@ module Devise #:nodoc:
 
       # Convenient sign in/out (connect) method. See below.
       #
-      def facebook_link(options = {})
-        scope = auto_detect_scope(options.slice(:scope, :for))
-        options.except!(:scope, :for)
-
+      def facebook_link(*args)
+        scope = auto_detect_scope(*args)
         unless signed_in?(scope)
-          facebook_sign_in_link(options.merge(:scope => scope))
+          facebook_sign_in_link(*args)
         else
-          facebook_sign_out_link(options.merge(:scope => scope))
+          facebook_sign_out_link(*args)
         end
       end
 
       # Deprecated in favor for +facebook_sign_in_link+.
       #
       def facebook_login_link(options = {})
-        ::ActiveSupport::Deprecation.warn("facebook_login_link is deprecated. Use: facebook_sign_in_link")
+        ::ActiveSupport::Deprecation.warn("DEPRECATION:" <<
+          " 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")
+        ::ActiveSupport::Deprecation.warn("DEPRECATION:" <<
+          " facebook_logout_link is deprecated. Use: facebook_sign_out_link.")
         facebook_sign_out_link(options)
       end
 
@@ -67,7 +67,8 @@ module Devise #:nodoc:
       # then this is the same as a traditional "create account".
       #
       def facebook_sign_in_link(options = {})
-        scope = auto_detect_scope(options.slice(:scope, :for))
+        scope = auto_detect_scope(*args)
+        options = args.extract_options!
         options.except!(:scope, :for)
         options.reverse_merge!(
             :label => ::I18n.t(:sign_in, :scope => [:devise, :sessions, :facebook_actions]),
@@ -93,8 +94,9 @@ module Devise #:nodoc:
       # 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_sign_out_link(options = {})
-        scope = auto_detect_scope(options.slice(:scope, :for))
+      def facebook_sign_out_link(*args)
+        scope = auto_detect_scope(*args)
+        options = args.extract_options!
         options.except!(:scope, :for)
         options.reverse_merge!(
             :label => ::I18n.t(:sign_out, :scope => [:devise, :sessions, :facebook_actions]),
@@ -114,7 +116,7 @@ module Devise #:nodoc:
         end
       end
 
-      # Agnostic Facebook Connect disconnect button/link.
+      # TODO: Agnostic Facebook Connect disconnect button/link.
       # 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).
       #
@@ -139,16 +141,25 @@ module Devise #:nodoc:
         # 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]
+        def auto_detect_scope(*args)
+          options = args.extract_options!
+          
+          if options.key?(:for)
+            options[:scope] = options[:for]
+            ::ActiveSupport::Deprecation.warn("DEPRECATION: " <<
+              "Devise scope :for option is deprecated. " <<
+              "Use: facebook_*_link(:some_scope), or facebook_*_link(:scope => :some_scope)")
+          end
+          
+          scope = args.detect { |arg| arg.is_a?(Symbol) } || options[:scope]
           scope ||= ::Warden::Manager.default_scope
-          mapping = ::Devise::Mapping.new(scope, {})
-
+          mapping = ::Devise.mappings[scope]
+          
           if mapping.for.include?(:facebook_connectable)
             scope
           else
             error_message = 
-              "devise/facebook_connectable: %s" <<
+              "%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 %=
@@ -156,7 +167,7 @@ module Devise #:nodoc:
                 "#{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."
+                "Could not auto-detect any facebook_connectable devise scope."
               end
             raise error_message
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_facebook_connectable
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +01:00
+date: 2010-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency