headstart 0.9.2 → 0.11.1

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.11.1

data/app/controllers/headstart/sessions_controller.rb

@@ -4,10 +4,9 @@ class Headstart::SessionsController < ApplicationController
   skip_before_filter :authenticate, :only => [:new, :create, :destroy]
   protect_from_forgery :except => :create
   filter_parameter_logging :password
+  before_filter :set_oauth_url, :only => [:new, :create]
 
   def new
-    # Scopes: http://developers.facebook.com/docs/authentication/permissions
-    @oauth_url = MiniFB.oauth_url(Headstart.configuration.facebook_app_id, get_full_app_path + "/sessions/create", :scope=> "user_about_me, publish_stream, email") #MiniFB.scopes.join(",")
     render :template => 'sessions/new'
   end
 
@@ -20,7 +19,7 @@ class Headstart::SessionsController < ApplicationController
       
     if @user.nil?
       flash_failure_after_create
-      render :template => 'sessions/new', :status => :unauthorized
+      render :template => Headstart.configuration.session_failure_template, :status => :unauthorized
     else
       if @user.email_confirmed?
         flash_success_after_create
@@ -65,7 +64,7 @@ class Headstart::SessionsController < ApplicationController
   end
 
   def url_after_create
-    '/'
+    Headstart.configuration.url_after_create
   end
 
   def flash_success_after_destroy

data/app/controllers/headstart/users_controller.rb

@@ -7,7 +7,8 @@ class Headstart::UsersController < ApplicationController
   # Before Filter on *only* the 'uninstalled' method 
   before_filter :verify_uninstall_signature, :only => [:facebook_remove] 
   skip_before_filter :verify_authenticity_token, :only => [:facebook_remove]
-
+  before_filter :set_oauth_url, :only => [:new, :create]
+  
   def resend_welcome_email
     HeadstartMailer.deliver_welcome(current_user)
     flash[:notice] = 'Your confirmation email has been resent.'

data/app/views/sessions/new.html.erb

@@ -5,11 +5,7 @@
   <%- else -%>
     <%= javascript_include_tag 'http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US' %>
   <%- end -%>
-  <script>
-    function facebook_onlogin() {
-      document.location.href = "<%= fb_connect_path %>";
-    }
-  </script>
+
 <%- end -%>
 
 <h2>Sign in</h2>

data/app/views/users/new.html.erb

@@ -1,7 +1,22 @@
 <% content_for :title do %>Sign up<% end %>
+<%- if Headstart.configuration.use_facebook_connect -%>
+  <%- if request.ssl? -%>
+    <%= javascript_include_tag 'https://ssl.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US' %>
+  <%- else -%>
+    <%= javascript_include_tag 'http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US' %>
+  <%- end -%>
+
+<%- end -%>
+
 <h2>Sign up</h2>
 
 <% form_for @user, :html => { :enctype => "multipart/form-data"} do |form| %>
   <%= render :partial => '/users/form', :object => form %>
   <%= form.submit 'Sign up', :disable_with => 'Please wait...' %>
 <% end %>
+
+<%- if Headstart.configuration.use_facebook_connect -%>
+  <div style="margin-top:20px">
+	<%= link_to image_tag("facebook_login.png"), @oauth_url %>
+  </div>
+<%- end -%>

data/generators/headstart/templates/headstart.rb

@@ -12,6 +12,8 @@ begin
     config.facebook_api_key     = configuration[:facebook_api_key]
     config.facebook_secret_key  = configuration[:facebook_secret_key]
     config.facebook_app_id      = configuration[:facebook_app_id]
+    config.url_after_create      = configuration[:url_after_create]
+    config.session_failure_template      = configuration[:session_failure_template]
   end
 
   if configuration[:madmimi_username].present? && configuration[:madmimi_api_key].present?

data/generators/headstart/templates/headstart.yml

@@ -24,6 +24,8 @@ development:
   facebook_api_key: $facebook_api_key
   facebook_secret_key: $facebook_secret_key
   facebook_app_id: $facebook_app_id
+  url_after_create: /
+  session_failure_template: sessions/new
 
 staging:
   mailer_sender: $mailer_sender
@@ -35,6 +37,8 @@ staging:
   facebook_api_key: $facebook_api_key
   facebook_secret_key: $facebook_secret_key
   facebook_app_id: $facebook_app_id
+  url_after_create: /
+  session_failure_template: sessions/new
     
 test:
   mailer_sender: $mailer_sender
@@ -46,6 +50,8 @@ test:
   facebook_api_key: $facebook_api_key
   facebook_secret_key: $facebook_secret_key
   facebook_app_id: $facebook_app_id
+  url_after_create: /
+  session_failure_template: sessions/new
 
 production:
   mailer_sender: $mailer_sender
@@ -57,3 +63,5 @@ production:
   facebook_api_key: $facebook_api_key
   facebook_secret_key: $facebook_secret_key
   facebook_app_id: $facebook_app_id
+  url_after_create: /
+  session_failure_template: sessions/new

data/lib/headstart/authentication.rb

@@ -105,6 +105,12 @@ module Headstart
 
       protected
       
+      
+      def set_oauth_url
+        # Scopes: http://developers.facebook.com/docs/authentication/permissions
+        @oauth_url = MiniFB.oauth_url(Headstart.configuration.facebook_app_id, get_full_app_path + "/sessions/create", :scope=> "user_about_me, publish_stream, email") #MiniFB.scopes.join(",")
+      end
+      
       def user_from_cookie
         if token = cookies[:remember_token]
           ::User.find_by_remember_token(token)

data/lib/headstart/configuration.rb

@@ -7,6 +7,8 @@ module Headstart
     attr_accessor :facebook_secret_key
     attr_accessor :facebook_app_id
     attr_accessor :use_delayed_job
+    attr_accessor :url_after_create
+    attr_accessor :session_failure_template
 
     def initialize
       @mailer_sender          = 'donotreply@example.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: headstart
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 49
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 2
-  version: 0.9.2
+  - 11
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Bran Burridge
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -04:00
+date: 2010-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency