easy_auth-password 0.0.6 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e419b42c6e04427284b63a41be18698e6cf6b0e9
+  data.tar.gz: aa272d6e85671d33233c5f5b7d922f01d45836fe
+SHA512:
+  metadata.gz: 03743c3e90ed4ffd1b1a826a211628852c8d689febad90a36085d5d98286c8b670bbe758910beb5e1e2d5d757aaa6f121071c60fbfcfbbac2e31c679d04f2251
+  data.tar.gz: a095feb21ca9f6eb401050ddf3b1f7fdde22621c34fdb87df5e241e81ad249c23f4b4714d15e5485771976ae0084ced88a6bd45c1fc36413efd2b9831ab67d16

data/README.md

@@ -1,10 +1,10 @@
 # EasyAuth-Password #
 
-[![Build Status](http://travis-ci.org/dockyard/easy_auth-password.png)](http://travis-ci.org/dockyard/easy_auth-password)
+[![Build Status](https://secure.travis-ci.org/dockyard/easy_auth-password.png)](http://travis-ci.org/dockyard/easy_auth-password)
 [![Dependency Status](https://gemnasium.com/dockyard/easy_auth-password.png?travis)](https://gemnasium.com/dockyard/easy_auth-password)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/dockyard/easy_auth-password)
 
-Dead simple drop in authentication for Rails
+Password support for [EasyAuth](https://github.com/dockyard/easy_auth)
 
 ## Installation ##
 
@@ -14,13 +14,18 @@ In your Gemfile add the following:
 gem 'easy_auth-password'
 ```
 
-After running Bundler you'll need to install the migrations
+Then follow the general installation instructions for
+[EasyAuth](https://github.com/dockyard/easy_auth#installation)
 
-```ruby
-rake easy_auth-password:install:migrations
+Then add the migration:
+
+```bash
+rake easy_auth_password:install:migrations
 ```
 
-Then run your migrations.
+## Usage ##
+
+`EasyAuth-Password` will handle most of what you want automatically. 
 
 ## Authors ##
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 require 'rspec/core/rake_task'
-Bundler::GemHelper.install_tasks
+require 'byebug'
 
 RSpec::Core::RakeTask.new('default') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
@@ -8,3 +8,4 @@ end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
+Bundler::GemHelper.install_tasks

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

@@ -1,4 +1,4 @@
-<%= form_for @identity, :url => main_app.edit_password_path(params[:reset_token]) do |f| %>
+<%= form_for @account, :url => edit_password_reset_path(:username => params[:username], :reset_token => params[:reset_token]) do |f| %>
   <p>
     <%= f.label :password %>
     <%= f.text_field :password %>

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

@@ -1,7 +1,7 @@
 <%= form_for @identity, :url => main_app.password_reset_path, :method => :post do |f| %>
   <p>
-    <%= f.label :username %>
-    <%= f.text_field :username %>
+    <%= f.label :uid %>
+    <%= f.text_field :uid %>
   </p>
   <p>
     <%= f.submit 'Submit' %>

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

@@ -1,7 +1,7 @@
 <%= form_for @identity, :url => main_app.sign_in_path do |f| %>
   <p>
-    <%= f.label :username %>
-    <%= f.text_field :username %>
+    <%= f.label :uid %>
+    <%= f.text_field :uid %>
   </p>
   <p>
     <%= f.label :password %>

data/config/locales/en.yml

@@ -1,14 +1,10 @@
 en:
   easy_auth:
-    sessions:
-      create:
-        notice: 'You have been signed in.'
-        error: 'Could not sign you in. Please check your credentials.'
-      delete:
-        notice: 'You have been signed out.'
     password_reset:
       create:
         notice: 'Please check your email for your password reset link.'
       update:
         notice: 'Your password has been updated.'
         error: 'There was an issue updating your password.'
+      edit:
+        error: 'Could not authenticate you from your reset token.'

data/db/migrate/20120227014024_create_easy_auth_password.rb

@@ -0,0 +1,6 @@
+class CreateEasyAuthPassword < ActiveRecord::Migration
+  def change
+    add_column :identities, :remember_token_digest, :string
+    add_column :identities, :reset_token_digest, :string
+  end
+end

data/lib/easy_auth/controllers/password_reset.rb

@@ -1,7 +1,7 @@
 module EasyAuth::Controllers::PasswordReset
   def self.included(base)
     base.instance_eval do
-      before_filter :find_identity_from_reset_token, :only => [:edit, :update]
+      before_filter :find_account_from_reset_token, :only => [:edit, :update]
     end
   end
 
@@ -10,48 +10,62 @@ module EasyAuth::Controllers::PasswordReset
   end
 
   def create
-    if @identity = EasyAuth.find_identity_model(params).where(:username => params[:identities_password][:username]).first
-      @identity.generate_reset_token!
-      PasswordResetMailer.reset(@identity.id).deliver
+    if @identity = EasyAuth.find_identity_model(params).where(:uid => params[:identities_password][:uid]).first
+      unencrypted_reset_token = @identity.generate_reset_token!
+      PasswordResetMailer.reset(@identity.id, unencrypted_reset_token).deliver
+      after_successful_attempted_password_reset
     else
-      @identity = EasyAuth.find_identity_model(params).new(params[:identities_password])
+      @identity = EasyAuth.find_identity_model(params).new(uid: params[:identities_password][:uid])
+      after_failed_attempted_password_reset
     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(:identities_password))
-      after_successful_password_reset(@identity)
+    @identity = @account.password_identities.first
+
+    if @account.update_attributes(account_params)
+      after_successful_password_reset
     else
-      after_failed_password_reset(@identity)
+      after_failed_password_reset
     end
   end
 
-  private
+  def after_successful_password_reset
+    session[:identity_id] = @identity.id
+    @identity.update_column(:reset_token_digest, nil)
+    redirect_to after_successful_password_reset_url, :notice => I18n.t('easy_auth.password_reset.update.notice')
+  end
+
+  def after_successful_password_reset_url
+    @identity.account
+  end
 
-  def scope_to_password_params(key)
-    { :password => params[key][:password], :password_confirmation => params[key][:password_confirmation] }
+  def after_failed_password_reset
+    flash.now[:error] = I18n.t('easy_auth.password_reset.update.error')
+    render :edit
   end
 
-  def find_identity_from_reset_token
-    @identity = EasyAuth.find_identity_model(params).where(:reset_token => params[:reset_token].to_s).first
-    @identity.password_reset = true
+  def after_successful_attempted_password_reset
+    flash.now[:notice] = I18n.t('easy_auth.password_reset.create.notice')
+    render :new
   end
 
-  def after_successful_password_reset(identity)
-    identity.set_account_session(session)
-    identity.update_column(:reset_token, nil)
-    redirect_to after_successful_password_reset_url(identity), :notice => I18n.t('easy_auth.password_reset.update.notice')
+  def after_failed_attempted_password_reset
+    after_successful_attempted_password_reset
   end
 
-  def after_successful_password_reset_url(identity)
-    identity.account
+  private
+
+  def account_params
+    params.require(ActiveModel::Naming.param_key(@account)).permit(:password, :password_confirmation)
   end
 
-  def after_failed_password_reset(identity)
-    flash.now[:error] = I18n.t('easy_auth.password_reset.update.error')
-    render :edit
+  def find_account_from_reset_token
+    if @account = EasyAuth.find_identity_model(params).authenticate(self, :reset_token).try(:account)
+      @account.password_reset = true
+    else
+      flash[:error] = I18n.t('easy_auth.password_reset.edit.error')
+      redirect_to root_path
+    end
   end
 end

data/lib/easy_auth/mailers/password_reset.rb

@@ -3,9 +3,9 @@ module EasyAuth::Mailers::PasswordReset
     base.clear_action_methods!
   end
 
-  def reset(id)
-    @identity = EasyAuth.identity_model.find(id)
-    @url = edit_password_url(@identity.reset_token)
+  def reset(id, unencrypted_reset_token)
+    @identity = EasyAuth.find_identity_model(:identity => :password).find(id)
+    @url = edit_password_reset_url(:id => id, :reset_token => unencrypted_reset_token)
     mail :to => @identity.account.email, :subject => 'Password reset'
   end
 end

data/lib/easy_auth/models/identities/password.rb

@@ -1,34 +1,69 @@
+require 'scrypt'
+
 module EasyAuth::Models::Identities::Password
   include EasyAuth::TokenGenerator
+  extend ActiveSupport::Concern
 
-  def self.included(base)
-    base.class_eval do
-      has_secure_password
+  included do
+    # Attributes
+    attr_reader     :password
+    alias_attribute :password_digest, :token
 
-      # Attributes
-      attr_accessor   :password_reset
-      attr_accessible :username, :password, :password_confirmation, :remember
-      alias_attribute :password_digest, :token
+    # Validations
+    _validators[:uid].delete_at(_validators[:uid].index { |v| v.instance_of?(ActiveRecord::Validations::UniquenessValidator) })
+    _validators[:token].delete_at(_validators[:token].index { |v| v.instance_of?(ActiveRecord::Validations::PresenceValidator) })
+    validates :uid, uniqueness: { case_sensitive: false }
+    validates :password_digest, presence: true
+  end
 
-      # Relationships
-      belongs_to :account, :polymorphic => true
+  module ClassMethods
+    def authenticate(controller, token_name = :password)
+      attributes = send("attributes_for_#{token_name}", controller)
+      return nil if attributes.nil?
+      where(send("conditions_for_#{token_name}", attributes)).first.try(:authenticate, attributes[token_name], token_name)
+    end
 
-      # Validations
-      validates :username, :uniqueness => { :case_sensitive => false }, :presence => true
-      validates :password, :presence => { :on => :create }
-      validates :password, :presence => { :if => :password_reset }
+    private
+
+    def attributes_for_password(controller)
+      controller.params[:identities_password]
+    end
+
+    def attributes_for_reset_token(controller)
+      controller.params
+    end
+
+    def attributes_for_remember_token(cookies)
+      { :id => cookies[:remember_id], :remember_token => cookies[:remember_token] }
+    end
 
-      def self.authenticate(controller)
-        attributes = controller.params[:identities_password]
-        return nil if attributes.nil?
-        where(arel_table[:username].matches(attributes[:username].try(&:strip))).first.try(:authenticate, attributes[:password])
-      end
+    def conditions_for_password(attributes)
+      arel_table[:uid].matches(attributes[:uid].try(&:strip))
+    end
+
+    def conditions_for_reset_token(attributes)
+      { :id => attributes[:id] }
+    end
+
+    def conditions_for_remember_token(attributes)
+      { :id => attributes[:id] }
+    end
+  end
+
+  def authenticate(unencrypted_token, token_name = :password)
+    SCrypt::Password.new(send("#{token_name}_digest")) == unencrypted_token && self
+  end
 
+  def password=(unencrypted_password)
+    @password = unencrypted_password
+    unless unencrypted_password.blank?
+      self.password_digest = SCrypt::Password.create(unencrypted_password)
     end
   end
 
   def generate_reset_token!
-    update_column(:reset_token, URI.escape(_generate_token(:reset).gsub(/[\.|\\\/]/,'')))
-    reset_token
+    unencrypted_token = _generate_token(:reset_token)
+    update_column(:reset_token_digest, SCrypt::Password.create(unencrypted_token))
+    unencrypted_token
   end
 end

data/lib/easy_auth/password/controllers/sessions.rb

@@ -1,7 +1,28 @@
 module EasyAuth::Password::Controllers::Sessions
-  extend EasyAuth::ReverseConcern
+  extend ActiveSupport::Concern
 
-  reverse_included do
-    before_filter :no_authentication, :only => :new, :if => Proc.new { params[:identity] == :password }
+  prepended do
+    before_filter :no_authentication, :only => :new, :if => Proc.new { params[:identity] == 'password' }
+
+    def create
+      super
+
+      if @identity.persisted?
+        if identity_attributes = params[ActiveModel::Naming.param_key(EasyAuth.find_identity_model(params).new)]
+          @identity.remember = identity_attributes[:remember]
+        end
+
+        if @identity.remember
+          cookies[:remember_id]    = { :value => @identity.id,                              :expires => @identity.remember_time.from_now }
+          cookies[:remember_token] = { :value => @identity.generate_remember_token_digest!, :expires => @identity.remember_time.from_now }
+        end
+      end
+    end
+
+    def destroy
+      super
+      cookies.delete(:remember_id)
+      cookies.delete(:remember_token)
+    end
   end
 end

data/lib/easy_auth/password/helpers/easy_auth.rb

@@ -0,0 +1,30 @@
+module EasyAuth::Password::Helpers::EasyAuth
+  extend ActiveSupport::Concern
+
+  prepended do
+    def current_account
+      super
+
+      if @current_account.blank?
+        if cookies[:remember_id] && cookies[:remember_token]
+          begin
+            @current_account = EasyAuth.find_identity_model(:identity => :password).authenticate(cookies, :remember_token).account
+          rescue => e
+            @current_account = nil
+            delete_session_data
+          end
+        end
+      end
+
+      @current_account
+    end
+
+    private
+
+    def delete_session_data
+      super
+      cookies.delete(:remember_id)
+      cookies.delete(:remember_token)
+    end
+  end
+end

data/lib/easy_auth/password/helpers.rb

@@ -0,0 +1,4 @@
+module EasyAuth::Password::Helpers
+  extend ActiveSupport::Autoload
+  autoload :EasyAuth
+end

data/lib/easy_auth/password/models/account.rb

@@ -1,38 +1,78 @@
 module EasyAuth::Password::Models::Account
-  extend EasyAuth::ReverseConcern
+  extend ActiveSupport::Concern
+  class  NoIdentityUIDError < StandardError; end
 
-  reverse_included do
+  prepended do
     # Attributes
-    attr_accessor   :password
-    attr_accessible :password, :password_confirmation
+    attr_accessor :password, :password_reset
 
     # Validations
-    validates :password, :presence => { :on => :create, :if => :run_password_identity_validations? }, :confirmation => true
-    validates identity_username_attribute, :presence => true, :if => :run_password_identity_validations?
+    validates :password, :presence => { :if => :password_reset }, :confirmation => true
+    identity_uid_attributes.each do |attribute|
+      validates attribute, :presence => true, :if => :run_password_identity_validations?
+    end
 
     # Callbacks
-    before_create :setup_password_identity,  :if => :run_password_identity_validations?
-    before_update :update_password_identity, :if => :run_password_identity_validations?
+    before_save :update_password_identities, :if => :can_update_password_identities?
 
     # Associations
-    has_one :password_identity, :class_name => 'Identities::Password', :foreign_key => :account_id
+    has_many :password_identities, :class_name => 'Identities::Password', :as => :account
+  end
+
+  module ClassMethods
+    # Will attempt to find the uid attributes of :username and :email
+    # Will return an array of any defined on the model
+    # If neither are defined an exception will be raised
+    #
+    # Override this method with an array of symbols for custom attributes
+    #
+    # @return [Symbol]
+    def identity_uid_attributes
+      if table_exists?
+        attributes = (['email', 'username'] & column_names).map(&:to_sym)
+      else
+        attributes = []
+      end
+
+      if attributes.empty?
+        raise EasyAuth::Password::Models::Account::NoIdentityUIDError, 'your model must have either a #username or #email attribute. Or you must override the .identity_uid_attribute class method'
+      else
+        attributes
+      end
+    end
+  end
+
+  def identity_uid_attributes
+    self.class.identity_uid_attributes
   end
 
   def run_password_identity_validations?
-    (self.new_record? && self.password.present?) || self.password_identity.present?
+    self.password.present? || self.password_identities.present?
   end
 
   private
 
-  def setup_password_identity
-    self.identities << EasyAuth.find_identity_model(:identity => :password).new(password_identity_attributes)
+  def can_update_password_identities?
+    password.present? || identity_uid_attributes.detect { |attribute| send("#{attribute}_changed?") && password_identities.where(:uid => send("#{attribute}_was")).first }
   end
 
-  def update_password_identity
-    self.password_identity.update_attributes(password_identity_attributes)
+  def update_password_identities
+    identity_uid_attributes.each do |attribute|
+      if send("#{attribute}_changed?")
+        identity = password_identities.find { |identity| identity.uid == send("#{attribute}_was") }
+      else
+        identity = password_identities.find { |identity| identity.uid == send(attribute) }
+      end
+
+      if identity
+        identity.update_attributes(password_identity_attributes(attribute))
+      else
+        self.password_identities.build(password_identity_attributes(attribute))
+      end
+    end
   end
 
-  def password_identity_attributes
-    { :username => self.identity_username_attribute, :password => self.password, :password_confirmation => self.password_confirmation }
+  def password_identity_attributes(attribute)
+    { :uid => send(attribute), :password => self.password }
   end
 end

data/lib/easy_auth/password/models/identity.rb

@@ -0,0 +1,33 @@
+module EasyAuth::Password::Models::Identity
+  extend ActiveSupport::Concern
+
+  # Getter for the remember flag
+  def remember
+    @remember
+  end
+
+  # Setter for the remember flag
+  #
+  # @param [Boolean] value
+  def remember=(value)
+    @remember = ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+  end
+
+  # Generates a new remember token and updates it on the identity record
+  #
+  # @return [String]
+  def generate_remember_token_digest!
+    remember_token = _generate_token(:remember)
+    update_column(:remember_token_digest, SCrypt::Password.create(remember_token))
+    remember_token
+  end
+
+  # The time used for remembering how long to stay signed in
+  #
+  # Defaults to 1 year, override in the model to set your own custom remember time
+  #
+  # @return [DateTime]
+  def remember_time
+    1.year
+  end
+end

data/lib/easy_auth/password/models.rb

@@ -1,4 +1,5 @@
 module EasyAuth::Password::Models
   extend ActiveSupport::Autoload
   autoload :Account
+  autoload :Identity
 end

data/lib/easy_auth/password/routes.rb

@@ -1,11 +1,16 @@
 module EasyAuth::Password::Routes
   def easy_auth_password_routes
-    get  '/sign_in'  => 'sessions#new',                           :as => :sign_in,        :defaults => { :identity => :password }
-    post '/sign_in'  => 'sessions#create',                                                :defaults => { :identity => :password }
+    get  '/sign_in'  => 'sessions#new',    :defaults => { :identity => 'password' }, :as => :sign_in
+    post '/sign_in'  => 'sessions#create', :defaults => { :identity => 'password' }
 
-    get  '/password_reset' => 'password_reset#new',               :as => :password_reset, :defaults => { :identity => :password }
-    post '/password_reset' => 'password_reset#create',                                    :defaults => { :identity => :password }
-    get  '/password_reset/:reset_token' => 'password_reset#edit', :as => :edit_password,  :defaults => { :identity => :password }
-    put  '/password_reset/:reset_token' => 'password_reset#update',                       :defaults => { :identity => :password }
+    get  '/password_reset' => 'password_reset#new',    :defaults => { :identity => 'password' }, :as => :password_reset
+    post '/password_reset' => 'password_reset#create', :defaults => { :identity => 'password' }
+
+    get  '/password_reset/:id/:reset_token' => 'password_reset#edit',   :defaults => { :identity => 'password' }, :as => :edit_password_reset
+    if Rails.version >= '4.0.0'
+      patch  '/password_reset/:id/:reset_token' => 'password_reset#update', :defaults => { :identity => 'password' }
+    else
+      put  '/password_reset/:id/:reset_token' => 'password_reset#update', :defaults => { :identity => 'password' }
+    end
   end
 end

data/lib/easy_auth/password/version.rb

@@ -1,5 +1,5 @@
 module EasyAuth
   module Password
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

data/lib/easy_auth/password.rb

@@ -8,6 +8,7 @@ module EasyAuth
   module Password
     extend ActiveSupport::Autoload
     autoload :Controllers
+    autoload :Helpers
     autoload :Models
   end
 
@@ -15,7 +16,13 @@ module EasyAuth
     autoload :PasswordReset
 
     module Sessions
-      include EasyAuth::Password::Controllers::Sessions
+      prepend EasyAuth::Password::Controllers::Sessions
+    end
+  end
+
+  module Helpers
+    module EasyAuth
+      prepend ::EasyAuth::Password::Helpers::EasyAuth
     end
   end
 
@@ -25,7 +32,11 @@ module EasyAuth
 
   module Models
     module Account
-      include EasyAuth::Password::Models::Account
+      prepend EasyAuth::Password::Models::Account
+    end
+
+    module Identity
+      prepend EasyAuth::Password::Models::Identity
     end
 
     module Identities

metadata

@@ -1,132 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth-password
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_auth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: scrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.4
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: capybara-email
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: valid_attribute
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,41 +146,36 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: bourne
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: EasyAuth-Password
@@ -205,13 +196,17 @@ files:
 - app/views/sessions/new.html.erb
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/20120227014024_create_easy_auth_password.rb
 - lib/easy_auth/controllers/password_reset.rb
 - lib/easy_auth/mailers/password_reset.rb
 - lib/easy_auth/models/identities/password.rb
 - lib/easy_auth/password/controllers/sessions.rb
 - lib/easy_auth/password/controllers.rb
 - lib/easy_auth/password/engine.rb
+- lib/easy_auth/password/helpers/easy_auth.rb
+- lib/easy_auth/password/helpers.rb
 - lib/easy_auth/password/models/account.rb
+- lib/easy_auth/password/models/identity.rb
 - lib/easy_auth/password/models.rb
 - lib/easy_auth/password/routes.rb
 - lib/easy_auth/password/version.rb
@@ -221,32 +216,25 @@ files:
 - README.md
 homepage: https://github.com/dockyard/easy_auth-password
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4240566048460302950
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4240566048460302950
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EasyAuth-Password
 test_files: []