devise_facebook_connectable 0.1.4 → 0.1.5

data/generators/devise_facebook_connectable/devise_facebook_connectable_generator.rb

@@ -2,6 +2,9 @@
 
 class DeviseFacebookConnectableGenerator < Rails::Generator::Base
 
+  default_options :api_key => "YOUR_APP_API_KEY",
+                  :secret_key => "YOUR_APP_SECRET_KEY"
+
   def manifest
     record do |m|
       m.dependency 'xd_receiver', [], options.merge(:collision => :skip)
@@ -10,4 +13,23 @@ class DeviseFacebookConnectableGenerator < Rails::Generator::Base
     end
   end
 
+  protected
+
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+
+      opt.on('--api API_KEY', "Facebook Application API key.") do |v|
+        options[:api_key] = v if v.present?
+      end
+
+      opt.on('--secret SECRET_KEY', "Facebook Application Secret key.") do |v|
+        options[:secret_key] = v if v.present?
+      end
+    end
+
+    def banner
+      "Usage: #{$0} devise_facebook_connectable [--api API_KEY] [--secret SECRET_KEY]"
+    end
+
 end

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

@@ -1,5 +1,8 @@
 /**
- *  Helpers for devise_facebook_connectable, to make connect/login/logout with Devise seamless.
+ *  JavaScript Helpers for devise_facebook_connectable,
+ *  to make connect/login/logout with Devise seamless.
+ *  
+ *  Note: JavaScript framework agnostic.
  */
  
 if (typeof devise === 'undefined' || devise === null) {
@@ -10,22 +13,51 @@ if (typeof devise.facebook_connectable === 'undefined' || devise.facebook_connec
   devise.facebook_connectable = {};
 }
 
-devise.facebook_connectable.login = function fb_connect_login() {
+/* 
+ *  Connect/Login.
+ */
+devise.facebook_connectable.login = function fbc_login() {
   document.getElementById('fb_connect_login_form').submit();
   return false;
 };
 
-devise.facebook_connectable.custom_login = function fb_connect_custom_login() {
-  FB.Connect.requireSession(fb_connect_login);
+/* 
+ *  Connect/Login - with callback.
+ */
+devise.facebook_connectable.login_with_callback = function fbc_login_with_callback() {
+  FB.Connect.requireSession(devise.facebook_connectable.login);
   return false;
 };
 
-devise.facebook_connectable.logout = function fb_connect_logout() {
+/* 
+ *  Logout.
+ */
+devise.facebook_connectable.logout = function fbc_logout() {
   document.getElementById('fb_connect_logout_form').submit();
   return false;
 };
 
-devise.facebook_connectable.custom_logout = function fb_connect_custom_logout() {
-  FB.Connect.logout(fb_connect_logout);
+/* 
+ *  Logout - with callback.
+ */
+devise.facebook_connectable.logout_with_callback = function fbc_logout_with_callback() {
+  FB.Connect.logout(devise.facebook_connectable.logout);
   return false;
-};
+};
+
+/* 
+ *  TODO: Logout.
+ */
+devise.facebook_connectable.disconnect = function fbc_disconnect() {
+  // TODO: Implement
+  return false;
+};
+
+/* 
+ *  TODO: Disconnect - with callback.
+ */
+devise.facebook_connectable.disconnect_with_callback = function fbc_disconnect_with_callback() {
+  // FIXME: FB.api don't seems to be loaded correctly - Facebooker issue?
+  // FB.api({method: 'Auth.revokeAuthorization'}, devise.facebook_connectable.disconnect);
+  return false;
+};

data/generators/devise_facebook_connectable/templates/facebooker.yml

@@ -1,28 +1,33 @@
 defaults: &defaults
-    api_key: YOUR_APP_API_KEY
-    secret_key: YOUR_APP_SECRET_KEY
-    canvas_page_name: YOUR_APP_CANVAS_NAME
-    callback_url: http://localhost:3000 # for testing - depends on your Facebook App settings though.
-    pretty_errors: true
-    set_asset_host_to_callback_url: false
-    tunnel:
-      public_host_username: 
-      public_host: 
-      public_port: 4007
-      local_port: 3000
-      
-  development:
-    <<: *defaults
+    # Required.
+    api_key: <%= options[:api_key] %>
+    secret_key: <%= options[:secret_key] %>
     
-  test: &test
-    <<: *defaults
+    # 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
     
-  cucumber:
-    <<: *test
+    # Optional options.
+    # pretty_errors: true
+    # set_asset_host_to_callback_url: false
+    # tunnel:
+    #   public_host_username: 
+    #   public_host: 
+    #   public_port: 4007
+    #   local_port: 3000
     
-  production: &production
-    <<: *defaults
-    
-  staging:
-    <<: *production
-    
+development:
+  <<: *defaults
+  
+test: &test
+  <<: *defaults
+  
+production: &production
+  <<: *defaults
+  
+# staging:
+#   <<: *production
+# 
+# cucumber:
+#   <<: *test

data/lib/devise_facebook_connectable.rb

@@ -36,8 +36,8 @@ module Devise
   
   # Specifies if account should be created if no account exists for
   # a specified Facebook UID or not.
-  mattr_accessor :facebook_skip_create
-  @@facebook_skip_create = false
+  mattr_accessor :facebook_auto_create_account
+  @@facebook_auto_create_account = true
 end
 
 # Load core I18n locales: en

data/lib/devise_facebook_connectable/controller_filters.rb

@@ -18,6 +18,8 @@ module Devise
             #
             def expired_session_hack
               clear_facebook_session_information
+            rescue
+              # rescue in ruby 1.9
             end
 
             # Handle expired Facebook sessions automatically.

data/lib/devise_facebook_connectable/model.rb

@@ -20,8 +20,8 @@ module Devise
       #
       #   facebook_session_key_field: Defines the name of the Facebook session key database attribute/column.
       #
-      #   facebook_skip_create: Speifies if account should automatically be created upon connect
-      #                         if not already exists.
+      #   facebook_auto_create_account: Speifies if account should automatically be created upon connect
+      #                                 if not already exists.
       #
       # Examples:
       #
@@ -140,19 +140,19 @@ module Devise
           #   Devise.setup do |config|
           #     config.facebook_uid_field = :facebook_uid
           #     config.facebook_session_key_field = :facebook_session_key
-          #     config.facebook_skip_create = false
+          #     config.facebook_auto_create_account = true
           #   end
           #
           ::Devise::Models.config(self,
               :facebook_uid_field,
               :facebook_session_key_field,
-              :facebook_skip_create
+              :facebook_auto_create_account
             )
 
           # Alias don't work for some reason, so...a more Ruby-ish alias
-          # for +facebook_skip_create+.
-          def facebook_skip_create?
-            self.facebook_skip_create
+          # for +facebook_auto_create_account+.
+          def facebook_auto_create_account?
+            self.facebook_auto_create_account
           end
 
           # Authenticate using a Facebook UID.

data/lib/devise_facebook_connectable/strategy.rb

@@ -31,9 +31,7 @@ module Devise
           if user.present?
             success!(user)
           else
-            if klass.facebook_skip_create?
-              fail!(:facebook_invalid)
-            else
+            if klass.facebook_auto_create_account?
               user = returning(klass.new) do |u|
                 u.store_facebook_credentials!(
                     :session_key => facebook_session.session_key,
@@ -48,6 +46,8 @@ module Devise
               rescue
                 fail!(:facebook_invalid)
               end
+            else
+              fail!(:facebook_invalid)
             end
           end
         # NOTE: Handled in the controller.

data/lib/devise_facebook_connectable/view_helpers.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 require 'devise/mapping'
 
+# 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 Helpers
@@ -62,12 +68,12 @@ module Devise
         # 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(:div, :class => 'fb_connect_login_link') do
+        content_tag(:span, :class => 'fb_connect_login_link') do
           facebook_connect_form(resource, options.slice(:method)) <<
           if options[:button]
             fb_login_button('devise.facebook_connectable.login();', options)
           else
-            fb_logout_link(options[:label], 'devise.facebook_connectable.custom_login();')
+            fb_logout_link(options[:label], 'devise.facebook_connectable.login_with_callback();')
           end
         end
       end
@@ -86,7 +92,7 @@ module Devise
             :button => false
           )
 
-        content_tag(:div, :class => 'fb_connect_logout_link') do
+        content_tag(:span, :class => 'fb_connect_logout_link') do
           facebook_connect_form(options.delete(:for), :logout => true, :method => :get) <<
           if options[:button]
             fb_login_button('devise.facebook_connectable.logout();', options.merge(:autologoutlink => true))
@@ -96,12 +102,23 @@ module Devise
         end
       end
 
-      # TODO: Agnostic Facebook Connect disconnect button/link.
+      # 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).
       #
+      # References:
+      #
+      #   * http://wiki.developers.facebook.com/index.php/Auth.revokeAuthorization
+      #
       def facebook_disconnect_link(options = {})
         raise "facebook_disconnect_link: Not implemented yet."
+        # TODO: 
+        # options.reverse_merge!(
+        #     :label => ::I18n.t(:facebook_logout, :scope => [:devise, :sessions]),
+        #   )
+        # content_tag(:div, :class => 'fb_connect_disconnect_link') do
+        #   link_to_function(options[:label], 'devise.facebook_connectable.disconnect_with_callback();')
+        # end
       end
 
       protected

metadata

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