devise_facebook_connectable 0.1.2 → 0.1.3

data/lib/devise_facebook_connectable.rb

@@ -17,8 +17,8 @@ require 'devise_facebook_connectable/model'
 require 'devise_facebook_connectable/serializer'
 require 'devise_facebook_connectable/strategy'
 require 'devise_facebook_connectable/schema'
-require 'devise_facebook_connectable/controller_filters'
 require 'devise_facebook_connectable/routes'
+require 'devise_facebook_connectable/controller_filters'
 require 'devise_facebook_connectable/view_helpers'
 
 module Devise
@@ -48,13 +48,26 @@ I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[de
 #
 Devise::STRATEGIES.unshift :facebook_connectable
 Devise::SERIALIZERS.unshift :facebook_connectable
-# Devise::CONTROLLERS.unshift :facebook_connectable # TODO: Wait for Devise 0.7.2 release.
+Devise::CONTROLLERS[:sessions].unshift :facebook_connectable
 
-# Override to get Devise to get that SessionsController should be used for both
-# :facebook_connectable and :authenticatable. Controller-logic is the same.
-#
-Devise::Mapping.class_eval do
-  def allows?(controller)
-    (self.for & [Devise::CONTROLLERS[controller.to_sym], :facebook_connectable].flatten).present?
+# PATCH:BEGIN: Very temporary one, while awaiting Devise 0.7.2.
+Devise::Models.module_eval do
+  def devise(*modules)
+    raise "You need to give at least one Devise module" if modules.empty?
+    
+    options  = modules.extract_options!
+    modules  = Devise.all if modules.include?(:all)
+    modules -= Array(options.delete(:except))
+    # PATCH: REMOVED: modules  = Devise::ALL & modules
+    
+    Devise.orm_class.included_modules_hook(self, modules) do
+      modules.each do |m|
+        devise_modules << m.to_sym
+        include Devise::Models.const_get(m.to_s.classify)
+      end
+      
+      options.each { |key, value| send(:"#{key}=", value) }
+    end
   end
 end
+# PATCH:END

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
-require 'facebooker'
+require 'facebooker/session'
 
 module Devise
   module FacebookConnectable
     module Controllers
       module Filters
 
-        def self.included(klass)
-          klass.class_eval do
+        def self.included(base)
+          base.class_eval do
             before_filter :expired_session_hack
             before_filter :set_facebook_session
             rescue_from ::Facebooker::Session::SessionExpired, :with => :facebook_session_expired

data/lib/devise_facebook_connectable/model.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'devise/models'
+require 'facebooker/session'
 require 'devise_facebook_connectable/strategy'
 require 'devise_facebook_connectable/serializer'
 

data/lib/devise_facebook_connectable/schema.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'devise/schema'
 require 'devise_facebook_connectable/model'
 
 module Devise
@@ -8,9 +9,8 @@ module Devise
       # Creates facebook_uid and facebook_session_key (for Facebook Connect authentication/management).
       #
       def facebook_connectable
-        apply_schema ::Devise.facebook_uid_field, Integer, :limit => 8   # BIGINT unsigned / 64-bit int
-        # apply_schema ::Devise.facebook_uid_field, String
-        apply_schema ::Devise.facebook_session_key_field, String
+        apply_schema ::Devise.facebook_uid_field, Integer, :limit => 8  # BIGINT unsigned / 64-bit int
+        apply_schema ::Devise.facebook_session_key_field, String, :limit => 149  # [128][1][20] chars
       end
 
     end

data/lib/devise_facebook_connectable/serializer.rb

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

data/lib/devise_facebook_connectable/strategy.rb

@@ -1,13 +1,14 @@
 # encoding: utf-8
-require 'facebooker'
+require 'devise/strategies/base'
+require 'facebooker/session'
 
 module Devise
-  module Strategies
+  module FacebookConnectable
 
     # 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
+    class Strategy < ::Warden::Strategies::Base
 
       include ::Devise::Strategies::Base
 
@@ -59,4 +60,4 @@ module Devise
   end
 end
 
-Warden::Strategies.add(:facebook_connectable, Devise::Strategies::FacebookConnectable)
+Warden::Strategies.add(:facebook_connectable, Devise::FacebookConnectable::Strategy)

data/lib/devise_facebook_connectable/view_helpers.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'devise/mapping'
 
 module Devise
   module FacebookConnectable

metadata

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