easy_auth 0.0.3 → 0.0.4

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

@@ -40,7 +40,7 @@ module EasyAuth::Controllers::PasswordReset
   end
 
   def after_successful_password_reset(identity)
-    session[:session_token] = identity.generate_session_token!
+    identity.set_account_session(session)
     identity.update_attribute(:reset_token, nil)
     redirect_to after_successful_password_reset_path(identity), :notice => I18n.t('easy_auth.password_reset.update.notice')
   end

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

@@ -5,7 +5,7 @@ module EasyAuth::Controllers::Sessions
 
   def create
     if identity = EasyAuth.identity_model.authenticate(params[:identity])
-      session[:session_token]  = identity.generate_session_token!
+      identity.set_account_session(session)
       if identity.remember
         cookies[:remember_token] = { :value => identity.generate_remember_token!, :expires => identity.remember_time.from_now }
       end

data/app/mixins/easy_auth/helpers.rb

@@ -7,9 +7,9 @@ module EasyAuth
     end
 
     def current_account
-      if session[:session_token]
+      if session[:session_token] && session[:account_class]
         begin
-          @current_account ||= EasyAuth.identity_model.find_by_session_token(session[:session_token]).account
+          @current_account ||= session[:account_class].constantize.find_by_session_token(session[:session_token])
         rescue
           @current_account = nil
           session.delete(:session_token)

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

@@ -29,6 +29,17 @@ module EasyAuth::Models::Account
     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

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

@@ -18,6 +18,10 @@ module EasyAuth::Models::Identity
     end
   end
 
+  def set_account_session(session)
+    account.set_session(session)
+  end
+
   def remember
     @remember
   end
@@ -31,11 +35,6 @@ module EasyAuth::Models::Identity
     self.reset_token
   end
 
-  def generate_session_token!
-    self.update_attribute(:session_token, _generate_token(:session))
-    self.session_token
-  end
-
   def generate_remember_token!
     self.update_attribute(:remember_token, _generate_token(:remember))
     self.remember_token
@@ -48,6 +47,6 @@ module EasyAuth::Models::Identity
   private
 
   def _generate_token(type)
-    BCrypt::Password.create("#{id}-#{type}_token-#{DateTime.current}")
+    token = BCrypt::Password.create("#{id}-#{type}_token-#{DateTime.current}")
   end
 end

data/db/migrate/20120227014023_create_identities.rb

@@ -6,12 +6,11 @@ class CreateIdentities < ActiveRecord::Migration
       t.string  :account_type
       t.integer :account_id
       t.string  :reset_token
-      t.string  :session_token
       t.string  :remember_token
       t.timestamps
     end
 
-    [:username, :reset_token, :remember_token, :session_token].each do |column|
+    [:username, :reset_token, :remember_token].each do |column|
       add_index :identities, column
     end
   end

data/lib/easy_auth/version.rb

@@ -1,3 +1,3 @@
 module EasyAuth
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
 - Brian Cardarella
+- Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70232324597080 !ruby/object:Gem::Requirement
+  requirement: &70156579670080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70232324597080
+  version_requirements: *70156579670080
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70232324611280 !ruby/object:Gem::Requirement
+  requirement: &70156579667400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70232324611280
+  version_requirements: *70156579667400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70232324607420 !ruby/object:Gem::Requirement
+  requirement: &70156579516800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324607420
+  version_requirements: *70156579516800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70232324618400 !ruby/object:Gem::Requirement
+  requirement: &70156579515800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324618400
+  version_requirements: *70156579515800
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70232324626620 !ruby/object:Gem::Requirement
+  requirement: &70156579515000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324626620
+  version_requirements: *70156579515000
 - !ruby/object:Gem::Dependency
   name: capybara-email
-  requirement: &70232324623920 !ruby/object:Gem::Requirement
+  requirement: &70156579514180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324623920
+  version_requirements: *70156579514180
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70232324632240 !ruby/object:Gem::Requirement
+  requirement: &70156579513340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324632240
+  version_requirements: *70156579513340
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70232324638780 !ruby/object:Gem::Requirement
+  requirement: &70156579512540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324638780
+  version_requirements: *70156579512540
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70232324827900 !ruby/object:Gem::Requirement
+  requirement: &70156579528620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +110,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324827900
+  version_requirements: *70156579528620
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70156579527160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70156579527160
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70232324835380 !ruby/object:Gem::Requirement
+  requirement: &70156579525340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,11 +132,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232324835380
+  version_requirements: *70156579525340
 description: EasyAuth
 email:
 - brian@dockyard.com
 - bcardarella@gmail.com
+- rubygems@danmcclain.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -172,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 908636940412963380
+      hash: -1391021110248690404
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 908636940412963380
+      hash: -1391021110248690404
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11