devise_koala_connectable 0.1.2 → 0.1.3

data/CHANGELOG

@@ -0,0 +1,29 @@
+== 0.1.3
+
+* enhancements
+	* changed logging from info to debug. 
+	* Added logout_button helper.
+	* Added user creation through Facebook Registration form
+	* Added koala_registration_form helper
+	* Added koala_registration_iframe_form helper
+	* login button now  accepts an callback url
+	* Removed valid_params? method.
+	
+* bug fix
+	* many minor bugfixes
+
+== 0.1.2
+
+* bug fix
+	* changed strings to symbols
+	* other minor bugfixes
+
+== 0.1.1 
+
+* bug fix
+	* some minor bugfixes
+
+== 0.1.0 (yanked)
+
+* enhancements
+	* initial Version, basic features 

data/Manifest

@@ -1,3 +1,4 @@
+CHANGELOG
 README.rdoc
 Rakefile
 devise_koala_connectable.gemspec

data/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 require "rake"
 require "echoe"
 
-Echoe.new("devise_koala_connectable", "0.1.2") do |p|
+Echoe.new("devise_koala_connectable", "0.1.3") 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.2"
+  s.version = "0.1.3"
 
   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-17}
+  s.date = %q{2011-02-24}
   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 = ["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 = ["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.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.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/locales/de.yml

@@ -0,0 +1,4 @@
+de:
+  devise:
+    sessions:
+      koala_invalid: "Login nicht möglich. Benutzer nicht gefunden."

data/lib/devise_koala_connectable/strategy.rb

@@ -11,28 +11,47 @@ module Devise #:nodoc:
       class KoalaConnectable < Base
 
         def valid?
-          valid_controller? && valid_params? && mapping.to.respond_to?('authenticate_with_koala')
+          ((valid_controller? && cookie_present?) || signed_request?) && mapping.to.respond_to?('authenticate_with_koala')
         end
 
         # Authenticate user with Koala.
         #
         def authenticate!
-          
           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?
           begin
             oauth = Koala::Facebook::OAuth.new(klass.koala_app_id, klass.koala_secret_key, klass.koala_callback_url)
             
-            user_info = oauth.get_user_info_from_cookies(request.cookies)
-            Rails.logger.info user_info.to_yaml
+            if signed_request?
+              user_info = oauth.parse_signed_request params[:signed_request]
+              unless user_info.present? #if no valid signed facebook request  found
+                pass
+                return
+              end
+              user_id = user_info["user_id"]
+              access_token = user_info["oauth_token"]
+            else
+              user_info = oauth.get_user_info_from_cookies(request.cookies)
+              unless user_info.present? #if no valid facebook Session found
+                pass
+                return
+              end
+              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(user_info["access_token"])
-            koala_user = graph.get_object(user_info["uid"])
+            graph = Koala::Facebook::GraphAPI.new(access_token)
+            koala_user = graph.get_object(user_id)
             
-            Rails.logger.info koala_user.to_yaml
+            Rails.logger.debug koala_user.to_yaml
 
-            fail!(:koala_invalid) and return unless koala_user
+            unless koala_user
+              fail(:koala_invalid)
+              return 
+            end
             
             if user = klass.authenticate_with_koala(koala_user)
               user.on_before_koala_success(koala_user)
@@ -40,10 +59,14 @@ module Devise #:nodoc:
               return
             end
             
-            fail!(:koala_invalid) and return unless klass.koala_auto_create_account?
+            unless klass.koala_auto_create_account? or signed_request?
+              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)
@@ -52,7 +75,7 @@ module Devise #:nodoc:
             
           rescue Exception => e
             Rails.logger.error e.to_yaml
-            fail!(:koala_invalid)
+            fail(:koala_invalid)
           end
         end
         
@@ -60,9 +83,16 @@ module Devise #:nodoc:
           def valid_controller?
             params[:controller].to_s =~ /sessions/
           end
-
-          def valid_params?
-            params[:code].present?
+          
+          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
 
       end

data/lib/devise_koala_connectable/view_helpers.rb

@@ -40,15 +40,75 @@ module Devise #:nodoc:
         </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) %>
+      # ...
+      #
+      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}\" 
+          #{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) %>
+      # ...
+      #
+      def koala_registration_iframe_form(registration_url = "/", fields = [:name, :email, :password], locale = "en_EN", width = "100%", height = 330)
+        width = (width.present?) ? "width=\"#{width.to_s}\" " : ""
+        height = (height.present?) ? "height=\"#{height.to_s}\" " : ""
+        on_validate = (on_validate.present?) ? "onvalidate=\"#{on_validate}\" " : ""
+        "<iframe src='http://www.facebook.com/plugins/registration.php?
+                     client_id=#{Devise::koala_app_id}&
+                     redirect_uri=#{CGI.escape(registration_url)}&
+                     locale=#{locale}&
+                     fields=" + fields.to_json + "'
+                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") %>
+      # <%= koala_login_button("Login with Facebook", "/after_login") %>
+      #
+      def koala_login_button(button_text = "Login with Facebook", login_url = "/", registration_url = nil)
+        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.
+      #
+      # For example :
+      # ...
+      # <%= koala_logout_button("Logout","/after_logout") %>
       #
-      def koala_login_button(button_text = "Login with Facebook")
-        "<fb:login-button>#{button_text}</fb:login-button>"
+      def koala_logout_button(button_text = "Logout", logout_url = "/", options = {})
+        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

data/lib/devise_koala_connectable.rb

@@ -26,9 +26,11 @@ module Devise
 
   mattr_accessor :koala_callback_url
   @@koala_callback_url = nil
+  
 end
 
-I18n.load_path.unshift File.join(File.dirname(__FILE__), *%w[devise_koala_connectable locales en.yml])
+I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[devise_koala_connectable locales en.yml]))
+I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), *%w[devise_koala_connectable locales de.yml]))
 
 Devise.add_module(:koala_connectable,
   :strategy => true,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_koala_connectable
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Mathias Karst\xC3\xA4dt"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- CHANGELOG
 - README.rdoc
 - lib/devise_koala_connectable.rb
 - lib/devise_koala_connectable/locales/de.yml
@@ -95,6 +96,7 @@ extra_rdoc_files:
 - lib/devise_koala_connectable/version.rb
 - lib/devise_koala_connectable/view_helpers.rb
 files: 
+- CHANGELOG
 - README.rdoc
 - Rakefile
 - devise_koala_connectable.gemspec