devise_active_directory_authenticatable 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/devise_active_directory_authenticatable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_active_directory_authenticatable}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Kerr"]

data/lib/devise_active_directory_authenticatable/models/ad_object.rb

@@ -19,29 +19,29 @@ module Devise
 
     # Update the attributes of the current object from the AD
     # Defaults to current user if no parameters given
-    def activedirectory_sync! params = {}
-      params[:objectguid] = self.objectguid if params.empty?
-      @ad_obj ||= params[:object] || klass.find_activedirectory_objs(params).first
-      copy_from_activedirectory @ad_obj unless @ad_obj.nil?
-      update_memberships
-    end
+    # def activedirectory_sync! params = {}
+    #   params[:objectguid] = self.objectguid if params.empty?
+    #   @ad_obj ||= params[:object] || klass.find_activedirectory_objs(params).first
+      
+    #   attr_map.each do |local_attr, active_directory_attr|
+    #     self[local_attr] = @ad_obj[active_directory_attr]
+    #   end
+
+    #   update_memberships
+    # end
 
     # Update the attributes of the current object from the AD
     # Defaults to current user if no parameters given
     def copy_from_activedirectory! params = {}
-      #Allows for caching, object, or AD search
-      params[:objectguid] = self[:objectguid] if params.empty?
-      @ad_obj ||= params[:object] || klass.find_activedirectory_objs(params).first
-      copy_from_activedirectory @ad_obj unless @ad_obj.nil?
-      # update_memberships
-    end
-
+      #Allows us to change what ad object is bound to this user
+      @ad_obj = klass.find_activedirectory_objs(params).first unless params.empty?
 
+      unless @ad_obj.nil?
+        attr_map.each do |local_attr, active_directory_attr|
+          self[local_attr] = @ad_obj[active_directory_attr]
+        end
 
-    # Update the local object using an Active Directory entry
-    def copy_from_activedirectory ad_obj
-      attr_map.each do |local_attr, active_directory_attr|
-        self[local_attr] = ad_obj[active_directory_attr]
+        update_memberships
       end
     end
 

data/lib/devise_active_directory_authenticatable/models/ad_user.rb

@@ -20,6 +20,7 @@ module Devise
       # Login event handler.  Triggered after authentication.
       # Maybe
       def login
+        update_parents
         super if defined? super
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_active_directory_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2153561640 !ruby/object:Gem::Requirement
+  requirement: &2160174660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153561640
+  version_requirements: *2160174660
 - !ruby/object:Gem::Dependency
   name: active_directory
-  requirement: &2153561160 !ruby/object:Gem::Requirement
+  requirement: &2160174180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153561160
+  version_requirements: *2160174180
 description: Active Directory authentication module for Devise, based off of LDAP
   Authentication
 email: ajrkerr@gmail.com