devise_facebook_connectable 0.1.8 → 0.1.9

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009-2010 Jonas Grimfelt
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -0,0 +1,332 @@
+h1. DEVISE / FACEBOOK CONNECTABLE
+
+_Devise << Facebook Connect_
+
+h2. What is Devise?
+
+"http://github.com/plataformatec/devise":http://github.com/plataformatec/devise
+
+h2. What is Devise Facebook Connect?
+
+*Simple:*
+
+A very straightforward *"Facebook Connect":http://wiki.developers.facebook.com/index.php/Facebook_Connect* authentication/linking with the ease of *"Devise":http://github.com/plataformatec/devise* and power of *"Facebooker":http://github.com/mmangino/facebooker*. If I may say it myself: The easiest way to get a Rails app authorized and connected with Facebook Connect. Authentication in Rails should be straightforward, right? Let's build awesome web-apps instead of re-inventing the authentication!
+
+h2. Dependencies
+
+*You'll need:*
+
+* *"devise 0.9.0+":http://github.com/plataformatec/devise* for authentication - based on "warden":http://github.com/hassox/warden/.
+* *"facebooker":http://github.com/mmangino/facebooker* for Facebook API integration.
+
+*For Ruby 1.9 support:*
+
+* *"rails 2.3.5+":http://github.com/rails/rails* which contains a required Ruby 1.9 patch that Facebooker relies on. See _Important_ for more info.
+
+h2. Installation
+
+*Gem*
+
+<pre>
+  $ sudo gem install devise_facebook_connectable
+</pre>
+
+...and in @config/environment.rb@:
+
+<pre>
+  config.gem 'devise_facebook_connectable'
+</pre>
+
+*Dependencies*
+
+Note: Should be installed automatically with the gem.
+
+<pre>
+  $ sudo gem install devise facebooker
+</pre>
+
+...and in @config/environment.rb@:
+
+<pre>
+  config.gem 'devise'
+  config.gem 'facebooker'
+</pre>
+
+h2. Setup
+
+*Devise: Setup*
+
+See "Devise":http://github.com/plataformatec/devise documentation for instructions on how to setup Devise.
+
+*Facebook Connectable + Facebooker: Setup*
+
+Installs the Facebooker stuff + required Facebook Connect javascript helpers...
+
+<pre>
+  $ ./script/generate devise_facebook_connectable --api API_KEY --secret SECRET_KEY
+    dependency  xd_receiver
+        create    public/xd_receiver.html
+        create    public/xd_receiver_ssl.html
+        create  config/facebooker.yml
+        create  public/javascripts/devise.facebook_connectable.js
+</pre>
+
+Note: The @--api@ and @--secret@ arguments only makes sense if you already got Facebook application details ready; can be configured later (see _Configuration_).
+
+*Facebook Connectable: Migration*
+
+<pre>
+  create_table :users do
+
+    t.facebook_connectable
+
+    # optional: other devise modules
+
+  end
+</pre>
+
+...and indexes (optional):
+
+<pre>
+  add_index :users, :facebook_uid, :unique => true
+</pre>
+
+...and then don't forget: @$ rake db:migrate@.
+
+*Facebook Connectable: Model*
+
+<pre>
+  class User < ActiveRecord::Base
+
+    devise :facebook_connectable
+
+    # optional: other devise modules
+
+  end
+</pre>
+
+h2. Configuration
+
+*Create a Facebook app*
+
+..if you haven't already:
+
+*"Create Facebook Application":http://facebook.com/developers/createapp.php*
+
+...with settings:
+
+Application settings > Connect > Facebook Connect Settings > Connect URL: @http://localhost:3000@ (for testing purposes)
+Application settings > Advanced > Advanced Settings > Sandbox Mode: @Enabled@
+
+...and for next step, copy-paste: @API Key@ and @Application Secret@
+
+*@config/facebooker.yml@*
+
+...should look something like this:
+
+<pre>
+  # ...
+  defaults: &defaults
+    api_key: YOUR_APP_API_KEY
+    secret_key: YOUR_APP_SECRET_KEY
+  # ...
+</pre>
+
+Note: For Facebook Connect only @api_key@, @secret_key@, and @Connect URL@ (configured in Facebook Application settings manager) are required.
+
+*I18n*
+
+Sign in/out link labels, and Flash error messages can be set using I18n:
+
+<pre>
+  en:
+    devise:
+      sessions:
+        facebook_invalid: "Could not sign in. Invalid account."
+        facebook_timeout: "Facebook session expired., please sign in again to continue."
+        facebook_authenticity_token: "Something went wrong. For security reasons, please sign in again."
+        facebook_actions:
+          sign_in: "Sign in"
+          sign_out: "Sign out"
+</pre>
+
+Note: The usage of @:sign_in@/@:sign_out@ depends on configration, e.g. not used for the traditional and default Facebook Connect button.
+
+h2. Usage
+
+In @app/views/layouts/application.html.*@, something like (showing only the relevant parts):
+
+<pre>
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+  <!-- REQUIRED: Include Facebook XMLNS (XML namespace). -->
+  <html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://www.facebook.com/2008/fbml">
+    <head>
+      ...
+      <!-- REQUIRED: Include Facebook Javascript (with current locale). See Facebooker documentation. -->
+      <%= fb_connect_javascript_tag(:lang => ::I18n.locale) %>
+
+      <!-- REQUIRED: Include devise_facebook_connectable Javascripts. -->
+      <%= javascript_include_tag :defaults, 'devise.facebook_connectable' %>
+      ...
+    </head>
+    <body>
+      <!-- REQUIRED: Init Facebook Javascript (using jQuery). See Facebooker documentation. -->
+      <%= init_fb_connect :XFBML, :js => :jquery %>
+      ...
+      <%= yield %>
+      ...
+    </body>
+  </html>
+</pre>
+
+*View:*
+
+...add the sign in/out (connect) link somewhere - auto-detects scope:
+
+<pre>
+  <%= facebook_link %>
+</pre>
+
+...or with explicit scope:
+
+<pre>
+  <%= facebook_link :for => :customer %>
+</pre>
+
+...or even more explicit, something like:
+
+<pre>
+  <% unless signed_in?(:user) %>
+    <%= facebook_sign_in_link :for => :user %>
+  <% else %>
+    <%= facebook_sign_out_link :for => :user %>
+  <% end %>
+</pre>
+
+etc.
+
+*Model:*
+
+...if you want to fetch and populate any data from Facebook before connect (account creation), and/or after connect (not saved automatically):
+
+<pre>
+  class User < ActiveRecord::Base
+    devise :facebook_connectable
+
+    def before_facebook_connect(fb_session)
+
+      # Just fetch what we really need from Facebook...
+      fb_session.user.populate(:locale, :current_location, :username, :name, :first_name, :last_name,
+                                :birthday_date, :sex, :city, :state, :country)
+
+      self.locale             = my_fancy_locale_parser(fb_session.user.locale)
+      self.time_zone          = fb_session.user.current_location.try(:city)
+      self.country            = fb_session.user.current_location.try(:country)
+
+      self.username           = fb_session.user.username
+
+      self.profile.real_name  = fb_session.user.name
+      self.profile.first_name = fb_session.user.first_name
+      self.profile.last_name  = fb_session.user.last_name
+      self.profile.birthdate  = fb_session.user.birthday_date.try(:to_date)
+      self.profile.gender     = my_fancy_gender_parser(fb_session.user.sex)
+
+      self.profile.city       = fb_session.user.hometown_location.try(:city)
+      self.profile.zip_code   = fb_session.user.hometown_location.try(:state)
+      self.profile.country    = fb_session.user.hometown_location.try(:country)
+
+      # etc...
+
+    end
+
+    def after_facebook_connect(fb_session)
+
+      # ...
+
+    end
+
+  end
+</pre>
+
+*DONE!*
+
+<pre>
+  $ ./script/server
+</pre>
+
+*Note:* If you experience any issues with connecting and/or signing in/out now, then I simply must have forgot something in these instructions. Please file a GitHub-issue in such case! =)
+
+h2. Example:
+
+Checkout my little *"live example":http://devise-facebook-connectable.heroku.com*.
+
+h2. Advanced Configuration
+
+In initializer @config/initializers/devise.rb@:
+
+<pre>
+  Devise.setup do |config|
+    # ...
+    config.facebook_uid_field = :facebook_uid
+    config.facebook_session_key_field = :facebook_session_key
+    config.facebook_auto_create_account = false
+    # ...
+  end
+</pre>
+
+h2. Documentation (RDoc)
+
+"Rdoc.info/devise_facebook_connectable":http://rdoc.info/projects/grimen/devise_facebook_connectable
+
+h2. Important
+
+Stuff that you need to be aware of:
+
+* Just to be clear: You need to use the @devise_facebook_connect@-helpers to sign in/out, otherwise it won't work.
+* If you sign in a resource using Facebook Connect (with this extension), you need to sign out using the the Facebook Connect sign out helpers available. If not you will end up being logged into Facebook but not to the account, and vice-versa. Messy. Would be cool with some kind of polling script that logs the user out of Facebook if the account is signed out - but not really needed now; just a bit of common sense and use the helpers and this will not be an issue.
+* For *Ruby 1.9* support you should *AVOID* installing Rails 2.3.4. This version of rails contains a bug in a session helper that Facebooker relies on. More info about the bug/patch "here":https://rails.lighthouseapp.com/projects/8994/tickets/3144. Rails 2.3.4.1 (patch release) should work.
+
+h2. References
+
+*Examples:*
+
+* "Facebooker Showcase":http://facebooker.pjkh.com - not using Devise, but same-same.
+
+*Documentation:*
+
+* "Facebooker RDoc":http://facebooker.rubyforge.org
+* "Facebook Connect Home":http://wiki.developers.facebook.com/index.php/Facebook_Connect
+* "Facebook Connect Wiki":http://wiki.developers.facebook.com/index.php/Connect/Authorization_Websites
+* "Facebook Connect Javascript SDK":http://developers.facebook.com/docs/?u=facebook.jslib.FB.Connect
+
+*Repos:*
+
+* "Facebook Connect Javascript client":http://github.com/facebook/connect-js
+
+*Similar projects:*
+
+* "authlogic_facebook_connect":http://github.com/kalasjocke/authlogic_facebook_connect - Facebook Connect for "Authlogic":http://github.com/binarylogic/authlogic by "Joakim Ekberg":http://github.com/kalasjocke (using "Facebooker":http://github.com/mmangino/facebooker)
+* "authlogic_facebook":http://github.com/GICodeWarrior/authlogic_facebook Facebook Connect for "Authlogic":http://github.com/binarylogic/authlogic by "Rusty Burchfield":http://github.com/GICodeWarrior (using "MiniFB":http://github.com/appoxy/mini_fb)
+
+h2. TODO / Known Issues
+
+Priority:
+
+* *Timeoutable* module should timeout Facebook sessions as well - configurable.
+* *Specs/Features* would be great. Skipped tests so far as I built this using experimenting as I wasn't sure how Devise and Warden was working - trial-n-error style. Would appreciate any help on this. Looking into using Cucumber + "watircuke":http://github.com/richdownie/watircuke / "culerity":http://github.com/langalex/culerity.
+* *Disconnect link helper* would makes sense, i.e. disconnect a Facebook account from the app/site (a.k.a. delete the account Facebook Connect style).
+* *Connect existing accounts* using "Connect.registerUsers":http://wiki.developers.facebook.com/index.php/Connect.registerUsers.
+* *Option: Facebooker vs. MiniFB* - a more slimmed implementation if Facebooker feels to heavy - for those who don't want to depend on Facebooker - want something more light-weight. Most probably implemented using "MiniFB":http://github.com/appoxy/mini_fb.
+* *Review controller logic* - some of my Facebooker hacks in controller might not be best practice. They seem to do the job though. =)
+
+Maybe:
+
+* *Expired sessions* aka @Facebooker::Session::SessionExpired@ appears less now after some controller filter hacks - but needs thorough testing.
+* *HAML vs ERB clash* - that I right now consider as a HAML bug - breaks the view helpers *if both ERB and HAML is used* in the same project. Can be avoided by either using HAML gem/plugin and use HAML views only, and vice-versa. Note: Something with the @form_for@-helper causing this issue.
+
+h2. License
+
+Released under the MIT license.<br />
+Copyright (c) 2009-2010 "Jonas Grimfelt":http://github.com/grimen

data/Rakefile

@@ -2,33 +2,27 @@
 require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'lib', 'devise_facebook_connectable', 'version')
 
 NAME = "devise_facebook_connectable"
-SUMMARY = %{Devise << Facebook Connect.}
-HOMEPAGE = "http://github.com/grimen/#{NAME}"
-AUTHORS = ["Jonas Grimfelt"]
-EMAIL = "grimen@gmail.com"
-SUPPORT_FILES = %w(README)
 
 begin
   gem 'jeweler'
   require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name        = NAME
-    gemspec.summary     = SUMMARY
-    gemspec.description = SUMMARY
-    gemspec.homepage    = HOMEPAGE
-    gemspec.authors     = AUTHORS
-    gemspec.email       = EMAIL
-    
-    gemspec.require_paths = %w{lib}
-    gemspec.files = SUPPORT_FILES << %w(Rakefile) <<
-      Dir.glob(File.join(*%w[{generators,lib} ** *]).to_s)
-    gemspec.extra_rdoc_files = SUPPORT_FILES
-    
-    gemspec.add_dependency 'activesupport',   '>= 2.3.0'
-    gemspec.add_dependency 'devise',          '>= 0.7.3'
-    gemspec.add_dependency 'facebooker',      '>= 1.0.55'
+  Jeweler::Tasks.new do |spec|
+    spec.name         = NAME
+    spec.version      = ::Devise::FacebookConnectable::VERSION
+    spec.summary      = %{Devise << Facebook Connect.}
+    spec.description  = spec.summary
+    spec.homepage     = "http://github.com/grimen/#{spec.name}"
+    spec.authors      = ["Jonas Grimfelt"]
+    spec.email        = "grimen@gmail.com"
+
+    spec.files = FileList['[A-Z]*', File.join(*%w[{generators,lib,rails} ** *]).to_s]
+
+    spec.add_dependency 'activesupport',   '>= 2.3.0'
+    spec.add_dependency 'devise',          '>= 0.9.0'
+    spec.add_dependency 'facebooker',      '>= 1.0.55'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -41,6 +35,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = NAME
   rdoc.options << '--line-numbers' << '--inline-source' << '--charset=UTF-8'
-  rdoc.rdoc_files.include(SUPPORT_FILES)
+  rdoc.rdoc_files.include('README.textile')
   rdoc.rdoc_files.include(File.join(*%w[lib ** *.rb]))
 end

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

@@ -1,10 +1,10 @@
 /**
  *  JavaScript Helpers for devise_facebook_connectable,
  *  to make sign in/out (connect) with Devise seamless.
- *  
+ *
  *  Note: JavaScript framework agnostic.
  */
- 
+
 if (typeof devise === 'undefined' || devise === null) {
   devise = {};
 }
@@ -13,7 +13,7 @@ if (typeof devise.facebook_connectable === 'undefined' || devise.facebook_connec
   devise.facebook_connectable = {};
 }
 
-/* 
+/*
  *  Connect/Login.
  */
 devise.facebook_connectable.sign_in = function fbc_sign_in() {
@@ -21,7 +21,7 @@ devise.facebook_connectable.sign_in = function fbc_sign_in() {
   return false;
 };
 
-/* 
+/*
  *  Connect/Login - with callback.
  */
 devise.facebook_connectable.sign_in_with_callback = function fbc_sign_in_with_callback() {
@@ -29,7 +29,7 @@ devise.facebook_connectable.sign_in_with_callback = function fbc_sign_in_with_ca
   return false;
 };
 
-/* 
+/*
  *  Logout.
  */
 devise.facebook_connectable.sign_out = function fbc_sign_out() {
@@ -37,7 +37,7 @@ devise.facebook_connectable.sign_out = function fbc_sign_out() {
   return false;
 };
 
-/* 
+/*
  *  Logout - with callback.
  */
 devise.facebook_connectable.sign_out_with_callback = function fbc_sign_out_with_callback() {
@@ -45,7 +45,7 @@ devise.facebook_connectable.sign_out_with_callback = function fbc_sign_out_with_
   return false;
 };
 
-/* 
+/*
  *  TODO: Logout.
  */
 devise.facebook_connectable.disconnect = function fbc_disconnect() {
@@ -53,7 +53,7 @@ devise.facebook_connectable.disconnect = function fbc_disconnect() {
   return false;
 };
 
-/* 
+/*
  *  TODO: Disconnect - with callback.
  */
 devise.facebook_connectable.disconnect_with_callback = function fbc_disconnect_with_callback() {

data/generators/devise_facebook_connectable/templates/facebooker.yml

@@ -2,32 +2,32 @@ defaults: &defaults
     # Required.
     api_key: <%= options[:api_key] %>
     secret_key: <%= options[:secret_key] %>
-    
+
     # Optional for Facebook Connect.
     # canvas_page_name: YOUR_APP_CANVAS_NAME
     # Optional for Facebook Connect. Depends on your Facebook App settings.
     # callback_url: http://localhost:3000
-    
+
     # Optional options.
     # pretty_errors: true
     # set_asset_host_to_callback_url: false
     # tunnel:
-    #   public_host_username: 
-    #   public_host: 
+    #   public_host_username:
+    #   public_host:
     #   public_port: 4007
     #   local_port: 3000
-    
+
 development:
   <<: *defaults
-  
+
 test: &test
   <<: *defaults
-  
+
 production: &production
   <<: *defaults
-  
+
 # staging:
 #   <<: *production
-# 
+#
 # cucumber:
 #   <<: *test

data/lib/devise_facebook_connectable.rb

@@ -13,7 +13,7 @@ rescue
   require 'facebooker'
 end
 
-require 'devise_facebook_connectable/model'
+require 'devise_facebook_connectable/model' # QUESTION: should this really be here? Autoloaded below...
 require 'devise_facebook_connectable/strategy'
 require 'devise_facebook_connectable/schema'
 require 'devise_facebook_connectable/routes'
@@ -26,13 +26,13 @@ module Devise
   # generic column if different authentication solutions are used.
   mattr_accessor :facebook_uid_field
   @@facebook_uid_field = :facebook_uid
-  
+
   # Specifies the name of the database column name used for storing
   # the user Facebook session key. Useful if this info should be saved in a
   # generic column if different authentication solutions are used.
   mattr_accessor :facebook_session_key_field
   @@facebook_session_key_field = :facebook_session_key
-  
+
   # Specifies if account should be created if no account exists for
   # a specified Facebook UID or not.
   mattr_accessor :facebook_auto_create_account
@@ -45,10 +45,7 @@ I18n.load_path.unshift File.join(File.dirname(__FILE__), *%w[devise_facebook_con
 
 # Add +:facebook_connectable+ strategies to defaults.
 #
-Devise::ALL.unshift :facebook_connectable
-Devise::STRATEGIES.unshift :facebook_connectable
-Devise::CONTROLLERS[:sessions].unshift :facebook_connectable
-
-Devise::Models.module_eval do
-  autoload :FacebookConnectable, 'devise_facebook_connectable/model'
-end
+Devise.add_module(:facebook_connectable,
+  :strategy => true,
+  :controller => :sessions,
+  :model => 'devise_facebook_connectable/model')

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -4,7 +4,7 @@ require 'facebooker/session'
 module Devise #:nodoc:
   module FacebookConnectable #:nodoc:
     module Controllers #:nodoc:
-      
+
       # Controller filters (extensions) needed for Facebook Connect.
       #
       module Filters

data/lib/devise_facebook_connectable/model.rb

@@ -7,7 +7,7 @@ module Devise #:nodoc:
   # module FacebookConnectable #:nodoc:
     module Models #:nodoc:
 
-      # Facebook Connectable Module, responsible for validating authenticity of a 
+      # Facebook Connectable Module, responsible for validating authenticity of a
       # user and storing credentials while signing in using their Facebook account.
       #
       # == Configuration:
@@ -32,7 +32,6 @@ module Devise #:nodoc:
         def self.included(base) #:nodoc:
           base.class_eval do
             extend ClassMethods
-            extend ::Devise::Models::SessionSerializer
           end
         end
 
@@ -72,31 +71,31 @@ module Devise #:nodoc:
         #   # Overridden in Facebook Connect:able model, e.g. "User".
         #   #
         #   def before_facebook_connect(fb_session)
-        #     
+        #
         #     # Just fetch what we really need from Facebook...
         #     fb_session.user.populate(:locale, :current_location, :username, :name,
         #                               :first_name, :last_name, :birthday_date, :sex,
         #                               :city, :state, :country)
-        #     
+        #
         #     self.locale             = my_fancy_locale_parser(fb_session.user.locale)
         #     "Stockholm" => "(GMT+01:00) Stockholm", "Never-Never-land" => "(GMT+00:00) UTC"
         #     self.time_zone          = fb_session.user.current_location.try(:city)
         #     self.country            = fb_session.user.current_location.try(:country)
-        #     
+        #
         #     self.username           = fb_session.user.username
-        #     
+        #
         #     self.profile.real_name  = fb_session.user.name
         #     self.profile.first_name = fb_session.user.first_name
         #     self.profile.last_name  = fb_session.user.last_name
         #     self.profile.birthdate  = fb_session.user.birthday_date.try(:to_date)
         #     self.profile.gender     = my_fancy_gender_parser(fb_session.user.sex)
-        #     
+        #
         #     self.profile.city       = fb_session.user.hometown_location.try(:city)
         #     self.profile.zip_code   = fb_session.user.hometown_location.try(:state)
         #     self.profile.country    = fb_session.user.hometown_location.try(:country)
-        #     
+        #
         #     # etc...
-        #     
+        #
         #   end
         #
         # == For more info:
@@ -108,7 +107,7 @@ module Devise #:nodoc:
             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.
         #
@@ -180,7 +179,7 @@ module Devise #:nodoc:
             self.facebook_auto_create_account
           end
 
-          # Authenticate using a Facebook UID.
+          # Authenticate a user based on Facebook UID.
           #
           def facebook_connect(attributes = {})
             if attributes[:uid].present?
@@ -196,13 +195,13 @@ module Devise #:nodoc:
             #
             # == Example:
             #
-            #   def self.find_for_facebook_connect(conditions = {})
+            #   def self.find_for_facebook_connect(uid, conditions = {})
             #     conditions[:active] = true
-            #     self.find(:first, :conditions => conditions)
+            #     self.find_by_facebook_uid(uid, :conditions => conditions)
             #   end
             #
-            def find_for_facebook_connect(uid)
-              self.find_by_facebook_uid(uid)
+            def find_for_facebook_connect(uid, conditions = {})
+              self.find_by_facebook_uid(uid, :conditions => conditions)
             end
 
             # Contains the logic used in authentication. Overwritten by other devise modules.

data/lib/devise_facebook_connectable/strategy.rb

@@ -9,9 +9,7 @@ module Devise #: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 FacebookConnectable < ::Warden::Strategies::Base
-
-        include ::Devise::Strategies::Base
+      class FacebookConnectable < ::Devise::Strategies::Base
 
         # Without a Facebook session authentication cannot proceed.
         #

data/lib/devise_facebook_connectable/version.rb

@@ -0,0 +1,5 @@
+module Devise
+  module FacebookConnectable
+    VERSION = "0.1.9".freeze
+  end
+end

data/lib/devise_facebook_connectable/view_helpers.rb

@@ -26,7 +26,7 @@ module Devise #:nodoc:
       #                         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
       #
 
@@ -62,7 +62,7 @@ module Devise #:nodoc:
       # *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;
       # then this is the same as a traditional "create account".
       #
@@ -126,7 +126,7 @@ module Devise #:nodoc:
       #
       def facebook_disconnect_link(*args)
         raise "facebook_disconnect_link: Not implemented yet."
-        # TODO: 
+        # TODO:
         # options.reverse_merge!(
         #     :label => ::I18n.t(:facebook_disconnect, :scope => [:devise, :sessions, :actions]),
         #   )
@@ -143,22 +143,22 @@ module Devise #:nodoc:
         #
         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.mappings[scope]
-          
+
           if mapping.for.include?(:facebook_connectable)
             scope
           else
-            error_message = 
+            error_message =
               "%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."

data/rails/init.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+require 'devise_facebook_connectable'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_facebook_connectable
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-26 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.3
+        version: 0.9.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: facebooker
@@ -49,19 +49,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- Rakefile
-- generators/devise_facebook_connectable/devise_facebook_connectable_generator.rb
-- generators/devise_facebook_connectable/templates/devise.facebook_connectable.js
-- generators/devise_facebook_connectable/templates/facebooker.yml
-- lib/devise_facebook_connectable.rb
-- lib/devise_facebook_connectable/controller_filters.rb
-- lib/devise_facebook_connectable/locales/en.yml
-- lib/devise_facebook_connectable/model.rb
-- lib/devise_facebook_connectable/routes.rb
-- lib/devise_facebook_connectable/schema.rb
-- lib/devise_facebook_connectable/strategy.rb
-- lib/devise_facebook_connectable/view_helpers.rb
+- README.textile
 files: 
+- MIT-LICENSE
+- README.textile
 - Rakefile
 - generators/devise_facebook_connectable/devise_facebook_connectable_generator.rb
 - generators/devise_facebook_connectable/templates/devise.facebook_connectable.js
@@ -73,7 +64,9 @@ files:
 - lib/devise_facebook_connectable/routes.rb
 - lib/devise_facebook_connectable/schema.rb
 - lib/devise_facebook_connectable/strategy.rb
+- lib/devise_facebook_connectable/version.rb
 - lib/devise_facebook_connectable/view_helpers.rb
+- rails/init.rb
 has_rdoc: true
 homepage: http://github.com/grimen/devise_facebook_connectable
 licenses: []