socialite 0.0.1.beta → 0.0.1.beta2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    socialite (0.0.1.beta)
+    socialite (0.0.1.beta2)
       grackle (~> 0.1.10)
       haml (~> 3.1.2)
       koala (~> 1.2.0beta4)

data/app/controllers/socialite/session_controller.rb

@@ -7,22 +7,6 @@ module Socialite
 
     respond_to :html, :json
 
-    # Render the login page.
-    def new
-      respond_with(@user = User.new)
-    end
 
-    # Destroy the session, logging out the current user.
-    def destroy
-      @user = current_user
-      if logout!
-        flash_message :notice, 'You have been logged out.'
-      else
-        flash_message :error, 'We had trouble signing you out.'
-      end
-      respond_with(@user) do |format|
-        format.html { redirect_to default_route }
-      end
-    end
   end
 end

data/app/models/socialite/facebook_identity.rb

@@ -1,7 +1,5 @@
 module Socialite
   class FacebookIdentity < ActiveRecord::Base
-    has_one :identity, :as => :api
-    delegate :access_token, :access_token_secret, :to => :identity, :allow_nil => true
-    include ApiWrappers::Facebook
+    include Models::FacebookIdentity
   end
 end

data/app/models/socialite/identity.rb

@@ -1,6 +1,5 @@
 module Socialite
   class Identity < ActiveRecord::Base
-    belongs_to :api, :polymorphic => true, :dependent => :destroy
-    include BaseIdentity
+    include Models::Identity
   end
 end

data/app/models/socialite/user.rb

@@ -1,42 +1,10 @@
 module Socialite
   class User < ActiveRecord::Base
-    has_many :identities, :dependent => :destroy
+    include Models::User
 
     has_one :facebook_identity,
       :class_name => 'Identity', :foreign_key => 'user_id', :conditions => { :provider => 'facebook' }
     has_one :twitter_identity,
       :class_name => 'Identity', :foreign_key => 'user_id', :conditions => { :provider => 'twitter' }
-
-    # Returns the first linked facebook identity
-    #
-    # @return [FacebookIdentity] the first facebook identity
-    def facebook
-      self.facebook_identity.api
-    end
-
-    # Returns the first linked twitter account
-    #
-    # @return [TwitterIdentity] the first twitter identity
-    def twitter
-      self.twitter_identity.api
-    end
-
-    # Set the user's remember token
-    #
-    # @return [User] the current user
-    def remember_me!
-      self.remember_token = Socialite.generate_token
-      save(:validate => false)
-    end
-
-    # Clear the user's remember token
-    #
-    # @return [User] the current user
-    def forget_me!
-      if persisted?
-        self.remember_token = nil
-        save(:validate => false)
-      end
-    end
   end
 end

data/config/routes.rb

@@ -5,6 +5,6 @@ Socialite::Engine.routes.draw do
   match '/logout'                 => 'session#destroy',  :as => :logout
 
   resource :user, :controller => 'user', :except => [:new, :create] do
-    resources :identities#, :only => [:show, :destroy]
+    resources :identities
   end
 end

data/lib/generators/socialite/install_generator.rb

@@ -0,0 +1,21 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Socialite
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      desc 'Generates the socialite initializer'
+
+      def self.source_root
+        File.join(File.dirname(__FILE__), 'templates')
+      end
+
+      def copy_initializer
+        template 'socialite.rb', 'config/initializers/socialite.rb'
+      end
+
+    end
+  end
+end

data/lib/generators/socialite/templates/socialite.rb

@@ -0,0 +1,15 @@
+require 'socialite'
+
+Socialite.setup do |config|
+  # ==> Twitter
+  # config.twitter 'APP_KEY', 'APP_SECRET'
+
+  # ==> Facebook
+  # config.facebook 'APP_KEY', 'APP_SECRET', :scope => 'publish_stream'
+
+  if Rails.env.production?
+    # Configs for production mode go here
+  elsif Rails.env.development?
+    # Configs for development mode go here
+  end
+end

data/lib/socialite.rb

@@ -3,7 +3,7 @@ require 'omniauth/core'
 require 'omniauth/oauth'
 
 module Socialite
-  autoload :BaseIdentity, 'socialite/base_identity'
+  autoload :ControllerSupport, 'socialite/controller_support'
   autoload :ServiceConfig, 'socialite/service_config'
 
   module ApiWrappers
@@ -11,6 +11,23 @@ module Socialite
     autoload :Twitter, 'socialite/api_wrappers/twitter'
   end
 
+  module Controllers
+    autoload :Helpers, 'socialite/controllers/helpers'
+    autoload :Identities, 'socialite/controllers/identities'
+    autoload :Session, 'socialite/controllers/session'
+    autoload :User, 'socialite/controllers/user'
+  end
+
+  module Helpers
+    autoload :Authentication, 'socialite/helpers/authentication.rb'
+  end
+
+  module Models
+    autoload :Identity, 'socialite/models/identity'
+    autoload :User, 'socialite/models/user'
+    autoload :FacebookIdentity, 'socialite/models/facebook_identity.rb'
+  end
+
   mattr_accessor :service_configs, :root_path, :mount_prefix
   @@service_configs = {}
 
@@ -33,5 +50,4 @@ module Socialite
   end
 end
 
-require 'socialite/controller_support'
 require 'socialite/engine'

data/lib/socialite/controllers/helpers.rb

@@ -0,0 +1,138 @@
+module Socialite
+  module Controllers
+    module Helpers
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :current_user, :user_signed_in?, :current_user?, :default_route
+      end
+
+      module InstanceMethods
+
+        # Set default route for redirect
+        #
+        # @param [String] the path for default redirects
+        # @return [String] the default path for redirect
+        # (see #default_route)
+        def default_route=(route)
+          @default_route = route
+        end
+
+        # Get default route for redirect
+        #
+        # @return [String] the default path for redirect
+        # (see #default_route=)
+        def default_route
+          @default_route ||= '/'
+        end
+
+        # Helper for supporting multiple flash messages per type
+        #
+        # @param [Symbol] the type of flash message. Common types are
+        # :success, :notice, :error
+        # @param [String] the message to attach to the flash type
+        # @return [Hash] all associated flash messages for this request
+        def flash_message(type, text)
+          flash[type.to_sym] ||= []
+          flash[type.to_sym] << text
+        end
+
+      protected
+
+        # Filters
+
+        # Conditional check to see ensure a current user exists
+        #
+        # @return [Boolean]
+        # (see #current_user?)
+        def ensure_user
+           current_user? || deny_access('You must be logged in to perform this action.')
+        end
+
+        # Conditional check to see ensure there is no current user
+        #
+        # @return [Boolean]
+        # (see #current_user?)
+        def ensure_no_user
+           !current_user? || redirect_back_or_default
+        end
+
+        # Utils
+
+        # Store the location URL in the session for later use.
+        #
+        # @return [Hash] the modified session object
+        def store_location
+          session[:return_to] = request.fullpath
+        end
+
+        # Stores the URL for the current requested action, then redirects to
+        # the login page.
+        #
+        # @param [String] optional flash message to pass to the user
+        # @note This method sets the redirect path, but does not return false.
+        # Meaning you can perform actions after this method is invoked.
+        def deny_access(message=nil)
+          store_location
+          flash_message :notice, message if message.present?
+          redirect_to login_path
+        end
+
+        # Conditional redirect to handle an empty return_to path. If return_to
+        # is empty, the request is redirected to the default path
+        #
+        # @param [String] path to use as the default redirect location
+        # @return [Hash] the modified session hash
+        def redirect_back_or_default(default=nil)
+          default = self.default_route
+          redirect_to(session[:return_to] || default)
+          session[:return_to] = nil
+        end
+
+        # Fetch the User model associated with the current session.
+        #
+        # @return [User]
+        # (see #current_user=)
+        def current_user
+          @current_user ||= if session[:user_id]
+                              User.find(session[:user_id])
+                            elsif cookies[:remember_token]
+                              User.find_by_remember_token(cookies[:remember_token])
+                            end
+        end
+
+        # Assign the User model associated with the current session.
+        #
+        # @return [User]
+        # (see #current_user)
+        def current_user=(user)
+          user.tap do |user|
+            user.remember_me!
+            session[:user_id]         = user.id
+            cookies[:remember_token]  = user.remember_token
+          end
+        end
+
+        # Accessor method for checking if a user is currently signed in
+        #
+        # @return [Boolean]
+        # (see #current_user)
+        def user_signed_in?
+          !!current_user
+        end
+        alias_method :current_user?, :user_signed_in?
+
+        # Destroy the current user session, effectively logging them out upon
+        # the next request.
+        #
+        # @return [Hash] the modified session object
+        def logout!
+          session[:user_id] = nil
+          session[:return_to] = nil
+          @current_user = nil
+          cookies.delete(:remember_token)
+        end
+      end
+    end
+  end
+end

data/lib/socialite/engine.rb

@@ -22,11 +22,11 @@ module Socialite
     end
 
     ActiveSupport.on_load(:action_controller) do
-      include Socialite::ControllerSupport
+      include Socialite::Controllers::Helpers
     end
 
     ActiveSupport.on_load(:action_view) do
-      include Socialite::AuthenticationHelper
+      include Socialite::Helpers::Authentication
     end
   end
 end

data/lib/socialite/helpers/authentication.rb

@@ -0,0 +1,17 @@
+module Socialite
+  module Helpers
+    module Authentication
+      def identity_request_path(options={})
+        [Socialite.mount_prefix, 'auth', options[:service]].join('/')
+      end
+
+      def twitter_login_button
+        content_tag(:a, content_tag(:span, 'Sign in with Twitter'), :class => 'socialite_button twitter', :href => identity_request_path(:service => 'twitter'), :rel => 'external')
+      end
+
+      def facebook_login_button
+        content_tag(:a, content_tag(:span, 'Sign in with Facebook'), :class => 'socialite_button facebook', :href => identity_request_path(:service => 'facebook'), :rel => 'external')
+      end
+    end
+  end
+end

data/lib/socialite/models/facebook_identity.rb

@@ -0,0 +1,14 @@
+module Socialite
+  module Models
+    module FacebookIdentity
+      extend ActiveSupport::Concern
+
+      included do
+        include Socialite::ApiWrappers::Facebook
+
+        has_one :identity, :as => :api
+        delegate :access_token, :access_token_secret, :to => :identity, :allow_nil => true
+      end
+    end
+  end
+end

data/lib/socialite/models/identity.rb

@@ -0,0 +1,99 @@
+module Socialite
+  module Models
+    module Identity
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :api, :polymorphic => true, :dependent => :destroy
+        belongs_to :user
+        serialize :auth_hash
+
+        # Ensure that before validation happens that the provider
+        # database column matches what is inside of the auth_hash
+        # dataset.
+        before_validation do |identity|
+          if identity.auth_hash.present?
+            identity.provider = identity.auth_hash.delete('provider') if identity.provider.blank?
+            identity.unique_id = identity.auth_hash.delete('uid') if identity.unique_id.blank?
+          end
+        end
+
+        # Ensure each user has only a single identity per provider type
+        validates :provider,
+          :uniqueness => {:scope => :user_id, :case_sensitive => false},
+          :presence => true
+
+        # Ensure an identity is never reused by another account
+        validates :unique_id,
+          :uniqueness => {:scope => :provider},
+          :presence => true
+
+        # Ensure an associated user exists before creating the identity
+        # validates_associated :user
+      end
+
+      module ClassMethods
+        # Finder method that finds the matching Provider and Unique ID or
+        # initializes a new, unsaved, object.
+        #
+        # @params [Hash] the OAuth authentication hash
+        # @returns [Identity]
+        def find_or_initialize_by_oauth(auth_hash)
+          identity = where(:provider => auth_hash['provider'], :unique_id => auth_hash['uid']).first || new
+          identity.auth_hash = auth_hash
+          identity
+        end
+      end
+
+      module InstanceMethods
+        # Method that maps uid to unique_id which is what we store it as.
+        #
+        # @returns [String]
+        # def uid=(new_uid)
+        #   self.unique_id = new_uid
+        # end
+
+        # Convenience method for accessing the OAuth access token
+        #
+        # @returns [String] OAuth access token
+        # (see #credentials)
+        def access_token
+          credentials['token']
+        end
+
+        # Convenience method for accessing the OAuth access token secret
+        #
+        # @returns [String] OAuth access token secret
+        # (see #credentials)
+        def access_token_secret
+          credentials['secret']
+        end
+
+        # Convenience method for accessing the OAuth credentials sub-hash
+        #
+        # @returns [Hash] OAuth credentials sub-hash
+        # (see #access_token)
+        # (see #access_token_secret)
+        def credentials
+          auth_hash['credentials']
+        end
+
+        # Convenience method for accessing the nickname, which is typically
+        # set to the login name used for that provider.
+        #
+        # @returns [String] user nickname for the provider identity
+        def nickname
+          user_info['nickname']
+        end
+
+        # Convenience method for accessing the user information from the
+        # OAuth provider.
+        #
+        # @returns [Hash] the user information sub-hash
+        def user_info
+          auth_hash['user_info']
+        end
+      end
+    end
+  end
+end

data/lib/socialite/models/user.rb

@@ -0,0 +1,50 @@
+module Socialite
+  module Models
+    module User
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :identities, :dependent => :destroy
+
+        # has_one :facebook_identity,
+        #   :class_name => 'Identity', :foreign_key => 'user_id', :conditions => { :provider => 'facebook' }
+        # has_one :twitter_identity,
+        #   :class_name => 'Identity', :foreign_key => 'user_id', :conditions => { :provider => 'twitter' }
+      end
+
+      module InstanceMethods
+        # Returns the first linked facebook identity
+        #
+        # @return [FacebookIdentity] the first facebook identity
+        def facebook
+          self.facebook_identity.api
+        end
+
+        # Returns the first linked twitter account
+        #
+        # @return [TwitterIdentity] the first twitter identity
+        def twitter
+          self.twitter_identity.api
+        end
+
+        # Set the user's remember token
+        #
+        # @return [User] the current user
+        def remember_me!
+          self.remember_token = Socialite.generate_token
+          save(:validate => false)
+        end
+
+        # Clear the user's remember token
+        #
+        # @return [User] the current user
+        def forget_me!
+          if persisted?
+            self.remember_token = nil
+            save(:validate => false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/socialite/version.rb

@@ -1,3 +1,3 @@
 module Socialite
-  VERSION = '0.0.1.beta'
+  VERSION = '0.0.1.beta2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialite
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta
+  version: 0.0.1.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70144409985160 !ruby/object:Gem::Requirement
+  requirement: &70251593638160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70144409985160
+  version_requirements: *70251593638160
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70144409983220 !ruby/object:Gem::Requirement
+  requirement: &70251593636940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70144409983220
+  version_requirements: *70251593636940
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70144409981420 !ruby/object:Gem::Requirement
+  requirement: &70251593635780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70144409981420
+  version_requirements: *70251593635780
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70144409979300 !ruby/object:Gem::Requirement
+  requirement: &70251593634700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70144409979300
+  version_requirements: *70251593634700
 - !ruby/object:Gem::Dependency
   name: oa-core
-  requirement: &70144409975540 !ruby/object:Gem::Requirement
+  requirement: &70251593633480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70144409975540
+  version_requirements: *70251593633480
 - !ruby/object:Gem::Dependency
   name: oa-oauth
-  requirement: &70144409972360 !ruby/object:Gem::Requirement
+  requirement: &70251593632660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70144409972360
+  version_requirements: *70251593632660
 - !ruby/object:Gem::Dependency
   name: koala
-  requirement: &70144409970280 !ruby/object:Gem::Requirement
+  requirement: &70251593631600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.0beta4
   type: :runtime
   prerelease: false
-  version_requirements: *70144409970280
+  version_requirements: *70251593631600
 - !ruby/object:Gem::Dependency
   name: grackle
-  requirement: &70144409969040 !ruby/object:Gem::Requirement
+  requirement: &70251593630500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *70144409969040
+  version_requirements: *70251593630500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70144409967980 !ruby/object:Gem::Requirement
+  requirement: &70251593629640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144409967980
+  version_requirements: *70251593629640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70144409966300 !ruby/object:Gem::Requirement
+  requirement: &70251593628640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144409966300
+  version_requirements: *70251593628640
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70144409963460 !ruby/object:Gem::Requirement
+  requirement: &70251593627640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144409963460
+  version_requirements: *70251593627640
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70144409961560 !ruby/object:Gem::Requirement
+  requirement: &70251593626460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70144409961560
+  version_requirements: *70251593626460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70144409959880 !ruby/object:Gem::Requirement
+  requirement: &70251593625280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70144409959880
+  version_requirements: *70251593625280
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &70144409958200 !ruby/object:Gem::Requirement
+  requirement: &70251593624400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144409958200
+  version_requirements: *70251593624400
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70144409955920 !ruby/object:Gem::Requirement
+  requirement: &70251593623300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70144409955920
+  version_requirements: *70251593623300
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70144409953880 !ruby/object:Gem::Requirement
+  requirement: &70251593622420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *70144409953880
+  version_requirements: *70251593622420
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70144409951620 !ruby/object:Gem::Requirement
+  requirement: &70251593621060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70144409951620
+  version_requirements: *70251593621060
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70144409950080 !ruby/object:Gem::Requirement
+  requirement: &70251593619900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *70144409950080
+  version_requirements: *70251593619900
 description: Rails engine supporting multiple auth providers per user.
 email: justin.smestad@gmail.com
 executables: []
@@ -232,7 +232,6 @@ files:
 - app/controllers/socialite/identities_controller.rb
 - app/controllers/socialite/session_controller.rb
 - app/controllers/socialite/user_controller.rb
-- app/helpers/socialite/authentication_helper.rb
 - app/models/socialite/facebook_identity.rb
 - app/models/socialite/identity.rb
 - app/models/socialite/user.rb
@@ -262,12 +261,17 @@ files:
 - features/support/omniauth.rb
 - features/support/paths.rb
 - features/support/selectors.rb
+- lib/generators/socialite/install_generator.rb
+- lib/generators/socialite/templates/socialite.rb
 - lib/socialite.rb
 - lib/socialite/api_wrappers/facebook.rb
 - lib/socialite/api_wrappers/twitter.rb
-- lib/socialite/base_identity.rb
-- lib/socialite/controller_support.rb
+- lib/socialite/controllers/helpers.rb
 - lib/socialite/engine.rb
+- lib/socialite/helpers/authentication.rb
+- lib/socialite/models/facebook_identity.rb
+- lib/socialite/models/identity.rb
+- lib/socialite/models/user.rb
 - lib/socialite/service_config.rb
 - lib/socialite/version.rb
 - lib/tasks/.gitkeep
@@ -334,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1102070336379902951
+      hash: 3505192399675819770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/helpers/socialite/authentication_helper.rb

@@ -1,15 +0,0 @@
-module Socialite
-  module AuthenticationHelper
-    def identity_request_path(options={})
-      [Socialite.mount_prefix, 'auth', options[:service]].join('/')
-    end
-
-    def twitter_login_button
-      content_tag(:a, content_tag(:span, 'Sign in with Twitter'), :class => 'socialite_button twitter', :href => identity_request_path(:service => 'twitter'), :rel => 'external')
-    end
-
-    def facebook_login_button
-      content_tag(:a, content_tag(:span, 'Sign in with Facebook'), :class => 'socialite_button facebook', :href => identity_request_path(:service => 'facebook'), :rel => 'external')
-    end
-  end
-end

data/lib/socialite/base_identity.rb

@@ -1,96 +0,0 @@
-module Socialite
-  module BaseIdentity
-    extend ActiveSupport::Concern
-
-    included do
-      belongs_to :user
-      serialize :auth_hash
-
-      # Ensure that before validation happens that the provider
-      # database column matches what is inside of the auth_hash
-      # dataset.
-      before_validation do |identity|
-        if identity.auth_hash.present?
-          identity.provider = identity.auth_hash.delete('provider') if identity.provider.blank?
-          identity.unique_id = identity.auth_hash.delete('uid') if identity.unique_id.blank?
-        end
-      end
-
-      # Ensure each user has only a single identity per provider type
-      validates :provider,
-        :uniqueness => {:scope => :user_id, :case_sensitive => false},
-        :presence => true
-
-      # Ensure an identity is never reused by another account
-      validates :unique_id,
-        :uniqueness => {:scope => :provider},
-        :presence => true
-
-      # Ensure an associated user exists before creating the identity
-      # validates_associated :user
-    end
-
-    module ClassMethods
-      # Finder method that finds the matching Provider and Unique ID or
-      # initializes a new, unsaved, object.
-      #
-      # @params [Hash] the OAuth authentication hash
-      # @returns [Identity]
-      def find_or_initialize_by_oauth(auth_hash)
-        identity = where(:provider => auth_hash['provider'], :unique_id => auth_hash['uid']).first || new
-        identity.auth_hash = auth_hash
-        identity
-      end
-    end
-
-    module InstanceMethods
-      # Method that maps uid to unique_id which is what we store it as.
-      #
-      # @returns [String]
-      # def uid=(new_uid)
-      #   self.unique_id = new_uid
-      # end
-
-      # Convenience method for accessing the OAuth access token
-      #
-      # @returns [String] OAuth access token
-      # (see #credentials)
-      def access_token
-        credentials['token']
-      end
-
-      # Convenience method for accessing the OAuth access token secret
-      #
-      # @returns [String] OAuth access token secret
-      # (see #credentials)
-      def access_token_secret
-        credentials['secret']
-      end
-
-      # Convenience method for accessing the OAuth credentials sub-hash
-      #
-      # @returns [Hash] OAuth credentials sub-hash
-      # (see #access_token)
-      # (see #access_token_secret)
-      def credentials
-        auth_hash['credentials']
-      end
-
-      # Convenience method for accessing the nickname, which is typically
-      # set to the login name used for that provider.
-      #
-      # @returns [String] user nickname for the provider identity
-      def nickname
-        user_info['nickname']
-      end
-
-      # Convenience method for accessing the user information from the
-      # OAuth provider.
-      #
-      # @returns [Hash] the user information sub-hash
-      def user_info
-        auth_hash['user_info']
-      end
-    end
-  end
-end

data/lib/socialite/controller_support.rb

@@ -1,136 +0,0 @@
-module Socialite
-  module ControllerSupport
-    extend ActiveSupport::Concern
-
-    included do
-      helper_method :current_user, :user_signed_in?, :current_user?, :default_route
-    end
-
-    module InstanceMethods
-
-      # Set default route for redirect
-      #
-      # @param [String] the path for default redirects
-      # @return [String] the default path for redirect
-      # (see #default_route)
-      def default_route=(route)
-        @default_route = route
-      end
-
-      # Get default route for redirect
-      #
-      # @return [String] the default path for redirect
-      # (see #default_route=)
-      def default_route
-        @default_route ||= '/'
-      end
-
-      # Helper for supporting multiple flash messages per type
-      #
-      # @param [Symbol] the type of flash message. Common types are
-      # :success, :notice, :error
-      # @param [String] the message to attach to the flash type
-      # @return [Hash] all associated flash messages for this request
-      def flash_message(type, text)
-        flash[type.to_sym] ||= []
-        flash[type.to_sym] << text
-      end
-
-    protected
-
-      # Filters
-
-      # Conditional check to see ensure a current user exists
-      #
-      # @return [Boolean]
-      # (see #current_user?)
-      def ensure_user
-         current_user? || deny_access('You must be logged in to perform this action.')
-      end
-
-      # Conditional check to see ensure there is no current user
-      #
-      # @return [Boolean]
-      # (see #current_user?)
-      def ensure_no_user
-         !current_user? || redirect_back_or_default
-      end
-
-      # Utils
-
-      # Store the location URL in the session for later use.
-      #
-      # @return [Hash] the modified session object
-      def store_location
-        session[:return_to] = request.fullpath
-      end
-
-      # Stores the URL for the current requested action, then redirects to
-      # the login page.
-      #
-      # @param [String] optional flash message to pass to the user
-      # @note This method sets the redirect path, but does not return false.
-      # Meaning you can perform actions after this method is invoked.
-      def deny_access(message=nil)
-        store_location
-        flash_message :notice, message if message.present?
-        redirect_to login_path
-      end
-
-      # Conditional redirect to handle an empty return_to path. If return_to
-      # is empty, the request is redirected to the default path
-      #
-      # @param [String] path to use as the default redirect location
-      # @return [Hash] the modified session hash
-      def redirect_back_or_default(default=nil)
-        default = self.default_route
-        redirect_to(session[:return_to] || default)
-        session[:return_to] = nil
-      end
-
-      # Fetch the User model associated with the current session.
-      #
-      # @return [User]
-      # (see #current_user=)
-      def current_user
-        @current_user ||= if session[:user_id]
-                            User.find(session[:user_id])
-                          elsif cookies[:remember_token]
-                            User.find_by_remember_token(cookies[:remember_token])
-                          end
-      end
-
-      # Assign the User model associated with the current session.
-      #
-      # @return [User]
-      # (see #current_user)
-      def current_user=(user)
-        user.tap do |user|
-          user.remember_me!
-          session[:user_id]         = user.id
-          cookies[:remember_token]  = user.remember_token
-        end
-      end
-
-      # Accessor method for checking if a user is currently signed in
-      #
-      # @return [Boolean]
-      # (see #current_user)
-      def user_signed_in?
-        !!current_user
-      end
-      alias_method :current_user?, :user_signed_in?
-
-      # Destroy the current user session, effectively logging them out upon
-      # the next request.
-      #
-      # @return [Hash] the modified session object
-      def logout!
-        session[:user_id] = nil
-        session[:return_to] = nil
-        @current_user = nil
-        cookies.delete(:remember_token)
-      end
-    end
-  end
-end