headstart 0.7.0 → 0.8.0

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.authors     = ["Bran Burridge"]
     gem.files       = FileList["[A-Z]*", "{app,config,generators,lib,shoulda_macros,rails}/**/*"]
     
-    gem.add_dependency "mini_fb", '=0.2.2'
+    gem.add_dependency "mini_fb", '=1.1.3'
     gem.add_dependency "delayed_job", '=1.8.4'
     gem.add_dependency "mad_mimi_mailer", '=0.0.7'
     

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/app/controllers/headstart/sessions_controller.rb

@@ -6,6 +6,7 @@ class Headstart::SessionsController < ApplicationController
   filter_parameter_logging :password
 
   def new
+    @oauth_url = MiniFB.oauth_url(Headstart.configuration.facebook_app_id, get_full_app_path + "/sessions/create", :scope=>MiniFB.scopes.join(","))
     render :template => 'sessions/new'
   end
 
@@ -13,8 +14,7 @@ class Headstart::SessionsController < ApplicationController
     @user = if params[:session]
       ::User.authenticate(params[:session][:email], params[:session][:password])
     else
-      ::User.find_facebook_user(cookies[Headstart.configuration.facebook_api_key + "_session_key"],
-                                cookies[Headstart.configuration.facebook_api_key + "_user"])
+      ::User.find_facebook_user(params['code'], get_full_app_path)
     end
       
     if @user.nil?
@@ -23,8 +23,9 @@ class Headstart::SessionsController < ApplicationController
     else
       if @user.email_confirmed?
         flash_success_after_create
-      else
+      elsif @user.email_confirmation_sent_at.blank?
         ::HeadstartMailer.deliver_welcome(@user)
+        @user.update_attribute(:email_confirmation_sent_at, Time.now)
         flash_notice_after_create
       end
       sign_in(@user)

data/app/models/generic_mailer.rb

@@ -1,5 +1,5 @@
 class GenericMailer < ActionMailer::Base
-
+  
   def change_password(user)
     from       Headstart.configuration.mailer_sender
     recipients user.email
@@ -9,6 +9,7 @@ class GenericMailer < ActionMailer::Base
     body       :url => edit_user_password_url(user,
                        :token  => user.password_reset_token,
                        :escape => false)
+    content_type "text/html"
   end
   
   def welcome(user)
@@ -18,14 +19,7 @@ class GenericMailer < ActionMailer::Base
                       :scope   => [:headstart, :models, :headstart_mailer],
                       :default => "Welcome")
     body      :user => user
+    content_type "text/html"
   end
 
-  def confirmation(user)
-    from       Headstart.configuration.mailer_sender
-    recipients user.email
-    subject    I18n.t(:confirmation,
-                      :scope   => [:headstart, :models, :headstart_mailer],
-                      :default => "Account confirmation")
-    body      :user => user
-  end
 end

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

@@ -27,18 +27,14 @@
 	<%= link_to "Forgot password?", new_password_path %>
     
     <%= form.submit "Sign in", :disable_with => "Please wait..." %>
-    <%- if Headstart.configuration.use_facebook_connect -%>
-      or <fb:login-button onlogin="facebook_onlogin();" length="long" v="2" size="large"></fb:login-button>
-    <%- end -%>
+
   </div>
 <% end %>
 
 
-
 <%- if Headstart.configuration.use_facebook_connect -%>
-  <script type="text/javascript">
-    FB.init("<%= Headstart.configuration.facebook_api_key %>", "xd_receiver.html", {
-      permsToRequestOnConnect : "email",
-    });
-  </script>
+  <div style="margin-top:20px">
+	<%= link_to image_tag("facebook_login.png"), @oauth_url %>
+  </div>
 <%- end -%>
+

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

@@ -11,6 +11,7 @@
   <%= form.label :last_name %>
   <%= form.text_field :last_name %>
 </p>
+<%- if current_user.blank? || current_user.facebook_uid.blank? -%>
 <p class="password_field">
   <%= form.label :password %>
   <%= form.password_field :password %>
@@ -19,3 +20,8 @@
   <%= form.label :password_confirmation, "Confirm password" %>
   <%= form.password_field :password_confirmation %>
 </p>
+<% end %>
+<p class="text_field">
+	<%= form.label :avatar %>
+	<input id="photo" name="user[avatar]" type="file"/>
+</p>

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

@@ -1,7 +1,7 @@
 <% content_for :title do %>Edit My Profile<% end %>
 <h2>Edit My Profile</h2>
 
-<% form_for @user do |form| %>
+<% form_for @user, :html => { :enctype => "multipart/form-data"} do |form| %>
   <%= render :partial => '/users/form', :object => form %>
   <%= form.submit 'Save', :disable_with => 'Please wait...' %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% content_for :title do %>Sign up<% end %>
 <h2>Sign up</h2>
 
-<% form_for @user do |form| %>
+<% 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 %>

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

@@ -1,8 +1,10 @@
 <h2>My Profile</h2>
 
+<%= image_tag avatar_url(@user) %>
+
 <div id="user_profile">
   <b>First Name:</b> <%=h @user.first_name %><br/>
   <b>Last Name:</b> <%=h @user.last_name %><br/>
   <b>Email:</b> <%=h @user.email %><br/>
-  <%= link_to 'Edit', edit_user_path(@user) %>
+  <% if signed_in? && current_user.id == @user.id %><%= link_to 'Edit', edit_user_path(current_user) %><% end %>
 </div>

data/generators/headstart/headstart_generator.rb

@@ -40,6 +40,8 @@ class HeadstartGenerator < Rails::Generator::Base
           return content
         end'
 
+      m.file "app/helpers/users_helper.rb", "app/helpers/users_helper.rb"
+      
       m.directory File.join("public", "stylesheets")
       m.file "style.css", "public/stylesheets/style.css"
       m.file "report.css", "public/stylesheets/report.css"

data/generators/headstart/templates/_woopra.html.erb

@@ -1,7 +1,7 @@
 <!-- Woopra Code Start -->
 <script type="text/javascript" src="//static.woopra.com/js/woopra.v2.js"></script>
 <script type="text/javascript">
-<% if logged_in? %>
+<% if signed_in? %>
 woopraTracker.addVisitorProperty("name", '<%= current_user.name %>');
 woopraTracker.addVisitorProperty("email", '<%= current_user.email %>');
 <% end %>

data/generators/headstart/templates/app/helpers/users_helper.rb

@@ -0,0 +1,10 @@
+module UsersHelper
+  
+  def avatar_url(user)
+    if user.facebook_uid.present?
+      return "http://graph.facebook.com/#{user.facebook_uid}/picture?type=square"
+    else
+      return user.avatar.url(:thumb)
+    end
+  end
+end

data/generators/headstart/templates/application.html.erb

@@ -76,8 +76,8 @@
 	
 	<% if ENV["RAILS_ENV"] == "production" %>
 	  <% if Settings.woopra.present? %><%= render :partial => 'layouts/woopra' %><% end %>
-	  <% if Settings.google_analytics.present? %><%= render :partial => 'layouts/google_analytics' %>
+	  <% if Settings.google_analytics.present? %><%= render :partial => 'layouts/google_analytics' %><% end %>
     <% end %>
-
+<!-- $zendesk -->
 </body>
 </html>

data/generators/headstart/templates/headstart.rb

@@ -11,6 +11,7 @@ begin
     config.use_delayed_job      = configuration[:use_delayed_job]
     config.facebook_api_key     = configuration[:facebook_api_key]
     config.facebook_secret_key  = configuration[:facebook_secret_key]
+    config.facebook_app_id      = configuration[:facebook_app_id]
   end
 
   if configuration[:madmimi_username].present? && configuration[:madmimi_api_key].present?

data/generators/headstart/templates/headstart.yml

@@ -15,31 +15,45 @@
 #
 
 development:
-  mailer_sender: donotreply@example.com
+  mailer_sender: $mailer_sender
   madmimi_username: 
   madmimi_api_key: 
   impersonation_hash: 
-  use_facebook_connect: false
+  use_facebook_connect: $use_facebook_connect
   use_delayed_job: $delayed_job
-  facebook_api_key: 
-  facebook_secret_key: 
+  facebook_api_key: $facebook_api_key
+  facebook_secret_key: $facebook_secret_key
+  facebook_app_id: $facebook_app_id
 
+staging:
+  mailer_sender: $mailer_sender
+  madmimi_username: 
+  madmimi_api_key: 
+  impersonation_hash: 
+  use_facebook_connect: $use_facebook_connect
+  use_delayed_job: $delayed_job
+  facebook_api_key: $facebook_api_key
+  facebook_secret_key: $facebook_secret_key
+  facebook_app_id: $facebook_app_id
+    
 test:
-  mailer_sender: donotreply@example.com
+  mailer_sender: $mailer_sender
   madmimi_username: 
   madmimi_api_key: 
   impersonation_hash: 
-  use_facebook_connect: false
+  use_facebook_connect: $use_facebook_connect
   use_delayed_job: $delayed_job
-  facebook_api_key: 
-  facebook_secret_key: 
+  facebook_api_key: $facebook_api_key
+  facebook_secret_key: $facebook_secret_key
+  facebook_app_id: $facebook_app_id
 
 production:
-  mailer_sender: donotreply@example.com
+  mailer_sender: $mailer_sender
   madmimi_username: 
   madmimi_api_key: 
   impersonation_hash: 
-  use_facebook_connect: false
+  use_facebook_connect: $use_facebook_connect
   use_delayed_job: $delayed_job
-  facebook_api_key: 
-  facebook_secret_key: 
+  facebook_api_key: $facebook_api_key
+  facebook_secret_key: $facebook_secret_key
+  facebook_app_id: $facebook_app_id

data/generators/headstart/templates/migrations/create_users.rb

@@ -12,6 +12,13 @@ class HeadstartCreateUsers < ActiveRecord::Migration
       t.string   :password_reset_token, :limit => 128
       t.string   :confirmation_token, :limit => 128
       t.boolean  :email_confirmed, :default => false, :null => false
+      t.boolean  :email_confirmation_sent_at, :datetime
+      
+      t.string   :avatar_file_name
+      t.string   :avatar_content_type
+      t.integer  :avatar_file_size
+      t.datetime :avatar_updated_at
+      
       t.timestamps
     end
 

data/generators/headstart/templates/user.rb

@@ -1,3 +1,7 @@
 class User < ActiveRecord::Base
   include Headstart::User
+  
+  # If we don't want the originals, add , :original => "1x1"
+  has_attached_file :avatar, :styles => { :thumb => "50x50#", :mid => "200x300" }, :storage => :s3, :s3_credentials => "#{RAILS_ROOT}/config/s3.yml", 
+       :path => ":class/:id/:style.:extension", :default_url => "/images/missing.jpg"
 end

data/lib/headstart/authentication.rb

@@ -9,16 +9,23 @@ module Headstart
     module ClassMethods
       def self.extended(controller)
         controller.helper_method :current_user, :signed_in?, 
-                                 :signed_out?,  :impersonating?
+                                 :signed_out?,  :impersonating?,
+                                 :get_full_app_path
         controller.hide_action   :current_user, :current_user=,
                                  :signed_in?,   :signed_out?,
                                  :sign_in,      :sign_out,
                                  :authenticate, :deny_access,
-                                 :impersonating?
+                                 :impersonating?, :get_full_app_path
       end
     end
 
     module InstanceMethods
+
+      
+      def get_full_app_path
+       return "http://" + APP_CONFIG[:domain]  
+      end
+      
       # User in the current cookie
       #
       # @return [User, nil]
@@ -97,7 +104,7 @@ module Headstart
       
 
       protected
-
+      
       def user_from_cookie
         if token = cookies[:remember_token]
           ::User.find_by_remember_token(token)

data/lib/headstart/configuration.rb

@@ -5,6 +5,7 @@ module Headstart
     attr_accessor :use_facebook_connect
     attr_accessor :facebook_api_key
     attr_accessor :facebook_secret_key
+    attr_accessor :facebook_app_id
     attr_accessor :use_delayed_job
 
     def initialize

data/lib/headstart/user.rb

@@ -250,24 +250,24 @@ module Headstart
         return user if     user.authenticated?(password)
       end
       
-      def find_facebook_user(facebook_session, facebook_uid)
-        return nil unless Headstart.configuration.use_facebook_connect && facebook_session && facebook_uid
-        
+      def find_facebook_user(facebook_code, full_app_path)
+        return nil unless Headstart.configuration.use_facebook_connect && facebook_code
+
         begin
-          facebook_user = MiniFB::Session.new(Headstart.configuration.facebook_api_key,
-                                              Headstart.configuration.facebook_secret_key,
-                                              facebook_session, facebook_uid).user
+          access_token_hash = MiniFB.oauth_access_token(Headstart.configuration.facebook_app_id, full_app_path + "/sessions/create", Headstart.configuration.facebook_secret_key, facebook_code)
+          @response_hash = MiniFB.get(access_token_hash['access_token'], 'me', :type=> nil, :metadata=>true)
+          @response_hash["user"] == @response_hash.user
         rescue MiniFB::FaceBookError
-          facebook_user = nil
+          @response_hash = nil
         end
-        return nil unless facebook_user
-        
-        user = ::User.find_by_facebook_uid(facebook_uid) || ::User.find_by_email(facebook_user['email']) || ::User.new
+        return nil unless @response_hash
+
+        user = ::User.find_by_facebook_uid(@response_hash['id']) || ::User.find_by_email(@response_hash['email']) || ::User.new
         user.tap do |user|
-          user.facebook_uid     = facebook_uid
-          user.email            = facebook_user['email']
-          user.first_name       = facebook_user['first_name']
-          user.last_name        = facebook_user['last_name']
+          user.facebook_uid     = @response_hash['id']
+          user.email            = @response_hash['email']
+          user.first_name       = @response_hash['first_name']
+          user.last_name        = @response_hash['last_name']
           user.save
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: headstart
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Bran Burridge
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 21
         segments: 
-        - 0
-        - 2
-        - 2
-        version: 0.2.2
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - generators/headstart/templates/add.png
 - generators/headstart/templates/app/controllers/sessions_controller.rb
 - generators/headstart/templates/app/helpers/application_helper.rb
+- generators/headstart/templates/app/helpers/users_helper.rb
 - generators/headstart/templates/app/views/sessions/index.html.erb
 - generators/headstart/templates/application.html.erb
 - generators/headstart/templates/application_edit.png