socialite 0.1.0.pre.3 → 0.1.0.pre.4

data/app/controllers/socialite/sessions_controller.rb

@@ -1,9 +1,14 @@
 module Socialite
-  class SessionsController < ApplicationController
+  class SessionsController < SocialiteController
     unloadable
 
+    before_filter :ensure_user, only: [:destroy]
+
+    # Login Page
     def new
-      # Login Page
+      if current_user
+        redirect_to main_app.root_path, :alert => 'You are already registered.'
+      end
     end
 
     def create
@@ -17,20 +22,20 @@ module Socialite
           # account. But we found the identity and the user associated with it
           # is the current user. So the identity is already associated with
           # this user. So let's display an error message.
-          redirect_to main_app.root_url, :notice => "You have already linked this account"
+          redirect_to after_link_path, :notice => "You have already linked this account"
         else
           # The identity is not associated with the current_user so lets
           # associate the identity.
           @identity.user = current_user
           @identity.save
-          redirect_to main_app.root_url, :notice => "Account successfully authenticated"
+          redirect_to after_link_path, :notice => "Account successfully authenticated"
         end
       else # User is not logged in, this is a new signin
         if @identity.user.present?
           # The identity we found had a user associated with it so let's
           # just log them in here
           self.current_user = @identity.user
-          redirect_to main_app.root_url, :notice => "Signed in!"
+          redirect_to after_login_path, :notice => "Signed in!"
         else
           # The authentication has no user assigned and there is no user signed in
           # Our decision here is to create a new account for the user
@@ -42,14 +47,14 @@ module Socialite
                    # So we just load it up
                  else
                    # otherwise we have to create a user with the auth hash
-                   Socialite.user_class.create_from_omniauth(auth)
+                   Socialite.user_class.find_or_create_from_omniauth(auth)
                    # NOTE: we will handle the different types of data we get back
                    # from providers at the model level in create_from_omniauth
                  end
           # We can now link the authentication with the user and log him in
           user.identities << @identity
           self.current_user = user
-          redirect_to main_app.root_path, notice: "Welcome to The app!"
+          redirect_to after_signup_path, notice: "Welcome to the app!"
 
           # No user associated with the identity so we need to create a new one
           # redirect_to new_user_url, :notice => "Please finish registering"
@@ -58,12 +63,12 @@ module Socialite
     end
 
     def destroy
-      self.current_user = nil
-      redirect_to main_app.root_url, :notice => 'Signed out!'
+      logout!
+      redirect_to(main_app.root_url, :notice => 'Signed out!')
     end
 
     def failure
-      redirect_to main_app.root_url, :alert => "Authentication failed, please try again."
+      redirect_to after_failure_path, :alert => "Authentication failed, please try again."
     end
   end
 end

data/app/controllers/socialite/socialite_controller.rb

@@ -0,0 +1,9 @@
+module Socialite
+  class SocialiteController < ::ApplicationController
+    layout 'socialite/socialite'
+
+    # Override before ensure_user if it's set in the parent app's
+    # ApplicationController.
+    skip_before_filter :ensure_user
+  end
+end

data/app/controllers/socialite/users_controller.rb

@@ -1,8 +1,11 @@
 module Socialite
-  class UsersController < ApplicationController
+  class UsersController < SocialiteController
     unloadable
 
     def new
+      if current_user
+        redirect_to main_app.root_path, notice: 'You are already registered.'
+      end
       @user = env['omniauth.identity'] ||= Socialite.user_class.new
     end
   end

data/app/views/layouts/socialite/{application.html.haml → socialite.html.haml}

@@ -7,5 +7,3 @@
   = csrf_meta_tags
 %body
   = yield
-
-

data/lib/socialite/controllers/helpers.rb

@@ -8,7 +8,25 @@ module Socialite
       end
 
       def current_user
-        @current_user ||= Socialite.user_class.find(session[:user_id])
+        @current_user ||= if session.has_key?(:user_id)
+                            Socialite.user_class.find(session[:user_id])
+                          end
+      rescue ActiveRecord::RecordNotFound
+        session[:user_id] = nil
+      end
+
+      def ensure_user
+        if defined?(super)
+          super
+        else
+          unless user_signed_in?
+            redirect_to login_path, :alert => 'You must be logged in to use this feature.'
+          end
+        end
+      end
+
+      def logout!
+        self.current_user = nil and session.destroy
       end
 
       def user_signed_in?
@@ -19,6 +37,26 @@ module Socialite
         @current_user = user
         session[:user_id] = user.nil? ? user : user.id
       end
+
+      def after_link_path
+        main_app.root_path
+      end
+
+      def after_signup_path
+        main_app.root_path
+      end
+
+      def after_failure_path
+        main_app.root_path
+      end
+
+      def after_login_path
+        main_app.root_path
+      end
+
+      def after_logout_path
+        main_app.root_path
+      end
     end
   end
 end

data/lib/socialite/models/user_concern.rb

@@ -9,7 +9,6 @@ module Socialite
       include OmniAuth::Identity::SecurePassword
 
       included do
-
         attr_accessible :email, :name, :password, :password_confirmation
 
         has_secure_password if defined?(BCrypt)
@@ -29,10 +28,23 @@ module Socialite
         # include OmniAuth::Identity::Model#::ClassMethods
         # include OmniAuth::Identity::SecurePassword::ClassMethods
 
+        def find_from_omniauth(auth)
+          if auth['info']['email']
+            find_by_email(auth['info']['email'])
+          else
+            find_by_email("#{auth['info']['name']}@#{auth['provider']}.com")
+          end
+        end
+
+        def find_or_create_from_omniauth(auth)
+          find_from_omniauth(auth) || create_from_omniauth(auth)
+        end
+
         def create_from_omniauth(auth)
           create do |user|
             user.name = auth['info']['name']
             user.email = auth['info']['email']
+            user.email ||= "#{auth['info']['nickname']}@#{auth['provider']}.com"
             user.password ||= rand(36**10).to_s(36)
           end
         end

data/lib/socialite/version.rb

@@ -1,3 +1,3 @@
 module Socialite
-  VERSION = '0.1.0.pre.3'
+  VERSION = '0.1.0.pre.4'
 end

data/spec/features/facebook_registration_spec.rb

@@ -10,7 +10,7 @@ feature "Facebook Registration", :omniauth => true do
 
   scenario "Signing up with Facebook" do
     visit '/auth/facebook'
-    page.should have_text 'Welcome to The app!'
+    page.should have_text 'Welcome to the app!'
   end
 end
 

data/spec/features/identity_registration_spec.rb

@@ -24,7 +24,7 @@ feature "Identity Registration" do
     fill_in 'password', :with => 'secrets'
     fill_in 'password_confirmation', :with => 'secrets'
     click_button 'Sign Up'
-    page.should have_text 'Welcome to The app!'
+    page.should have_text 'Welcome to the app!'
     page.should have_no_css('.error')
     page.should have_no_button('Sign Up')
   end

data/spec/models/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, :omniauth => true do
   let(:linked_user) { FactoryGirl.create(:linked_user) }
 
   it { should have_many(:identities).dependent(:destroy) }
@@ -11,6 +11,30 @@ describe User do
 
   it { should have_db_index(:email).unique(true) }
 
+  it { should validate_uniqueness_of(:email).case_insensitive }
+
+  context 'existing users' do
+    let!(:twitter_user)  { FactoryGirl.create(:user, email: 'johndoe@twitter.com') }
+
+    describe 'finding existing instead of creating additional' do
+      subject { described_class.find_or_create_from_omniauth(OmniAuth.config.mock_auth[:twitter]) }
+
+      its(:email) { should eql('johndoe@twitter.com') }
+
+      it 'retrieved the record; and did not create an additional one' do
+        lambda { subject }.should_not change(described_class, :count)
+      end
+    end
+
+    describe 'creating user if finder fails' do
+      subject { described_class.find_or_create_from_omniauth(OmniAuth.config.mock_auth[:facebook]) }
+
+      it 'returns a new record' do
+        lambda { subject }.should change(described_class, :count).by(1)
+      end
+    end
+  end
+
   context 'with associated identities' do
     subject { linked_user }
 

data/spec/support/omniauth.rb

@@ -12,20 +12,47 @@ RSpec.configure do |config|
     # }
 
     OmniAuth.config.add_mock(:facebook, {
-      'uid' => '1234',
-      'extra' => {
-      'user_hash' => {
-        'email' => 'foobar@example.com',
-        'first_name' => 'John',
-        'last_name' => 'Doe',
-        'gender' => 'Male'
+      :uid => '1234567',
+      :info => {
+        :nickname => 'jbloggs',
+        :email => 'joe@bloggs.com',
+        :name => 'Joe Bloggs',
+        :first_name => 'Joe',
+        :last_name => 'Bloggs',
+        :image => 'http://graph.facebook.com/1234567/picture?type=square',
+        :urls => { :Facebook => 'http://www.facebook.com/jbloggs' },
+        :location => 'Palo Alto, California',
+        :verified => true
+      },
+      :credentials => {
+        :token => 'ABCDEF...', # OAuth 2.0 access_token, which you may wish to store
+        :expires_at => 1321747205, # when the access token expires (it always will)
+        :expires => true # this will always be true
+      },
+      :extra => {
+        :raw_info => {
+          :id => '1234567',
+          :name => 'Joe Bloggs',
+          :first_name => 'Joe',
+          :last_name => 'Bloggs',
+          :link => 'http://www.facebook.com/jbloggs',
+          :username => 'jbloggs',
+          :location => { :id => '123456789', :name => 'Palo Alto, California' },
+          :gender => 'male',
+          :email => 'joe@bloggs.com',
+          :timezone => -8,
+          :locale => 'en_US',
+          :verified => true,
+          :updated_time => '2011-11-11T06:21:03+0000'
         }
       }
     })
 
     OmniAuth.config.add_mock(:twitter, {
-      :uid => '12345',
-      :nickname => 'zapnap'
+      :uid => '1337',
+      :info => {
+        :name => 'johndoe'
+      }
     })
   end
 

metadata

@@ -2,14 +2,14 @@
 name: socialite
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 0.1.0.pre.3
+  version: 0.1.0.pre.4
 platform: ruby
 authors:
 - Justin Smestad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -309,10 +309,10 @@ files:
 - app/assets/images/socialite/twitter_64.png
 - app/assets/stylesheets/socialite/socialite.css
 - app/assets/stylesheets/socialite.css
-- app/controllers/socialite/application_controller.rb
 - app/controllers/socialite/sessions_controller.rb
+- app/controllers/socialite/socialite_controller.rb
 - app/controllers/socialite/users_controller.rb
-- app/views/layouts/socialite/application.html.haml
+- app/views/layouts/socialite/socialite.html.haml
 - app/views/socialite/identities/_identities.html.haml
 - app/views/socialite/identities/new.html.haml
 - app/views/socialite/sessions/new.html.haml
@@ -409,7 +409,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4151013875851256199
+      hash: -4137053781704472879
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false

data/app/controllers/socialite/application_controller.rb

@@ -1,4 +0,0 @@
-module Socialite
-  class ApplicationController < ActionController::Base
-  end
-end