easy_auth 0.0.1 → 0.0.3

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

@@ -11,7 +11,8 @@ module EasyAuth::Controllers::PasswordReset
 
   def create
     if @identity = EasyAuth.identity_model.where(:username => params[:identity][:username]).first
-      @identity.password_reset
+      @identity.generate_reset_token!
+      PasswordResetMailer.reset(@identity.id).deliver
     else
       @identity = EasyAuth.identity_model.new(params[:identity])
     end
@@ -35,7 +36,7 @@ module EasyAuth::Controllers::PasswordReset
   end
 
   def find_identity_from_reset_token
-    @identity = EasyAuth.identity_model.where(:reset_token => params[:reset_token]).first
+    @identity = EasyAuth.identity_model.where(:reset_token => params[:reset_token].to_s).first
   end
 
   def after_successful_password_reset(identity)

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

@@ -19,13 +19,13 @@ module EasyAuth::Models::Account
       end
 
       has_one :identity, :as => :account
-      before_create :setup_identity
-      before_update :update_identity
+      before_create :setup_identity, :unless => :skip_identity_validations
+      before_update :update_identity, :unless => :skip_identity_validations
 
-      attr_accessor :password
-      validates :password, :presence => { :on => :create }, :confirmation => true
-      attr_accessible :password, :password_confirmation
-      validates identity_username_attribute, :presence => true
+      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
 

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

@@ -26,9 +26,9 @@ module EasyAuth::Models::Identity
     @remember = ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
   end
 
-  def password_reset
+  def generate_reset_token!
     update_attribute(:reset_token, URI.escape(_generate_token(:reset).gsub(/[\.|\\\/]/,'')))
-    PasswordResetMailer.reset(self.id).deliver
+    self.reset_token
   end
 
   def generate_session_token!

data/lib/easy_auth/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70365829440860 !ruby/object:Gem::Requirement
+  requirement: &70232324597080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70365829440860
+  version_requirements: *70232324597080
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70365829440220 !ruby/object:Gem::Requirement
+  requirement: &70232324611280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70365829440220
+  version_requirements: *70232324611280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70365829439460 !ruby/object:Gem::Requirement
+  requirement: &70232324607420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365829439460
+  version_requirements: *70232324607420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70365829438880 !ruby/object:Gem::Requirement
+  requirement: &70232324618400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365829438880
+  version_requirements: *70232324618400
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70365829438360 !ruby/object:Gem::Requirement
+  requirement: &70232324626620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365829438360
+  version_requirements: *70232324626620
 - !ruby/object:Gem::Dependency
   name: capybara-email
-  requirement: &70365829437580 !ruby/object:Gem::Requirement
+  requirement: &70232324623920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365829437580
+  version_requirements: *70232324623920
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70365829437000 !ruby/object:Gem::Requirement
+  requirement: &70232324632240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365829437000
+  version_requirements: *70232324632240
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70365850682120 !ruby/object:Gem::Requirement
+  requirement: &70232324638780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365850682120
+  version_requirements: *70232324638780
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70365850681360 !ruby/object:Gem::Requirement
+  requirement: &70232324827900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365850681360
+  version_requirements: *70232324827900
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70365850680700 !ruby/object:Gem::Requirement
+  requirement: &70232324835380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365850680700
+  version_requirements: *70232324835380
 description: EasyAuth
 email:
 - brian@dockyard.com
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3835469776783802043
+      hash: 908636940412963380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3835469776783802043
+      hash: 908636940412963380
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11