password_resetter 1.0.6 → 1.0.7

data/README.md

@@ -57,7 +57,7 @@ The entire form is wrapped with
 
 Email input field is tagged with 
 ```ruby
-:class => "password-reset-input email"
+:id => "password_reset_email"
 ```
 
 Reset Password button:
@@ -76,11 +76,27 @@ The entire form is wrapped with
 
 Password and Password Confirmation fields tagged respectively with:
 ```ruby
-:class => "password-reset-input password"
-:class => "password-reset-input password_confirmation"
+:id => "password_reset_password"
+:id => "password_reset_password_confirmation"
 ```
 
 Update Password button:
 ```ruby
-:class => "password-reset-buton update"
+:class => "password-reset-button update"
+```
+
+For example, in `application.css.scss`
+
+```
+#password_reset_email, #password_reset_password, #password_reset_password_confirmation {
+	margin-bottom: 15px;
+	margin-top: 5px;
+	width: 285px;
+}
+
+.password-reset-button {
+  background: image-url("my_button.png");
+  height: 25px;
+  width: 100px;
+}
 ```

data/app/models/password_reset.rb

@@ -1,19 +1,25 @@
 class PasswordReset < ActiveRecord::Base
-  
   belongs_to :user
-  
+
   attr_accessible :user, :email, :password, :password_confirmation, :reset_token, :reset_sent_at
-  
+
   validates_presence_of :email
-    
+
   def match_email?
-    guest = User.where(['email = ?', email]).first      
+    guest = find_guest(email)
     if guest.present?
       self.update_attributes(:user => guest)
     else
       false
     end
   end
+  
+  def find_guest(email_string)
+    User.all.each do |user|
+      return user if user.email == email_string
+    end
+    false
+  end
 
   def send_password_reset
     generate_token
@@ -21,7 +27,7 @@ class PasswordReset < ActiveRecord::Base
     save
     PasswordResetMailer.password_reset(user, self).deliver
   end
-  
+
   def update_user_password(password, confirmation)
     if passwords_valid?(password, confirmation)
       user.password = password
@@ -31,7 +37,7 @@ class PasswordReset < ActiveRecord::Base
       false
     end
   end
-  
+
   def expired?
     reset_sent_at < 2.hours.ago
   end
@@ -41,7 +47,7 @@ class PasswordReset < ActiveRecord::Base
       pr.delete if (pr.user_id == user.id) && (pr != self)
     end
   end
-  
+
   private
   def generate_token
     begin
@@ -49,7 +55,7 @@ class PasswordReset < ActiveRecord::Base
     end  while PasswordReset.exists?(:reset_token => self.reset_token)
     self.save
   end
-  
+
   def passwords_valid?(password, confirmation)
     password.present? && confirmation.present? && password == confirmation 
   end

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

@@ -1,8 +1,8 @@
 <div class="password-reset-complete-field">
 	<%= simple_form_for @password_reset do |f| %>
 	  <div class="field">
-	    <%= f.input :password, :class => "password-reset-input password" %>
-	    <%= f.input :password_confirmation, :class => "password-reset-input password-confirmation" %>
+	    <%= f.input :password, :label => "New Password" %>
+	    <%= f.input :password_confirmation, :label => "Password Confirmation" %>
 	  </div>
 	  <div class="actions"><%= f.submit "Update Password", :class => "password-reset-button update" %></div>
 	<% end %>

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

@@ -1,10 +1,10 @@
 <div class="password-reset-request-field">
-	<div class="password-reset-text reset"> Please enter your email address to reset your password.</div>
+	<div class="password-reset-text reset">Forgot Your Password?</div>
 
 	<%= simple_form_for @password_reset do |f| %>
 	  <%= f.full_error :user %>
 	  <div class="field">
-	    <%= f.input :email, :label => "Enter your Email Address", :class => "password-reset-input email" %>
+	    <%= f.input :email, :label => "Enter Your Email Address" %>
 	  </div>
 	  <div class="actions"><%= submit_tag "Reset Password", :class => "password-reset-button reset" %></div>
 	<% end %>

data/lib/password_resetter/resettable.rb

@@ -0,0 +1,62 @@
+module PasswordResetter
+  module Resettable
+    belongs_to :user
+
+    attr_accessible :user, :email, :password, :password_confirmation, :reset_token, :reset_sent_at
+
+    validates_presence_of :email
+  
+    def match_email?
+      guest = find_guest(email)
+      if guest.present?
+        self.update_attributes(:user => guest)
+      else
+        false
+      end
+    end
+    
+    def find_guest(email_string)
+      User.where(['email = ?', email_string]).first
+    end
+
+    def send_password_reset
+      generate_token
+      self.update_attributes(:reset_sent_at => Time.zone.now)
+      save
+      PasswordResetMailer.password_reset(user, self).deliver
+    end
+
+    def update_user_password(password, confirmation)
+      if passwords_valid?(password, confirmation)
+        user.password = password
+        user.password_confirmation = confirmation
+        user.save
+      else
+        false
+      end
+    end
+
+    def expired?
+      reset_sent_at < 2.hours.ago
+    end
+
+    def delete_existing
+      PasswordReset.all.each do |pr|
+        pr.delete if (pr.user_id == user.id) && (pr != self)
+      end
+    end
+
+    private
+    def generate_token
+      begin
+        self.reset_token = SecureRandom.urlsafe_base64
+      end  while PasswordReset.exists?(:reset_token => self.reset_token)
+      self.save
+    end
+
+    def passwords_valid?(password, confirmation)
+      password.present? && confirmation.present? && password == confirmation 
+    end
+  
+  end
+end

data/lib/password_resetter/version.rb

@@ -1,3 +1,3 @@
 module PasswordResetter
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: password_resetter
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,6 +174,7 @@ files:
 - config/routes.rb
 - db/migrate/20120829163145_create_password_resets.rb
 - lib/password_resetter/engine.rb
+- lib/password_resetter/resettable.rb
 - lib/password_resetter/version.rb
 - lib/password_resetter.rb
 - lib/tasks/password_resetter_tasks.rake