devise_facebook_connectable 0.2.0 → 0.2.1

data/Rakefile

@@ -21,7 +21,7 @@ begin
     spec.files = FileList['[A-Z]*', File.join(*%w[{generators,lib,rails} ** *]).to_s]
 
     spec.add_dependency 'activesupport',   '>= 2.3.0'
-    spec.add_dependency 'devise',          '1.0.0'
+    spec.add_dependency 'devise',          '>= 1.0.0'
     spec.add_dependency 'facebooker',      '>= 1.0.55'
   end
   Jeweler::GemcutterTasks.new

data/lib/devise_facebook_connectable.rb

@@ -1,17 +1,6 @@
 # encoding: utf-8
-begin
-  require 'devise'
-rescue
-  gem 'devise'
-  require 'devise'
-end
-
-begin
-  require 'facebooker'
-rescue
-  gem 'facebooker'
-  require 'facebooker'
-end
+require 'devise'
+require 'facebooker'
 
 require 'devise_facebook_connectable/model' # QUESTION: should this really be here? Autoloaded below...
 require 'devise_facebook_connectable/strategy'

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'facebooker/session'
+require 'action_controller'
 
 module Devise #:nodoc:
   module FacebookConnectable #:nodoc:
@@ -15,7 +16,6 @@ module Devise #:nodoc:
         #
         #   * 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
@@ -30,6 +30,7 @@ module Devise #:nodoc:
             #
             def expired_session_hack
               clear_facebook_session_information
+              Facebooker::Session.current = nil
             rescue
               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+

data/lib/devise_facebook_connectable/model.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require 'devise/models'
 require 'facebooker/session'
-require 'devise_facebook_connectable/strategy'
 
 module Devise #:nodoc:
   # module FacebookConnectable #:nodoc:
@@ -181,7 +180,7 @@ module Devise #:nodoc:
 
           # Authenticate a user based on Facebook UID.
           #
-          def facebook_connect(attributes = {})
+          def authenticate_with_facebook_connect(attributes = {})
             if attributes[:uid].present?
               self.find_for_facebook_connect(attributes[:uid])
             end

data/lib/devise_facebook_connectable/schema.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'devise/schema'
-require 'devise_facebook_connectable/model'
 
 module Devise #:nodoc:
   module FacebookConnectable #:nodoc:

data/lib/devise_facebook_connectable/strategy.rb

@@ -14,7 +14,7 @@ module Devise #:nodoc:
         # Without a Facebook session authentication cannot proceed.
         #
         def valid?
-          super && ::Facebooker::Session.current.present?
+          mapping.to.respond_to?('authenticate_with_facebook_connect') && ::Facebooker::Session.current.present?
         end
 
         # Authenticate user with Facebook Connect.
@@ -25,7 +25,7 @@ module Devise #:nodoc:
             facebook_session = ::Facebooker::Session.current # session[:facebook_session]
             facebook_user = facebook_session.user
 
-            user = klass.facebook_connect(:uid => facebook_user.uid)
+            user = klass.authenticate_with_facebook_connect(:uid => facebook_user.uid)
 
             if user.present?
               success!(user)

data/lib/devise_facebook_connectable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module FacebookConnectable
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/lib/devise_facebook_connectable/view_helpers.rb

@@ -121,7 +121,7 @@ module Devise #:nodoc:
 
       protected
 
-        # Auto-detect Devise scope using +Warden::Manager.default_scope+.
+        # Auto-detect Devise scope using +Devise.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".
         #
@@ -135,8 +135,7 @@ module Devise #:nodoc:
               "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
+          scope = args.detect { |arg| arg.is_a?(Symbol) } || options[:scope] || ::Devise.default_scope
           mapping = ::Devise.mappings[scope]
 
           if mapping.for.include?(:facebook_connectable)
@@ -165,7 +164,7 @@ module Devise #:nodoc:
               :id => (sign_out_form ? 'fb_connect_sign_out_form' : 'fb_connect_sign_in_form'),
               :style => 'display:none;'
             )
-          scope = ::Devise::Mapping.find_by_path(request.path).to rescue scope
+          scope = ::Devise::Mapping.find_by_path(request.path).name rescue scope
           url = sign_out_form ? destroy_session_path(scope) : session_path(scope)
 
           form_for(scope, :url => url, :html => options) { |f| }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1