authem 0.0.2 → 1.0.0.rc1

data/README.markdown

@@ -4,7 +4,7 @@ Authem is an authentication library for Ruby web applications.
 
 ## Compatibility
 
-Authem is tested against Ruby 1.8.7, 1.9.2, 1.9.3, Rubinius, and REE.
+Authem is tested against Ruby 1.9.2, 1.9.3, Rubinius
 
 [![Build Status](https://secure.travis-ci.org/paulelliott/authem.png)](http://travis-ci.org/paulelliott/authem)
 

data/Rakefile

@@ -1,9 +1,6 @@
-require 'rake/dsl_definition'
-require 'bundler/setup'
+require 'bundler'
 
-require "rspec"
 require "rspec/core/rake_task"
-
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end

data/lib/authem.rb

@@ -1,7 +1,10 @@
 module Authem
+  autoload :BaseUser,    'authem/base_user'
+  autoload :User,        'authem/user'
+  autoload :SorceryUser, 'authem/sorcery_user'
+
   autoload :Config, 'authem/config'
   autoload :ControllerSupport, 'authem/controller_support'
-  autoload :Model, 'authem/model'
   autoload :Token, 'authem/token'
 
   def self.configure(&block)

data/lib/authem/base_user.rb

@@ -0,0 +1,45 @@
+require 'bcrypt'
+
+module Authem::BaseUser
+  extend ::ActiveSupport::Concern
+
+  included do
+    attr_accessible :email, :password, :password_confirmation
+
+    validates_uniqueness_of :email
+    validates_format_of :email, with: /^\S+@\S+$/
+    validates_presence_of :password, on: :create
+    validates_confirmation_of :password, message: 'should match confirmation'
+
+    def self.find_by_email(email)
+      where("LOWER(email) = ?", email.downcase).first
+    end
+
+    def remember_token
+      self[:remember_token] || generate_token(:remember)
+    end
+
+    def session_token
+      self[:session_token] || generate_token(:session)
+    end
+
+    def reset_password(password, confirmation)
+      return false unless password.present?
+
+      self.password = password
+      self.password_confirmation = confirmation
+      self.reset_password_token = nil
+      save
+    end
+
+    def reset_password_token!
+      generate_token(:reset_password)
+    end
+
+    private
+
+    def generate_token(type)
+      Authem::Token.generate.tap { |token| update_column("#{type}_token", token) }
+    end
+  end
+end

data/lib/authem/controller_support.rb

@@ -3,34 +3,25 @@ module Authem::ControllerSupport
 
   protected
 
-  def sign_in(email_or_user, password=nil, remember_me=nil)
-    if email_or_user.is_a? String
-      email_or_user = Authem::Config.user_class.authenticate(email_or_user, password)
-    end
-    if email_or_user.is_a? Authem::Model
-      establish_presence(email_or_user)
-      remember_me! if remember_me
-      email_or_user
-    end
+  def sign_in(user, remember_me=true)
+    cookies.permanent.signed[:remember_token] = user.remember_token if remember_me
+    session[:session_token] = user.session_token
   end
 
   def sign_out
-    clear_session
-  end
-
-  def remember_me!
-    cookies.permanent.signed[:remember_me] = current_user.id
+    cookies[:remember_token] = nil
+    reset_session
+    @current_user = nil
   end
 
   def current_user
-    @current_user ||= (
-      if session[:user_id]
-        Authem::Config.user_class.where(id: session[:user_id]).first
-      elsif cookies[:remember_me].present?
-        user = Authem::Config.user_class.where(id: cookies.signed[:remember_me]).first
-        establish_presence(user) if user
+    if session[:session_token]
+      Authem::Config.user_class.where(session_token: session[:session_token].to_s).first
+    elsif cookies[:remember_token].present?
+      Authem::Config.user_class.where(remember_token: cookies.signed[:remember_token].to_s).first.tap do |user|
+        session[:session_token] = user.session_token if user
       end
-    )
+    end
   end
 
   def require_user
@@ -40,12 +31,8 @@ module Authem::ControllerSupport
     end
   end
 
-  def establish_presence(user)
-    return_to_url = session[:return_to_url]
-    clear_session
-    session[:return_to_url] = return_to_url
-    session[:user_id] = user.id
-    @current_user = user
+  def signed_in?
+    current_user.present?
   end
 
   def redirect_back_or_to(url, flash_hash = {})
@@ -54,11 +41,6 @@ module Authem::ControllerSupport
     redirect_to(url, :flash => flash_hash)
   end
 
-  def clear_session
-    cookies[:remember_me] = nil
-    reset_session
-  end
-
   included do
     helper_method :current_user
   end

data/lib/authem/sorcery_user.rb

@@ -0,0 +1,21 @@
+module Authem::SorceryUser
+  extend ::ActiveSupport::Concern
+  include Authem::BaseUser
+
+  included do
+    attr_accessor :password, :password_confirmation
+
+    before_save :encrypt_password
+
+    def authenticate(password)
+      self if crypted_password.present? && ::BCrypt::Password.new(crypted_password) == [password, salt].join
+    end
+
+    def encrypt_password
+      if password.present?
+        self.salt = ::BCrypt::Engine.generate_salt
+        self.crypted_password = ::BCrypt::Password.create([password, salt].join)
+      end
+    end
+  end
+end

data/lib/authem/user.rb

@@ -0,0 +1,10 @@
+module Authem::User
+  extend ::ActiveSupport::Concern
+  include Authem::BaseUser
+
+  included do
+    Authem::Config.user_class = self
+
+    has_secure_password
+  end
+end

data/lib/authem/version.rb

@@ -1,3 +1,3 @@
 module Authem
-  VERSION = '0.0.2'
+  VERSION = '1.0.0.rc1'
 end

metadata

@@ -1,119 +1,173 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: authem
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Authem provides a simple solution for email-based authentication.
-email: 
+email:
 - paul@hashrocket.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/authem/base_user.rb
 - lib/authem/config.rb
 - lib/authem/controller_support.rb
-- lib/authem/model.rb
+- lib/authem/sorcery_user.rb
 - lib/authem/token.rb
+- lib/authem/user.rb
 - lib/authem/version.rb
 - lib/authem.rb
 - LICENSE
@@ -121,30 +175,26 @@ files:
 - Rakefile
 homepage: https://github.com/paulelliott/authem
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Authem authenticates them by email
 test_files: []
-

data/lib/authem/model.rb

@@ -1,44 +0,0 @@
-require 'bcrypt'
-
-module Authem::Model
-  extend ::ActiveSupport::Concern
-
-  included do
-    Authem::Config.user_class = self
-
-    attr_accessor :password, :password_confirmation
-
-    attr_protected :crypted_password, :salt, :reset_password_token
-
-    validates_confirmation_of :password
-    validates :email, :presence => true, :uniqueness => true
-
-    def self.find_by_email(email)
-      where("upper(email) = ?", email.upcase).first
-    end
-
-    before_save :encrypt_password
-
-    def self.authenticate(email, password)
-      user = find_by_email(email)
-      user if user && user.crypted_password_matches?(password)
-    end
-  end
-
-  def crypted_password_matches?(password)
-    crypted_password.present? && ::BCrypt::Password.new(crypted_password) == [password, salt].join
-  end
-
-  def encrypt_password
-    if password.present?
-      self.salt = ::BCrypt::Engine.generate_salt
-      self.crypted_password = ::BCrypt::Password.create([password, salt].join)
-    end
-  end
-
-  def reset_password_token
-    update_attribute(:reset_password_token, Authem::Token.generate) if self[:reset_password_token].blank?
-    self[:reset_password_token]
-  end
-
-end