socialite 0.1.0.pre → 0.1.0.pre.2

data/lib/socialite/engine.rb

@@ -1,5 +1,6 @@
 require 'haml'
 require 'omniauth'
+require 'simple_form'
 
 module Socialite
   class Engine < ::Rails::Engine
@@ -13,20 +14,16 @@ module Socialite
       g.helper false
     end
 
-    initializer 'socialite.load_middleware', :after => :load_config_initializers do
-      Socialite.providers.each do |provider_info|
-        OmniAuth.configure do |config|
-          config.provider(*provider_info)
+    initializer 'socialite.load_middleware' do |app|
+      app.middleware.use OmniAuth::Builder do
+        Socialite.providers.each do |provider_info|
+          provider(provider_info.first, *provider_info.last)
         end
       end
     end
 
-    # ActiveSupport.on_load(:action_controller) do
-      # include Socialite::Controllers::Helpers
-    # end
-
-    # ActiveSupport.on_load(:action_view) do
-      # include Socialite::Helpers::Authentication
-    # end
+    ActiveSupport.on_load(:action_controller) do
+      include Socialite::Controllers::Helpers
+    end
   end
 end

data/lib/socialite/ext/omniauth/identity/model.rb

@@ -0,0 +1,29 @@
+if defined?(OmniAuth::Identity)
+  require 'omniauth/identity/model'
+  require 'omniauth/identity/secure_password'
+
+  module OmniAuth
+    module Identity
+      module Model
+        extend ActiveSupport::Concern
+        # class << self
+          # # alias_method :old_included, :included
+          # extend ActiveSupport::Concern
+        # end
+      end
+    end
+  end
+
+  module OmniAuth
+    module Identity
+      module SecurePassword
+        extend ActiveSupport::Concern
+        # class << self
+          # # alias_method :old_included, :included
+          # extend ActiveSupport::Concern
+        # end
+      end
+    end
+  end
+
+end

data/lib/socialite/models/identity_concern.rb

@@ -4,6 +4,8 @@ module Socialite
       extend ActiveSupport::Concern
 
       included do
+        attr_accessible :provider, :uid, :user_id, :auth_hash
+
         belongs_to :user,
           :class_name => Socialite.user_class_name,
           :foreign_key => "#{Socialite.user_class.table_name.singularize}_id"
@@ -21,7 +23,10 @@ module Socialite
 
         # Ensure each user has only a single identity per provider type
         validates :provider,
-          :uniqueness => {:scope => "#{Socialite.user_class.table_name.singularize}_id", :case_sensitive => false},
+          :uniqueness => {
+            :scope => "#{Socialite.user_class.table_name.singularize}_id",
+            :case_sensitive => false
+          },
           :presence => true
 
         # Ensure an identity is never reused by another account
@@ -39,10 +44,24 @@ module Socialite
         #
         # @params [Hash] the OAuth authentication hash
         # @returns [Identity]
-        def find_or_initialize_by_omniauth(auth)
-          identity = where(:provider => auth['provider'], :uid => auth['uid']).first || new
-          identity.auth_hash = auth
-          identity
+        def create_from_omniauth(auth={})
+          create do |identity|
+            identity.provider = auth['provider']
+            identity.uid = auth['uid']
+            identity.auth_hash = auth
+          end
+        end
+
+        def find_or_create_from_omniauth(auth)
+          raise ArgumentError, 'auth parameter must be a hash' unless auth.is_a?(Hash)
+          find_from_omniauth(auth) || create_from_omniauth(auth)
+        end
+
+        # Finder method that finds the matching Provider and UID.
+        #
+        # @params [Hash] the OmniAuth authentication hash
+        def find_from_omniauth(auth={})
+          where(:provider => auth['provider'], :uid => auth['uid']).first
         end
       end
 

data/lib/socialite/models/user_concern.rb

@@ -1,13 +1,52 @@
+require 'omniauth-identity'
+require 'socialite/ext/omniauth/identity/model'
+
 module Socialite
   module Models
     module UserConcern
       extend ActiveSupport::Concern
+      include OmniAuth::Identity::Model
+      include OmniAuth::Identity::SecurePassword
 
       included do
+
+        attr_accessible :email, :name, :password, :password_confirmation
+
+        has_secure_password if defined?(BCrypt)
+
         has_many :identities,
           :dependent => :destroy,
           :class_name => Socialite.identity_class_name,
           :foreign_key => "#{Socialite.user_class.table_name.singularize}_id"
+
+        validates :email,
+          :presence => true,
+          :format => { :with => /.+@.+\..+/i },
+          :uniqueness => { :case_sensitive => false }
+      end
+
+      module ClassMethods
+        # include OmniAuth::Identity::Model#::ClassMethods
+        # include OmniAuth::Identity::SecurePassword::ClassMethods
+
+        def create_from_omniauth(auth)
+          create do |user|
+            user.name = auth['info']['name']
+            user.name = auth['info']['email']
+            user.password ||= rand(36**10).to_s(36)
+          end
+        end
+
+        def auth_key; :email; end
+
+        # def auth_key=(key)
+          # super
+          # validates_uniqueness_of key, :case_sensitive => false
+        # end
+
+        def locate(search_hash)
+          where(search_hash).first
+        end
       end
 
       def method_missing(id, *args, &block)

data/lib/socialite/version.rb

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

data/spec/dummy/app/controllers/pages_controller.rb

@@ -0,0 +1,7 @@
+class PagesController < ApplicationController
+  protect_from_forgery
+
+  def index
+
+  end
+end

data/spec/dummy/app/models/user.rb

@@ -1,3 +1,5 @@
+require 'bcrypt'
+
 class User < ActiveRecord::Base
   self.table_name = 'socialite_users'
   include Socialite::Models::UserConcern

data/spec/dummy/app/views/pages/index.html.haml

@@ -0,0 +1,5 @@
+%h1 Home
+
+- flash.each do |type, message|
+  .flash{class: "#{type}"}
+    = message

data/spec/dummy/config/initializers/omniauth-identity.rb

@@ -0,0 +1,11 @@
+require 'omniauth-facebook'
+require 'omniauth-identity'
+require 'omniauth/identity'
+
+Socialite.setup do |config|
+  config.provider :identity,
+    :model => User,
+    :fields => [:email],
+    :on_failed_registration => Socialite::UsersController.action(:new)
+  config.provider :facebook, 'xyz', '123'
+end

data/spec/dummy/config/initializers/socialite.rb

@@ -20,6 +20,15 @@ Socialite.setup do |config|
   # }
   # config.provider :twitter, ENV['TWITTER_APP_KEY'], ENV['TWITTER_SECRET']
 
+  # We highly recommended adding the omniauth-identity gem to your Gemfile.
+  # This does not enforce a password on signup, but establishes a common
+  # 'password recovery' entry point for all users.
+  #
+  # config.provider :identity,
+  #   :model => Socialite.user_class,
+  #   :fields => [:email],
+  #   :on_failed_registration => Socialite::UsersController.action(:new)
+
   if Rails.env.production?
     # Any production specific information
   elsif Rails.env.development?

data/spec/dummy/config/routes.rb

@@ -1,3 +1,19 @@
 Rails.application.routes.draw do
-  mount Socialite::Engine => "/socialite"
+
+  # This line mounts Socialite's routes at /socialite by default.
+  # This means, any requests to the /socialite URL of your application will go
+  # to Socialite::SessionsController#new. If you would like to change where
+  # this extension is mounted, simply change the :at option to something
+  # different.
+  #
+  # We ask that you don't use the :as option here, as Socialite relies on it
+  # being the default of "socialite"
+  mount Socialite::Engine, :at => '/socialite'
+  match '/login' => 'socialite::sessions#new'
+  match '/logout', :to => 'socialite::sessions#destroy'
+  match '/signup', :to => 'socialite::users#new'
+  match '/auth/:provider/callback', :to => 'socialite::sessions#create'
+  match '/auth/failure', :to => 'socialite::sessions#failure'
+
+  root :to => "pages#index"
 end

data/spec/dummy/db/migrate/20130207223009_create_socialite_users.rb

@@ -0,0 +1,16 @@
+class CreateSocialiteUsers < ActiveRecord::Migration
+  def up
+    create_table :socialite_users do |t|
+      t.string :name, :email
+      t.string :password_digest # set :null => false to enforce identity, requires 'bcrypt-ruby' in your Gemfile.
+      t.timestamps
+    end
+
+    # Enforce only every email must be unique
+    add_index :socialite_users, :email, :unique => true
+  end
+
+  def down
+    drop_table :socialite_users
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130206224517) do
+ActiveRecord::Schema.define(:version => 20130207223010) do
 
   create_table "socialite_identities", :force => true do |t|
     t.string   "uid"
@@ -28,8 +28,12 @@ ActiveRecord::Schema.define(:version => 20130206224517) do
 
   create_table "socialite_users", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.string   "email"
+    t.string   "password_digest"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
+  add_index "socialite_users", ["email"], :name => "index_socialite_users_on_email", :unique => true
+
 end

data/spec/factories/user.rb

@@ -1,6 +1,8 @@
 FactoryGirl.define do
   factory :user do
-    # Something here
+    name { Faker::Name.name }
+    email { Faker::Internet.email }
+    password 'secret'
   end
 
   factory :linked_user, :parent => :user do
@@ -11,4 +13,12 @@ FactoryGirl.define do
       ]
     end
   end
+
+  factory :identity_user, :parent => :user do
+    after(:create) do |user|
+      user.identities = [
+        FactoryGirl.build(:identity, :provider => 'identity', :uid => user.uid)
+      ]
+    end
+  end
 end

data/spec/features/facebook_registration_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+# FIXME Relies on spec/dummy/config/initializers/omniauth-facebook.rb or you get
+# stack/routing/middleware issues.
+#
+feature "Facebook Registration", :omniauth => true do
+  background do
+    FactoryGirl.create(:linked_user)
+  end
+
+  scenario "Signing up with Facebook" do
+    visit '/auth/facebook'
+    page.should have_text 'Welcome to The app!'
+  end
+end
+

data/spec/features/identity_login_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+# FIXME Relies on spec/dummy/config/initializers/omniauth-identity.rb or you get
+# stack/routing/middleware issues.
+#
+feature "Identity Login" do
+  background do
+    FactoryGirl.create(:identity_user, :email => 'user@example.com', :password => 'caplin')
+  end
+
+  scenario "Signing in with correct credentials" do
+    visit '/login'
+    fill_in 'Email', :with => 'user@example.com'
+    fill_in 'Password', :with => 'caplin'
+    click_button 'Sign in'
+    page.should have_content 'Signed in!'
+  end
+
+  scenario "Signing in as invalid user" do
+    visit '/login'
+    fill_in 'Email', :with => 'user@example.com'
+    fill_in 'Password', :with => 'bogus'
+    click_button 'Sign in'
+    page.should have_content 'Authentication failed, please try again.'
+  end
+end

data/spec/features/identity_registration_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+# FIXME Relies on spec/dummy/config/initializers/omniauth-identity.rb or you get
+# stack/routing/middleware issues.
+#
+feature "Identity Registration" do
+  background do
+    FactoryGirl.create(:identity_user, :email => 'user@example.com', :password => 'caplin')
+  end
+
+  scenario "Signing up with existing email" do
+    visit '/signup'
+    fill_in 'Email', :with => 'user@example.com'
+    fill_in 'password', :with => 'caplin'
+    fill_in 'password_confirmation', :with => 'caplin'
+    click_button 'Sign Up'
+    page.should have_css('.error')
+    page.should have_button('Sign Up')
+  end
+
+  scenario "Signing up with valid email" do
+    visit '/signup'
+    fill_in 'Email', :with => 'diffuser@example.com'
+    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_no_css('.error')
+    page.should have_no_button('Sign Up')
+  end
+end

data/spec/generators/socialite/install_generator_spec.rb

@@ -22,6 +22,7 @@ describe Socialite::Generators::InstallGenerator do
   it 'should run all tasks in the generator' do
     gen = generator %w(install)
     gen.should_receive :copy_initializer
+    gen.should_receive :mount_engine
     capture(:stdout) { gen.invoke_all }
   end
 
@@ -30,7 +31,8 @@ describe Socialite::Generators::InstallGenerator do
     before do
       run_generator %w(install)
     end
-    describe 'the spec' do
+
+    describe 'the configuration file' do
       # file - gives you the absolute path where the generator will create the file
       subject { file('config/initializers/socialite.rb') }
        # should exist - verifies the file exists
@@ -39,5 +41,10 @@ describe Socialite::Generators::InstallGenerator do
       # should contain - verifies the file's contents
       it { should contain(/Socialite.setup do \|config\|/) }
     end
+
+    describe 'the routes file' do
+      subject { file('config/routes.rb') }
+      it { should contain(/mount Socialite::Engine, :at => '\/socialite'/) }
+    end
   end
 end

data/spec/generators/socialite/views_generator_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require "generators/socialite/views_generator"
+
+describe Socialite::Generators::ViewsGenerator do
+  destination File.expand_path("../../../../tmp", __FILE__)
+
+  before(:each) do
+    prepare_destination
+    %w(config script).each do |dir|
+      `ln -s #{Rails.root + dir} #{destination_root}`
+    end
+  end
+
+  after(:each) do
+    unless example.exception
+      prepare_destination
+    end
+  end
+
+  # using mocks to ensure proper methods are called
+  # invoke_all - will call all the tasks in the generator
+  it 'should run all tasks in the generator' do
+    gen = generator %w(views)
+    gen.should_receive :copy_views
+    capture(:stdout) { gen.invoke_all }
+  end
+end