authentasaurus 0.5.14 → 0.6.0

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

@@ -1,4 +1,4 @@
-<p>You've been invited to create an account at your-domain.com follow this <%= link_to "link", new_registrations_url(:token => @token) %> to respond to the invitation.</p>
+<p>You've been invited to create an account at <%= AUTHENTASAURUS[:mail][:host] %> follow this <%= link_to "link", new_registrations_url(:host => AUTHENTASAURUS[:mail][:host], :token => @token) %> to respond to the invitation.</p>
 
 <p>Best Regards,</p>
-<p>your-domain.com Team</p>
+<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

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(@token) %> and follow the instructions.</p>
+<p>Please visit this <%= link_to "link", recover_password_url(:host => AUTHENTASAURUS[:mail][:host], @token) %> and follow the instructions.</p>
 
 <p>Best Regards,</p>
-<p>your-domain.com Team</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 your-domain.com by visiting this <%= link_to "link", validate_url, :code => @vcode %>.</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>Best Regards,</p>
-<p>your-domain.com Team</p>
+<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/generators/authentasaurus/templates/defaults.yml

@@ -1,7 +1,9 @@
 ## Authentasaurus configuration
 development: &non_production_settings
+  :hashing: "SHA2" # MD5 - SHA1 - SHA2
   :mail:
     :email: &development_email "foo_bar@your-domain.com"
+    :host: "http://localhost:3000/"
   :modules:
     :remote:
       :user:
@@ -27,8 +29,10 @@ test:
   <<: *non_production_settings
 
 production:
+  :hashing: "SHA2" # MD5 - SHA1 - SHA2
   :mail:
     :email: &production_email "foo_bar@your-domain.com"
+    :host: "http://your_website.com/"
   :modules:
     :remote:
       :user:

data/generators/authentasaurus_views/USAGE

@@ -4,9 +4,9 @@ Description:
 Examples:
     `./script/generate authentasaurus_views users`
 
-        creates views for Authentasaurus with main user model named "user"
+        creates views for Authentasaurus with main user model named "user" and controller named "users"
 
-    `./script/generate authentasaurus_views users --authorizable --validatable
+    `./script/generate authentasaurus_views users --authorizable --validatable --invitable
 
         creates views for Authentasaurus with main user model named "user" and also creates views
-        for authorization (--authorizable) and validation (--validatable)
+        for authorization (--authorizable), invitation (--invitable) and validation (--validatable)

data/generators/authentasaurus_views/authentasaurus_views_generator.rb

@@ -23,6 +23,7 @@ class AuthentasaurusViewsGenerator < Rails::Generator::NamedBase
       ## recoverable
       m.file 'views/recoveries/new.html.erb', File.join("app/views", class_path, "recoveries", "new.html.erb")
       m.file 'views/recoveries/edit.html.erb', File.join("app/views", class_path, "recoveries", "edit.html.erb")
+      m.file 'views/authentasaurus_emailer/recovery_mail.html.erb', File.join("app/views", class_path, "authentasaurus_emailer", "recovery_mail.html.erb")
       
       
       if options[:authorizable]

data/generators/authentasaurus_views/templates/views/authentasaurus_emailer/invitation_mail.html.erb

@@ -1,4 +1,4 @@
-<p>You've been invited to create an account at your-domain.com follow this <%= link_to "link", new_registrations_url(:token => @token) %> to respond to the invitation.</p>
+<p>You've been invited to create an account at <%= AUTHENTASAURUS[:mail][:host] %> follow this <%= link_to "link", new_registrations_url(:host => AUTHENTASAURUS[:mail][:host], :token => @token) %> to respond to the invitation.</p>
 
 <p>Best Regards,</p>
-<p>your-domain.com Team</p>
+<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/generators/authentasaurus_views/templates/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(@token) %> and follow the instructions.</p>
+<p>Please visit this <%= link_to "link", recover_password_url(:host => AUTHENTASAURUS[:mail][:host], @token) %> and follow the instructions.</p>
 
 <p>Best Regards,</p>
-<p>your-domain.com Team</p>
+<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/generators/authentasaurus_views/templates/views/authentasaurus_emailer/validation_mail.html.erb

@@ -1,6 +1,6 @@
 <p>Dear <%= @name %>,</p>
 
-<p>Please validate your account at your-domain.com by visiting this <%= link_to "link", validate_url, :code => @vcode %>.</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>Best Regards,</p>
-<p>your-domain.com Team</p>
+<p><%= AUTHENTASAURUS[:mail][:host] %> Team</p>

data/lib/active_record/acts_as_authenticatable.rb

@@ -5,7 +5,19 @@ module ActiveRecord::ActsAsAuthenticatable
   end
   
   module ClassMethods
-    require 'digest/sha1'
+    
+    case AUTHENTASAURUS[:hashing] 
+    when "SHA2"
+      require 'digest/sha2'
+    when "SHA1"
+      require 'digest/sha1'
+    when "MD5"
+      require 'digest/md5'
+    else
+      require 'digest/sha2'
+    end
+    
+    
     ## Authenticates the username and password
     def authenticate(username, password)
       user=self.find_by_username username
@@ -19,7 +31,18 @@ module ActiveRecord::ActsAsAuthenticatable
     ## Encrypts the password using the given seed
 		def encrypt_password(password, password_seed)
 			pass_to_hash=password + "Securasaurus" + password_seed
-			Digest::SHA1.hexdigest(pass_to_hash)
+			
+			case AUTHENTASAURUS[:hashing] 
+      when "SHA2"
+        Digest::SHA2.hexdigest(pass_to_hash)
+      when "SHA1"
+        Digest::SHA1.hexdigest(pass_to_hash)
+      when "MD5"
+        Digest::MD5.hexdigest(pass_to_hash)
+      else
+        Digest::SHA2.hexdigest(pass_to_hash)
+      end
+			
 		end
   end
   

data/lib/active_resource/acts_as_authenticatable.rb

@@ -21,11 +21,17 @@ module ActiveResource::ActsAsAuthenticatable
           last_update = user.attributes.delete "updated_at"
           local_user = self.sync_to.find_or_initialize_by_username user.username, user.attributes
           
-          last_update_datetime = (last_update.kind_of?(String)) ? (DateTime.parse(last_update)) : (last_update)
-          
-          if local_user.updated_at < last_update_datetime
-            local_user.update_attributes user.attributes            
+          unless local_user.new_record?
+            last_update_datetime = (last_update.kind_of?(String)) ? (DateTime.parse(last_update)) : (last_update)
+            
+            if local_user.updated_at < last_update_datetime
+              local_user.update_attributes user.attributes            
+            end
+          else
+            local_user.save
           end
+          
+          user = local_user
         end
       end
       return user

data/lib/active_resource/authenticatable.rb

@@ -2,6 +2,8 @@ require 'active_resource/acts_as_authenticatable'
 module ActiveResource::Authenticatable
   def self.included(base)
     base.send :extend, ClassMethods
+    
+    base.send :unloadable
   end
   
   module ClassMethods

data/lib/authentasaurus/models/recovery.rb

@@ -5,6 +5,8 @@ module Authentasaurus::Models::Recovery
     
     base.send :require, "digest/sha1"
     
+    base.send :unloadable
+    
     base.send :belongs_to, :user
 	
   	base.send :before_validation_on_create, :make_token!

data/lib/authentasaurus/models/user_invitation.rb

@@ -3,7 +3,7 @@ module Authentasaurus::Models::UserInvitation
     base.send :extend, ClassMethods
     base.send :include, InstanceMethods
     
-    base.send :require, 'digest/sha1'
+    base.send :require, 'digest/sha2'
     base.send :validates_presence_of, :email
     base.send :validates_uniqueness_of, :email, :scope => :token
     base.send :validates_format_of, :email, :with => %r{[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}}
@@ -25,7 +25,7 @@ module Authentasaurus::Models::UserInvitation
     def create_token
       return if self.email.nil? || self.email.blank?
       string_to_hash=self.email + "invitable.olation" + self.email.hash.to_s
-  		self.token = Digest::SHA1.hexdigest(string_to_hash)
+  		self.token = Digest::SHA2.hexdigest(string_to_hash)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 14
-  version: 0.5.14
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Omar Mekky