authentasaurus 0.4.1 → 0.4.2

data/generators/authentasaurus_views/authentasaurus_views_generator.rb

@@ -59,10 +59,13 @@ class AuthentasaurusViewsGenerator < Rails::Generator::NamedBase
       # User invitations
       if options[:invitable]
         m.directory File.join('app/views', class_path, "user_invitations")
+        m.directory File.join('app/views', class_path, "registrations")
         
         #Views
         m.file 'views/user_invitations/index.html.erb', File.join('app/views', class_path, 'user_invitations', "index.html.erb")
         m.file 'views/user_invitations/new.html.erb', File.join('app/views', class_path, 'user_invitations', "new.html.erb")
+        
+        m.file 'views/registrations/new.html.erb', File.join('app/views', class_path, 'registrations', "new.html.erb")
 
         m.file 'views/authentasaurus_emailer/invitation_mail.html.erb', File.join("app/views", class_path, "authentasaurus_emailer", "invitation_mail.html.erb")
       end

data/lib/active_resource/acts_as_authenticatable.rb

@@ -7,8 +7,12 @@ module ActiveResource::ActsAsAuthenticatable
   module ClassMethods
     ## Authenticates the username and password
     def authenticate(username, password)
-      
-      if self.sync_to
+      case(self.format)
+      when ActiveResource::Formats::XmlFormat
+        user = self.new Hash.from_xml(self.post(:signin,:username => username, :password => password).body).values.first
+      when ActiveResource::Formats::JsonFormat
+        user = self.new ActiveSupport::JSON.decode(self.post(:signin,:username => username, :password => password).body)
+      else
         user = self.new Hash.from_xml(self.post(:signin,:username => username, :password => password).body).values.first
       end
       
@@ -17,7 +21,9 @@ module ActiveResource::ActsAsAuthenticatable
           last_update = user.attributes.delete "updated_at"
           local_user = self.sync_to.find_or_initialize_by_username user.username, user.attributes
           
-          if local_user.updated_at < last_update
+          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
         end

data/lib/active_resource/authenticatable.rb

@@ -12,7 +12,7 @@ module ActiveResource::Authenticatable
       self.site = options[:site] || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:site]
       self.element_name = options[:session_element].try(:to_s) || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:session_element]
       self.sync = options[:sync] || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync]
-      self.sync_to = options[:sync_to].try(:to_s).try(:camelize).try(:constantize) #|| AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync_to].camelize.constantize
+      self.sync_to = options[:sync_to].try(:to_s).try(:camelize).try(:constantize) || AUTHENTASAURUS[:modules][:remote][self.name.underscore.gsub(/_sync/, "").to_sym][:sync_to].camelize.constantize
       
     
       # include authentication methods

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Omar Mekky
@@ -42,6 +42,7 @@ files:
 - app/controllers/user_invitations_controller.rb
 - app/controllers/users_controller.rb
 - app/controllers/validations_controller.rb
+- app/controllers/authentasaurus/authentasaurus_controller.rb
 - app/models/area.rb
 - app/models/authentasaurus_emailer.rb
 - app/models/group.rb
@@ -132,7 +133,6 @@ files:
 - lib/authentasaurus/models/user_invitation.rb
 - lib/authentasaurus/models/validation.rb
 - lib/authentasaurus/areas_controller.rb
-- lib/authentasaurus/authentasaurus_controller.rb
 - lib/authentasaurus/groups_controller.rb
 - lib/authentasaurus/permissions_controller.rb
 - lib/authentasaurus/recoveries_controller.rb