devise_koala_connectable 0.1.3 → 0.1.4

data/Manifest

@@ -1,7 +1,6 @@
 CHANGELOG
 README.rdoc
 Rakefile
-devise_koala_connectable.gemspec
 lib/devise_koala_connectable.rb
 lib/devise_koala_connectable/locales/de.yml
 lib/devise_koala_connectable/locales/en.yml

data/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 require "rake"
 require "echoe"
 
-Echoe.new("devise_koala_connectable", "0.1.3") do |p|
+Echoe.new("devise_koala_connectable", "0.1.4") do |p|
   p.description = "Rails gem for adding Facebook authentification capabillity to devise using koala"
   p.url         = "http://github.com/webmatze/devise_koala_connectable"
   p.author      = "Mathias Karstädt"

data/devise_koala_connectable.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_koala_connectable}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mathias Karst\303\244dt"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-03-23}
   s.description = %q{Rails gem for adding Facebook authentification capabillity to devise using koala}
   s.email = %q{mathias.karstaedt@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/devise_koala_connectable.rb", "lib/devise_koala_connectable/locales/de.yml", "lib/devise_koala_connectable/locales/en.yml", "lib/devise_koala_connectable/model.rb", "lib/devise_koala_connectable/schema.rb", "lib/devise_koala_connectable/strategy.rb", "lib/devise_koala_connectable/version.rb", "lib/devise_koala_connectable/view_helpers.rb"]
-  s.files = ["CHANGELOG", "README.rdoc", "Rakefile", "devise_koala_connectable.gemspec", "lib/devise_koala_connectable.rb", "lib/devise_koala_connectable/locales/de.yml", "lib/devise_koala_connectable/locales/en.yml", "lib/devise_koala_connectable/model.rb", "lib/devise_koala_connectable/schema.rb", "lib/devise_koala_connectable/strategy.rb", "lib/devise_koala_connectable/version.rb", "lib/devise_koala_connectable/view_helpers.rb", "rails/init.rb", "Manifest"]
+  s.files = ["CHANGELOG", "README.rdoc", "Rakefile", "lib/devise_koala_connectable.rb", "lib/devise_koala_connectable/locales/de.yml", "lib/devise_koala_connectable/locales/en.yml", "lib/devise_koala_connectable/model.rb", "lib/devise_koala_connectable/schema.rb", "lib/devise_koala_connectable/strategy.rb", "lib/devise_koala_connectable/version.rb", "lib/devise_koala_connectable/view_helpers.rb", "rails/init.rb", "Manifest", "devise_koala_connectable.gemspec"]
   s.homepage = %q{http://github.com/webmatze/devise_koala_connectable}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Devise_koala_connectable", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/devise_koala_connectable.rb

@@ -14,7 +14,7 @@ require 'devise_koala_connectable/view_helpers'
 module Devise
   mattr_accessor :koala_identifier_field
   @@koala_identifier_field = :koala_identifier
-  
+
   mattr_accessor :koala_auto_create_account
   @@koala_auto_create_account = true
 
@@ -26,7 +26,7 @@ module Devise
 
   mattr_accessor :koala_callback_url
   @@koala_callback_url = nil
-  
+
 end
 
 I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[devise_koala_connectable locales en.yml]))

data/lib/devise_koala_connectable/model.rb

@@ -75,7 +75,7 @@ module Devise #:nodoc:
       def on_before_koala_success(koala_user)
         self.send(:before_koala_success, koala_user) if self.respond_to?(:before_koala_success)
       end
-      
+
       # Hook that gets called before the auto creation of the user.
       # Therefore, this hook is only called when koala_auto_create_account config option is enabled.
       # Useful for fetching additional user info (etc.) from Facebook.

data/lib/devise_koala_connectable/strategy.rb

@@ -11,7 +11,7 @@ module Devise #:nodoc:
       class KoalaConnectable < Base
 
         def valid?
-          ((valid_controller? && cookie_present?) || signed_request?) && mapping.to.respond_to?('authenticate_with_koala')
+          ((valid_controller? && cookie_present? && koala_request?) || signed_request?) && mapping.to.respond_to?('authenticate_with_koala')
         end
 
         # Authenticate user with Koala.
@@ -22,7 +22,7 @@ module Devise #:nodoc:
           raise StandardError, "No api_key or secret_key defined, please see the documentation of Koala gem to setup it." unless klass.koala_app_id.present? and klass.koala_secret_key.present?
           begin
             oauth = Koala::Facebook::OAuth.new(klass.koala_app_id, klass.koala_secret_key, klass.koala_callback_url)
-            
+
             if signed_request?
               user_info = oauth.parse_signed_request params[:signed_request]
               unless user_info.present? #if no valid signed facebook request  found
@@ -40,61 +40,65 @@ module Devise #:nodoc:
               user_id = user_info["uid"]
               access_token = user_info["access_token"]
             end
-              
+
             Rails.logger.debug "user_info: #{user_info.to_yaml}"
 
             graph = Koala::Facebook::GraphAPI.new(access_token)
             koala_user = graph.get_object(user_id)
-            
+
             Rails.logger.debug koala_user.to_yaml
 
             unless koala_user
-              fail(:koala_invalid)
-              return 
+              fail!(:koala_invalid)
+              return
             end
-            
+
             if user = klass.authenticate_with_koala(koala_user)
               user.on_before_koala_success(koala_user)
               success!(user)
               return
             end
-            
+
             unless klass.koala_auto_create_account? or signed_request?
-              fail(:koala_invalid)
-              return 
+              fail!(:koala_invalid)
+              return
             end
-            
+
             user = klass.new
             user.store_koala_credentials!(koala_user)
             koala_user["registration"] = user_info if signed_request?
             user.on_before_koala_auto_create(koala_user)
-            
+
             user.save(:validate => false)
             user.on_before_koala_success(koala_user)
             success!(user)
-            
+
           rescue Exception => e
             Rails.logger.error e.to_yaml
-            fail(:koala_invalid)
+            fail!(:koala_invalid)
           end
         end
-        
+
         protected
           def valid_controller?
             params[:controller].to_s =~ /sessions/
           end
-          
+
           def cookie_present?
             klass = mapping.to
             raise StandardError, "No api_key or secret_key defined, please see the documentation of Koala gem to setup it." unless klass.koala_app_id.present? and klass.koala_secret_key.present?
             oauth = Koala::Facebook::OAuth.new(klass.koala_app_id, klass.koala_secret_key, klass.koala_callback_url)
             oauth.get_user_info_from_cookies(request.cookies).present?
           end
-          
+
           def signed_request?
             params[:signed_request].present?
           end
 
+          def koala_request?
+            params[:koala].present?
+          end
+
       end
     end
 

data/lib/devise_koala_connectable/view_helpers.rb

@@ -6,7 +6,7 @@ module Devise #:nodoc:
     # Koala view helpers to easily add the link to the Facebook connection popup and also the necessary JS code.
     #
     module Helpers
-      
+
       # Creates the link to the Facebook connection popup.
       # If you create a link without putting the JS code, the popup will load in a new page.
       # The second parameter is the return URL, it must be absolute (***_url).
@@ -16,13 +16,13 @@ module Devise #:nodoc:
       #
       def link_to_koala(link_text, link_url, options={})
         options = { :unobtrusive => true }.merge(options)
-    		oauth = Koala::Facebook::OAuth.new(Devise::koala_app_id, Devise::koala_secret_key, Devise::koala_callback_url)
-    		link_to link_text, oauth.url_for_oauth_code(:callback => link_url), options
+        oauth = Koala::Facebook::OAuth.new(Devise::koala_app_id, Devise::koala_secret_key, Devise::koala_callback_url)
+        link_to link_text, oauth.url_for_oauth_code(:callback => link_url), options
       end
 
       # Returns the necessary JS code for the Facebook popup.
       # It is recommended to put this code just before the </body> tag of your layout.
-      # 
+      #
       # For example :
       # ...
       # <%= javascript_include_koala %>
@@ -30,19 +30,19 @@ module Devise #:nodoc:
       # </html>
       #
       def javascript_include_koala
-    		"<div id=\"fb-root\"></div>
+        "<div id=\"fb-root\"></div>
         <script src=\"http://connect.facebook.net/en_US/all.js\"></script>
         <script>
-           FB.init({ 
-              appId:'#{Devise::koala_app_id}', cookie:true, 
-              status:true, xfbml:true 
+           FB.init({
+              appId:'#{Devise::koala_app_id}', cookie:true,
+              status:true, xfbml:true
            });
         </script>"
       end
-      
+
       # Renders the Facbook Registration Form (XFML).
       # For more info: http://developers.facebook.com/docs/plugins/registration/
-      # 
+      #
       # For example :
       # ...
       # <%= koala_registration_form("/registration", [{:name => "name"}, {:name => "password", :view => "not_prefilled"}, {:name => "birthday", :description => "Geburtstag", :type => "date"}], "callback_function", "de_DE", 600) %>
@@ -51,18 +51,18 @@ module Devise #:nodoc:
       def koala_registration_form(registration_url = "/", fields = [:name, :email, :password], on_validate = nil, locale = "en_EN", width = nil)
         width = (width.present?) ? "width=\"#{width.to_s}\" " : ""
         on_validate = (on_validate.present?) ? "onvalidate=\"#{on_validate}\" " : ""
-        "<fb:registration 
-          fields='" + fields.to_json + "' 
-          redirect-uri=\"#{registration_url}\" 
-          locale=\"#{locale}\" 
+        "<fb:registration
+          fields='" + fields.to_json + "'
+          redirect-uri=\"#{registration_url}\"
+          locale=\"#{locale}\"
           #{on_validate}
           #{width}>
         </fb:registration>"
       end
-      
+
       # Renders the Facbook Registration Form (Iframe).
       # For more info: http://developers.facebook.com/docs/plugins/registration/
-      # 
+      #
       # For example :
       # ...
       # <%= koala_registration_iframe_form("/registration", [{:name => "name"}, {:name => "password", :view => "not_prefilled"}, {:name => "birthday", :description => "Geburtstag", :type => "date"}], "de_DE", 600, 400) %>
@@ -77,27 +77,28 @@ module Devise #:nodoc:
                      redirect_uri=#{CGI.escape(registration_url)}&
                      locale=#{locale}&
                      fields=" + fields.to_json + "'
-                scrolling=\"auto\" 
-                frameborder=\"no\" 
-                style=\"border:none\" 
-                allowTransparency=\"true\" 
+                scrolling=\"auto\"
+                frameborder=\"no\"
+                style=\"border:none\"
+                allowTransparency=\"true\"
                 #{width}
                 #{height}>
         </iframe>"
       end
-      
+
 
       # Returns the Login To Facebook button.
-      # 
+      #
       # For example :
       # ...
       # <%= koala_login_button("Login with Facebook", "/after_login") %>
       #
       def koala_login_button(button_text = "Login with Facebook", login_url = "/", registration_url = nil)
+        login_url += (login_url =~ /\?/ ? '&koala=true' : '?koala=true')
         registration = (registration_url.present?) ? "registration-url=\"#{registration_url}\"" : ""
         "<fb:login-button #{registration} on-login=\"window.location.href = '#{login_url}';\">#{button_text}</fb:login-button>"
       end
-      
+
 
       # Returns the Logout button for Facebook.
       # It calls the logout_url after logging out of Facbook Connect.
@@ -110,7 +111,7 @@ module Devise #:nodoc:
         options = { :unobtrusive => true, :onclick => "FB.getLoginStatus(function(status){if(status.session){FB.logout(function(response){document.location.href='#{logout_url}'});}else{document.location.href='#{logout_url}'}})" }.merge(options)
         link_to button_text, "#", options
       end
-      
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_koala_connectable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Mathias Karst\xC3\xA4dt"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,7 +99,6 @@ files:
 - CHANGELOG
 - README.rdoc
 - Rakefile
-- devise_koala_connectable.gemspec
 - lib/devise_koala_connectable.rb
 - lib/devise_koala_connectable/locales/de.yml
 - lib/devise_koala_connectable/locales/en.yml
@@ -110,6 +109,7 @@ files:
 - lib/devise_koala_connectable/view_helpers.rb
 - rails/init.rb
 - Manifest
+- devise_koala_connectable.gemspec
 has_rdoc: true
 homepage: http://github.com/webmatze/devise_koala_connectable
 licenses: []