easy_auth 0.0.5 → 0.1.0

data/README.md

@@ -1,6 +1,8 @@
 # EasyAuth #
 
-[![Build Status](http://travis-ci.org/dockyard/easy_auth.png)](http://travis-ci.org/dockyard/easy_auth)
+[![Build Status](https://secure.travis-ci.org/dockyard/easy_auth.png?branch=master)](http://travis-ci.org/dockyard/easy_auth)
+[![Dependency Status](https://gemnasium.com/dockyard/easy_auth.png?travis)](https://gemnasium.com/dockyard/easy_auth)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/dockyard/easy_auth)
 
 Dead simple drop in authentication for Rails
 

data/Rakefile

@@ -1,26 +1,10 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+Bundler::GemHelper.install_tasks
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'EasyAuth'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new('default') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks

data/app/helpers/easy_auth_helper.rb

@@ -0,0 +1,41 @@
+module EasyAuthHelper
+  def self.included(base)
+    base.class_eval do
+      helper_method :current_account, :current_user, :account_signed_in?, :user_signed_in?, :account_not_signed_in?, :user_not_signed_in?
+    end
+  end
+
+  def current_account
+    if session[:session_token] && session[:account_class]
+      begin
+        @current_account ||= session[:account_class].constantize.find_by_session_token(session[:session_token])
+      rescue
+        @current_account = nil
+        session.delete(:session_token)
+      end
+    elsif cookies[:remember_token]
+      begin
+        @current_account ||= EasyAuth.identity_model.find_by_remember_token(cookies[:remember_token]).account
+      rescue
+        @current_acount = nil
+        cookies.delete(:remember_token)
+      end
+    else
+      session.delete(:session_token)
+      cookies.delete(:remember_token)
+    end
+
+    @current_account
+  end
+  alias :current_user :current_account
+
+  def account_signed_in?
+    current_account
+  end
+  alias :user_signed_in? :account_signed_in?
+
+  def account_not_signed_in?
+    !account_signed_in?
+  end
+  alias :user_not_signed_in? :account_not_signed_in?
+end

data/app/models/easy_auth/identity.rb

@@ -0,0 +1,3 @@
+class EasyAuth::Identity < ActiveRecord::Base
+  include EasyAuth::Models::Identity
+end

data/db/migrate/{20120227014023_create_identities.rb → 20120227014023_create_easy_auth_identities.rb}

@@ -1,12 +1,13 @@
-class CreateIdentities < ActiveRecord::Migration
+class CreateEasyAuthIdentities < ActiveRecord::Migration
   def change
     create_table :identities do |t|
       t.string  :username
-      t.string  :password_digest
+      t.string  :token
       t.string  :account_type
       t.integer :account_id
       t.string  :reset_token
       t.string  :remember_token
+      t.string  :type
       t.timestamps
     end
 

data/lib/easy_auth/controllers/authenticated.rb

@@ -0,0 +1,19 @@
+module EasyAuth::Controllers::Authenticated
+  extend EasyAuth::ReverseConcern
+
+  reverse_included do
+    before_filter :attempt_to_authenticate
+  end
+
+  private
+
+  def attempt_to_authenticate
+    if account_not_signed_in?
+      session[:requested_path] = request.path
+      respond_to do |format|
+        format.html { redirect_to main_app.sign_in_url }
+        format.json { render :json => {}, :status => 401 }
+      end
+    end
+  end
+end

data/lib/easy_auth/controllers/sessions.rb

@@ -0,0 +1,86 @@
+module EasyAuth::Controllers::Sessions
+  extend EasyAuth::ReverseConcern
+
+  def new
+    EasyAuth.new_session(self)
+  end
+
+  def create
+    if identity = EasyAuth.authenticate(self)
+      identity.set_account_session(session)
+      set_remember(identity)
+      if identity.remember
+        cookies[:remember_token] = { :value => identity.generate_remember_token!, :expires => identity.remember_time.from_now }
+      end
+      after_successful_sign_in(identity)
+    else
+      @identity = EasyAuth.find_identity_model(self).new(params[params[:identity]])
+      after_failed_sign_in(@identity)
+    end
+  end
+
+  def destroy
+    session.delete(:session_token)
+    session.delete(:account_class)
+    cookies.delete(:remember_token)
+    after_sign_out
+  end
+
+  private
+
+  def after_with_or_default(method_name, identity)
+    send("#{method_name}_with_#{params[:identity]}", identity) || send("#{method_name}_default", identity)
+  end
+
+  def after_successful_sign_in(identity)
+    after_with_or_default(__method__, identity)
+  end
+
+  def after_successful_sign_in_url(identity)
+    after_with_or_default(__method__, identity)
+  end
+
+  def after_failed_sign_in(identity)
+    after_with_or_default(__method__, identity)
+  end
+
+  def after_successful_sign_in_default(identity)
+    redirect_to(session.delete(:requested_path) || after_successful_sign_in_url(identity), :notice => I18n.t('easy_auth.sessions.create.notice'))
+  end
+
+  def after_successful_sign_in_url_default(identity)
+    identity.account
+  end
+
+  def after_failed_sign_in_default(identity)
+    flash.now[:error] = I18n.t('easy_auth.sessions.create.error')
+    render :new
+  end
+
+  def after_sign_out
+    redirect_to main_app.root_url, :notice => I18n.t('easy_auth.sessions.delete.notice')
+  end
+
+  def no_authentication
+    if account_signed_in?
+      redirect_to no_authentication_url
+    end
+  end
+
+  def no_authentication_url
+    main_app.root_url
+  end
+
+  def method_missing(method_name, *args)
+    # Swallow exceptions for identity callbacks
+    unless method_name =~ /after_\w+_with_\w+/
+      super
+    end
+  end
+
+  def set_remember(identity)
+    if identity_attributes = params[ActiveModel::Naming.param_key(EasyAuth.find_identity_model(self).new)]
+      identity.remember = identity_attributes[:remember]
+    end
+  end
+end

data/lib/easy_auth/controllers.rb

@@ -0,0 +1,5 @@
+module EasyAuth::Controllers
+  extend ActiveSupport::Autoload
+  autoload :Authenticated
+  autoload :Sessions
+end

data/lib/easy_auth/engine.rb

@@ -2,11 +2,6 @@ module EasyAuth
   class Engine < ::Rails::Engine
     isolate_namespace EasyAuth
 
-    initializer 'filter_parameters' do |app|
-      app.config.filter_parameters += [:password]
-      app.config.filter_parameters.uniq!
-    end
-
     config.generators do |g|
       g.test_framework :rspec, :view_specs => false
     end

data/lib/easy_auth/mailers.rb

@@ -0,0 +1,3 @@
+module EasyAuth::Mailers
+  extend ActiveSupport::Autoload
+end

data/lib/easy_auth/models/account.rb

@@ -0,0 +1,38 @@
+module EasyAuth::Models::Account
+  include EasyAuth::TokenGenerator
+  extend  EasyAuth::ReverseConcern
+  class   NoIdentityUsernameError < StandardError; end
+
+  reverse_included do
+    # Relationships
+    has_many :identities, :class_name => 'EasyAuth::Identity', :as => :account, :dependent => :destroy
+
+    def identity_username_attribute
+      self.send(self.class.identity_username_attribute)
+    end
+  end
+
+  module ClassMethods
+    def identity_username_attribute
+      if respond_to?(:super)
+        super
+      elsif column_names.include?('username')
+        :username
+      elsif column_names.include?('email')
+        :email
+      else
+        raise EasyAuth::Models::Account::NoIdentityUsernameError, 'your model must have either a #username or #email attribute. Or you must override the .identity_username_attribute class method'
+      end
+    end
+  end
+
+  def generate_session_token!
+    self.update_column(:session_token, _generate_token(:session))
+    self.session_token
+  end
+
+  def set_session(session)
+    session[:session_token] = generate_session_token!
+    session[:account_class] = self.class.to_s
+  end
+end

data/lib/easy_auth/models/identities.rb

@@ -0,0 +1,3 @@
+module EasyAuth::Models::Identities
+  extend ActiveSupport::Autoload
+end

data/lib/easy_auth/models/identity.rb

@@ -0,0 +1,43 @@
+module EasyAuth::Models::Identity
+  include EasyAuth::TokenGenerator
+  include EasyAuth::ReverseConcern
+
+  def self.included(base)
+    base.class_eval do
+      self.table_name = :identities
+      belongs_to :account, :polymorphic => true
+      extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def authenticate(controller = nil)
+      raise NotImplementedError
+    end
+
+    def new_session(controller)
+      controller.instance_variable_set(:@identity, self.new)
+    end
+  end
+
+  def set_account_session(session)
+    account.set_session(session)
+  end
+
+  def remember
+    @remember
+  end
+
+  def remember=(value)
+    @remember = ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+  end
+
+  def generate_remember_token!
+    update_column(:remember_token, _generate_token(:remember))
+    remember_token
+  end
+
+  def remember_time
+    1.year
+  end
+end

data/lib/easy_auth/models.rb

@@ -0,0 +1,7 @@
+module EasyAuth::Models
+  extend ActiveSupport::Autoload
+
+  autoload :Account
+  autoload :Identities
+  autoload :Identity
+end

data/lib/easy_auth/reverse_concern.rb

@@ -0,0 +1,27 @@
+module EasyAuth::ReverseConcern
+  def self.extended(base)
+    base.instance_variable_set("@_dependencies", [])
+  end
+
+  def append_features(base)
+    if base.instance_variable_defined?("@_dependencies")
+      base.instance_variable_get("@_dependencies") << self
+      return false
+    else
+      return false if base < self
+      base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+      base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+      @_dependencies.each { |dep| base.send(:include, dep) }
+      super
+    end
+  end
+
+  def reverse_included(base = nil, &block)
+    if base.nil?
+      @_included_block = block
+    else
+      super
+    end
+  end
+end
+

data/lib/easy_auth/routes.rb

@@ -1,21 +1,8 @@
-module ActionDispatch::Routing
-  class Mapper
-    def easy_auth_routes
-      easy_auth_session_routes
-      easy_auth_password_reset_routes
-    end
-
-    def easy_auth_session_routes
-      get  '/sign_out' => 'sessions#destroy', :as => :sign_out
-      get  '/sign_in'  => 'sessions#new',     :as => :sign_in
-      post '/sign_in'  => 'sessions#create'
-    end
-
-    def easy_auth_password_reset_routes
-      get  '/password_reset' => 'password_reset#new', :as => :password_reset
-      post '/password_reset' => 'password_reset#create'
-      get  '/password_reset/:reset_token' => 'password_reset#edit', :as => :edit_password
-      put  '/password_reset/:reset_token' => 'password_reset#update'
+module EasyAuth::Routes
+  def easy_auth_routes
+    get  '/sign_out' => 'sessions#destroy', :as => :sign_out
+    methods.grep(/easy_auth_\w+_routes/).each do |routes|
+      send(routes)
     end
   end
 end

data/lib/easy_auth/token_generator.rb

@@ -0,0 +1,7 @@
+module EasyAuth::TokenGenerator
+  private
+
+  def _generate_token(type)
+    token = BCrypt::Password.create("#{id}-#{type}_token-#{DateTime.current}")
+  end
+end

data/lib/easy_auth/version.rb

@@ -1,3 +1,3 @@
 module EasyAuth
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/lib/easy_auth.rb

@@ -1,9 +1,51 @@
+require 'active_support'
 require 'bcrypt'
 require 'easy_auth/engine'
-require 'easy_auth/routes'
+require 'easy_auth/version'
 
 module EasyAuth
+  extend ActiveSupport::Autoload
+
+  autoload :Controllers
+  autoload :Mailers
+  autoload :Models
+  autoload :ReverseConcern
+  autoload :Routes
+  autoload :TokenGenerator
+
   def self.identity_model
-    Identity
+    EasyAuth::Identity
+  end
+
+  def self.account_model
+    User
+  end
+
+  def self.authenticate(controller)
+    if identity_model = find_identity_model(controller)
+      identity_model.authenticate(controller)
+    end
+  end
+
+  def self.new_session(controller)
+    identity_model = find_identity_model(controller)
+    identity_model.new_session(controller)
+  end
+
+  def self.config(&block)
+    yield self
+  end
+
+  private
+
+  def self.find_identity_model(controller)
+    method_name = "#{controller.params[:identity]}_identity_model"
+    if respond_to?(method_name)
+      send(method_name, controller)
+    else
+      controller.params[:identity].to_s.camelcase.constantize
+    end
   end
 end
+
+ActionDispatch::Routing::Mapper.send(:include, EasyAuth::Routes)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-email
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -129,35 +129,35 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: bourne
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: bourne
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -173,7 +173,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -198,32 +198,27 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/authenticated_controller.rb
-- app/controllers/password_reset_controller.rb
 - app/controllers/sessions_controller.rb
-- app/mailers/password_reset_mailer.rb
-- app/mixins/easy_auth/controllers/authenticated.rb
-- app/mixins/easy_auth/controllers/password_reset.rb
-- app/mixins/easy_auth/controllers/sessions.rb
-- app/mixins/easy_auth/helpers.rb
-- app/mixins/easy_auth/mailers/password_reset.rb
-- app/mixins/easy_auth/models/account.rb
-- app/mixins/easy_auth/models/identity.rb
-- app/models/identity.rb
-- app/views/layouts/easy_auth/application.html.erb
-- app/views/password_reset/edit.html.erb
-- app/views/password_reset/new.html.erb
-- app/views/password_reset_mailer/reset.html.erb
-- app/views/password_reset_mailer/reset.text.erb
-- app/views/sessions/new.html.erb
+- app/helpers/easy_auth_helper.rb
+- app/models/easy_auth/identity.rb
 - config/locales/en.yml
 - config/routes.rb
-- db/migrate/20120227014023_create_identities.rb
+- db/migrate/20120227014023_create_easy_auth_identities.rb
+- lib/easy_auth/controllers/authenticated.rb
+- lib/easy_auth/controllers/sessions.rb
+- lib/easy_auth/controllers.rb
 - lib/easy_auth/engine.rb
+- lib/easy_auth/mailers.rb
+- lib/easy_auth/models/account.rb
+- lib/easy_auth/models/identities.rb
+- lib/easy_auth/models/identity.rb
+- lib/easy_auth/models.rb
+- lib/easy_auth/reverse_concern.rb
 - lib/easy_auth/routes.rb
+- lib/easy_auth/token_generator.rb
 - lib/easy_auth/version.rb
 - lib/easy_auth.rb
 - lib/tasks/easy_auth_tasks.rake
-- MIT-LICENSE
 - Rakefile
 - README.md
 homepage: https://github.com/dockyard/easy_auth
@@ -240,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 409473676038941757
+      hash: -3015113123042150927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 409473676038941757
+      hash: -3015113123042150927
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2012 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/controllers/password_reset_controller.rb

@@ -1,3 +0,0 @@
-class PasswordResetController < ApplicationController
-  include EasyAuth::Controllers::PasswordReset
-end

data/app/mailers/password_reset_mailer.rb

@@ -1,4 +0,0 @@
-class PasswordResetMailer < ActionMailer::Base
-  include EasyAuth::Mailers::PasswordReset
-  default :from => 'from@example.com'
-end

data/app/mixins/easy_auth/controllers/authenticated.rb

@@ -1,14 +0,0 @@
-module EasyAuth::Controllers::Authenticated
-  def self.included(base)
-    base.before_filter :attempt_to_authenticate
-  end
-
-  private
-
-  def attempt_to_authenticate
-    if user_not_signed_in?
-      session[:requested_path] = request.path
-      redirect_to main_app.sign_in_url
-    end
-  end
-end

data/app/mixins/easy_auth/controllers/password_reset.rb

@@ -1,56 +0,0 @@
-module EasyAuth::Controllers::PasswordReset
-  def self.included(base)
-    base.instance_eval do
-      before_filter :find_identity_from_reset_token, :only => [:edit, :update]
-    end
-  end
-
-  def new
-    @identity = EasyAuth.identity_model.new
-  end
-
-  def create
-    if @identity = EasyAuth.identity_model.where(:username => params[:identity][:username]).first
-      @identity.generate_reset_token!
-      PasswordResetMailer.reset(@identity.id).deliver
-    else
-      @identity = EasyAuth.identity_model.new(params[:identity])
-    end
-
-    flash.now[:notice] = I18n.t('easy_auth.password_reset.create.notice')
-    render :new
-  end
-
-  def update
-    if @identity.update_attributes(scope_to_password_params(:identity))
-      after_successful_password_reset(@identity)
-    else
-      after_failed_sign_in(@identity)
-    end
-  end
-
-  private
-
-  def scope_to_password_params(key)
-    params[key].select { |k, v| ['password', 'password_confirmation'].include?(k) }
-  end
-
-  def find_identity_from_reset_token
-    @identity = EasyAuth.identity_model.where(:reset_token => params[:reset_token].to_s).first
-  end
-
-  def after_successful_password_reset(identity)
-    identity.set_account_session(session)
-    identity.update_attribute(:reset_token, nil)
-    redirect_to after_successful_password_reset_url(identity), :notice => I18n.t('easy_auth.password_reset.update.notice')
-  end
-
-  def after_successful_password_reset_url(identity)
-    identity.account
-  end
-
-  def after_failed_password_reset(identity)
-    flash.now[:error] = I18n.t('easy_auth.password_reset.update.error')
-    render :new
-  end
-end

data/app/mixins/easy_auth/controllers/sessions.rb

@@ -1,43 +0,0 @@
-module EasyAuth::Controllers::Sessions
-  def new
-    @identity = EasyAuth.identity_model.new
-  end
-
-  def create
-    if identity = EasyAuth.identity_model.authenticate(params[:identity])
-      identity.set_account_session(session)
-      if identity.remember
-        cookies[:remember_token] = { :value => identity.generate_remember_token!, :expires => identity.remember_time.from_now }
-      end
-      after_successful_sign_in(identity)
-    else
-      @identity = EasyAuth.identity_model.new(params[:identity])
-      after_failed_sign_in(@identity)
-    end
-  end
-
-  def destroy
-    session.delete(:session_token)
-    cookies.delete(:remember_token)
-    after_sign_out
-  end
-
-  private
-
-  def after_successful_sign_in(identity)
-    redirect_to session.delete(:requested_path) || after_successful_sign_in_url(identity), :notice => I18n.t('easy_auth.sessions.create.notice')
-  end
-
-  def after_successful_sign_in_url(identity)
-    identity.account
-  end
-
-  def after_failed_sign_in(identity)
-    flash.now[:error] = I18n.t('easy_auth.sessions.create.error')
-    render :new
-  end
-
-  def after_sign_out
-    redirect_to main_app.root_url, :notice => I18n.t('easy_auth.sessions.delete.notice')
-  end
-end

data/app/mixins/easy_auth/helpers.rb

@@ -1,44 +0,0 @@
-module EasyAuth
-  module Helpers
-    def self.included(base)
-      base.class_eval do
-        helper_method :current_account, :current_user, :account_signed_in?, :user_signed_in?, :account_not_signed_in?, :user_not_signed_in?
-      end
-    end
-
-    def current_account
-      if session[:session_token] && session[:account_class]
-        begin
-          @current_account ||= session[:account_class].constantize.find_by_session_token(session[:session_token])
-        rescue
-          @current_account = nil
-          session.delete(:session_token)
-        end
-      elsif cookies[:remember_token]
-        begin
-          @current_account ||= EasyAuth.identity_model.find_by_remember_token(cookies[:remember_token]).account
-        rescue
-          @current_acount = nil
-          cookies.delete(:remember_token)
-        end
-      else
-        session.delete(:session_token)
-        cookies.delete(:remember_token)
-      end
-
-      @current_account
-    end
-    alias :current_user :current_account
-
-    def account_signed_in?
-      current_account
-    end
-    alias :user_signed_in? :account_signed_in?
-
-    def account_not_signed_in?
-      !account_signed_in?
-    end
-    alias :user_not_signed_in? :account_not_signed_in?
-
-  end
-end

data/app/mixins/easy_auth/mailers/password_reset.rb

@@ -1,11 +0,0 @@
-module EasyAuth::Mailers::PasswordReset
-  def self.included(base)
-    base.clear_action_methods!
-  end
-
-  def reset(id)
-    @identity = EasyAuth.identity_model.find(id)
-    @url = edit_password_url(@identity.reset_token)
-    mail :to => @identity.account.email, :subject => 'Password reset'
-  end
-end

data/app/mixins/easy_auth/models/account.rb

@@ -1,56 +0,0 @@
-module EasyAuth::Models::Account
-  class NoIdentityUsernameError < StandardError; end
-  def self.included(base)
-    base.class_eval do
-      unless respond_to?(:identity_username_attribute)
-        def self.identity_username_attribute
-          if column_names.include?('username')
-            :username
-          elsif column_names.include?('email')
-            :email
-          else
-            raise EasyAuth::Models::Account::NoIdentityUsernameError, 'your model must have either a #username or #email attribute. Or you must override the .identity_username_attribute class method'
-          end
-        end
-      end
-
-      def identity_username_attribute
-        self.send(self.class.identity_username_attribute)
-      end
-
-      has_one :identity, :as => :account
-      before_create :setup_identity, :unless => :skip_identity_validations
-      before_update :update_identity, :unless => :skip_identity_validations
-
-      attr_accessor :password, :skip_identity_validations
-      validates :password, :presence => { :on => :create, :unless => :skip_identity_validations }, :confirmation => true
-      attr_accessible :password, :password_confirmation, :skip_identity_validations
-      validates identity_username_attribute, :presence => true, :unless => :skip_identity_validations
-    end
-  end
-
-  def generate_session_token!
-    token = BCrypt::Password.create("#{id}-session_token-#{DateTime.current}")
-    self.update_attribute(:session_token, token)
-    self.session_token
-  end
-
-  def set_session(session)
-    session[:session_token] = generate_session_token!
-    session[:account_class] = self.class.to_s
-  end
-
-  private
-
-  def setup_identity
-    build_identity(identity_attributes)
-  end
-
-  def update_identity
-    identity.update_attributes(identity_attributes)
-  end
-
-  def identity_attributes
-    { :username => self.identity_username_attribute, :password => self.password, :password_confirmation => self.password_confirmation }
-  end
-end

data/app/mixins/easy_auth/models/identity.rb

@@ -1,57 +0,0 @@
-module EasyAuth::Models::Identity
-  def self.included(base)
-    base.class_eval do
-      belongs_to :account, :polymorphic => true
-      has_secure_password
-      attr_accessible :username, :password, :password_confirmation, :remember
-      validates :username, :uniqueness => true, :presence => true
-      validates :password, :presence => { :on => :create }
-      extend ClassMethods
-    end
-  end
-
-  module ClassMethods
-    def authenticate(attributes = nil)
-      return nil if attributes.nil?
-
-      if identity = where(arel_table[:username].matches(attributes[:username].try(&:strip))).first.try(:authenticate, attributes[:password])
-        identity.remember = attributes[:remember]
-        identity
-      else
-        nil
-      end
-    end
-  end
-
-  def set_account_session(session)
-    account.set_session(session)
-  end
-
-  def remember
-    @remember
-  end
-
-  def remember=(value)
-    @remember = ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
-  end
-
-  def generate_reset_token!
-    update_attribute(:reset_token, URI.escape(_generate_token(:reset).gsub(/[\.|\\\/]/,'')))
-    self.reset_token
-  end
-
-  def generate_remember_token!
-    self.update_attribute(:remember_token, _generate_token(:remember))
-    self.remember_token
-  end
-
-  def remember_time
-    1.year
-  end
-
-  private
-
-  def _generate_token(type)
-    token = BCrypt::Password.create("#{id}-#{type}_token-#{DateTime.current}")
-  end
-end

data/app/models/identity.rb

@@ -1,3 +0,0 @@
-class Identity < ActiveRecord::Base
-  include EasyAuth::Models::Identity
-end

data/app/views/layouts/easy_auth/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>EasyAuth</title>
-  <%= stylesheet_link_tag    "easy_auth/application", :media => "all" %>
-  <%= javascript_include_tag "easy_auth/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

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

@@ -1,13 +0,0 @@
-<%= form_for @identity, :url => main_app.edit_password_path(params[:reset_token]) do |f| %>
-  <p>
-    <%= f.label :password %>
-    <%= f.text_field :password %>
-  </p>
-  <p>
-    <%= f.label :password_confirmation %>
-    <%= f.text_field :password_confirmation %>
-  </p>
-  <p>
-    <%= f.submit 'Submit' %>
-  </p>
-<% end %>

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

@@ -1,9 +0,0 @@
-<%= form_for @identity, :url => main_app.password_reset_path do |f| %>
-  <p>
-    <%= f.label :username %>
-    <%= f.text_field :username %>
-  </p>
-  <p>
-    <%= f.submit 'Submit' %>
-  </p>
-<% end %>

data/app/views/password_reset_mailer/reset.html.erb

@@ -1 +0,0 @@
-<%= link_to 'Reset password', @url %>

data/app/views/password_reset_mailer/reset.text.erb

@@ -1 +0,0 @@
-Reset password: <%= @url %>

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

@@ -1,17 +0,0 @@
-<%= form_for @identity, :url => main_app.sign_in_path do |f| %>
-  <p>
-    <%= f.label :username %>
-    <%= f.text_field :username %>
-  </p>
-  <p>
-    <%= f.label :password %>
-    <%= f.password_field :password %>
-  </p>
-  <p>
-    <%= f.label :remember, "Remember for #{@identity.remember_time.inspect}" %>
-    <%= f.check_box :remember %>
-  </p>
-  <p>
-    <%= f.submit 'Submit' %>
-  </p>
-<% end %>