authentasaurus 0.6.9 → 0.6.10

data/app/views/authentasaurus_emailer/recovery_mail.html.erb

@@ -1,7 +1,7 @@
 <p>Dear <%= @name %>,</p>
 
 <p>A request has been made to recover your account's password.</p>
-<p>Please visit this <%= link_to "link", recover_password_url(:host => AUTHENTASAURUS[:mail][:host], @token) %> and follow the instructions.</p>
+<p>Please visit this <%= link_to "link", recover_password_url(:host => AUTHENTASAURUS[:mail][:host], :token => @token) %> and follow the instructions.</p>
 
 <p>Best Regards,</p>
 <p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/app/views/authentasaurus_emailer/validation_mail.html.erb

@@ -1,6 +1,6 @@
 <p>Dear <%= @name %>,</p>
 
-<p>Please validate your account at <%= AUTHENTASAURUS[:mail][:host] %> by visiting this <%= link_to "link", validate_url(:host => AUTHENTASAURUS[:mail][:host] , :code => @vcode) %>.</p>
+<p>Please validate your account at <%= AUTHENTASAURUS[:mail][:host] %> by visiting this <%= link_to "link", activate_url(:host => AUTHENTASAURUS[:mail][:host] , :code => @vcode) %>.</p>
 
 <p>Best Regards,</p>
 <p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/app/views/validations/{activate.html.erb → validate.html.erb}

@@ -1,5 +1,5 @@
 <h3><%= flash.now[:notice] %></h3>
-<% form_tag do %>
+<% form_tag activate_path do %>
 	Validation Code :<br>
 	<p><%= text_field_tag :vcode, params[:vcode], :size => 44 %></p>
 	<p><%= submit_tag "Validate" %></p>

data/generators/authentasaurus_views/templates/views/validations/{activate.html.erb → validate.html.erb}

@@ -1,5 +1,5 @@
 <h3><%= flash.now[:notice] %></h3>
-<% form_tag do %>
+<% form_tag activate_path do %>
 	Validation Code :<br>
 	<p><%= text_field_tag :vcode, params[:vcode], :size => 44 %></p>
 	<p><%= submit_tag "Validate" %></p>

data/lib/authentasaurus/validations_controller.rb

@@ -8,6 +8,12 @@ module Authentasaurus::ValidationsController
   end
   
   module InstanceMethods
+    def validate
+      respond_to do |format|
+        format.html
+      end
+    end
+    
     def activate
   		respond_to do |format|
   			validation = Validation.find_by_validation_code(params[:vcode])
@@ -17,7 +23,7 @@ module Authentasaurus::ValidationsController
   				format.html { redirect_to login_url, :notice => I18n.t(:validation_successful, :scope => [:authentasaurus, :messages, :validations])}
   			else
   			  flash.now[:alert] = I18n.t(:validation_failed, :scope => [:authentasaurus, :messages, :validations])
-  				format.html
+  				format.html { render :validate }
   			end
   		end
   	end

data/lib/helpers/routing.rb

@@ -59,7 +59,8 @@ module Helpers::Routing
     def authentasaurus_validatable(*opts)
       options = opts.extract_options!
       
-      validate "/validate", options.dup.merge({:controller => :validations, :action => :activate})
+      validate "/validate", options.dup.merge({:controller => :validations, :action => :validate})
+      activate "/activate", options.dup.merge({:controller => :validations, :action => :activate})
       resend_validation_email "/resend-validation", options.dup.merge({:controller => :validations, :action => :resend_validation_email, :conditions => {:method => :get}})
       do_resend_validation_email "/resend-validation", options.dup.merge({:controller => :validations, :action => :do_resend_validation_email, :conditions => {:method => :post}})
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 6
-  - 9
-  version: 0.6.9
+  - 10
+  version: 0.6.10
 platform: ruby
 authors: 
 - Omar Mekky
@@ -79,7 +79,7 @@ files:
 - app/views/users/index.html.erb
 - app/views/users/new.html.erb
 - app/views/users/show.html.erb
-- app/views/validations/activate.html.erb
+- app/views/validations/validate.html.erb
 - app/views/validations/resend_validation_email.html.erb
 - config/locales/en.yml
 - generators/authentasaurus/authentasaurus_generator.rb
@@ -115,7 +115,7 @@ files:
 - generators/authentasaurus_views/templates/views/users/index.html.erb
 - generators/authentasaurus_views/templates/views/users/new.html.erb
 - generators/authentasaurus_views/templates/views/users/show.html.erb
-- generators/authentasaurus_views/templates/views/validations/activate.html.erb
+- generators/authentasaurus_views/templates/views/validations/validate.html.erb
 - generators/authentasaurus_views/templates/views/validations/resend_validation_email.html.erb
 - lib/action_controller/authorization.rb
 - lib/action_view/authorization.rb