devise_ldap_multiple 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 442e961ad6563617dd9c6bcbb73e270aa9bf861e
-  data.tar.gz: 528e102f778a4cca27e9650a379b899344f50183
+  metadata.gz: e2ff9186428183eac42c5727d07f36e48047f695
+  data.tar.gz: 90f34efff4ea5b9ca7741dfb70561e1e12bb41b9
 SHA512:
-  metadata.gz: 743ae991d326873e6f9e12cfd1a8722ca9319b2bda7e52f4e2275c2674d0070dcbd79adf1e15de69dcd8df79c255063b763aeaa1d39086bbc8b2c62bd2269d98
-  data.tar.gz: 720a34443923409bddcdef7ec73cfae533a227cb8fc277561b7d446c41385c1dc0a5f66efa904317162a57c9d97c9729a65c285b82aa59626434e11fa4e4af62
+  metadata.gz: 56e7f2525dcbe3e87f8e9c2a0e51c116d822eebb3a0911afba6ebdfaf1155b9cd36a8f349ea6ef90a5f065436bf96a13a119db69ab5a3b1235f71455ba897b6b
+  data.tar.gz: de15791ae32a3ad99de401f5d3d09587b1d01ad20c462bd75a9ba5772c7a8198bfabf6036dd0e6d87da1fc2645e24f5892708c8476fd3e6a58fb55e643cb9108

data/devise_ldap_multiple.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name     = 'devise_ldap_multiple'
   s.version  = DeviseLdapMultiple::VERSION.dup
   s.platform = Gem::Platform::RUBY
-  s.summary  = 'Devise extension to allow authentication to multiple LDAPs. Fork of the devise_ldap_authenticatable project.'
+  s.summary  = 'Devise extension to allow authentication to multiple LDAP servers, or with multiple configurations to the same LDAP server. Fork of the devise_ldap_authenticatable project.'
   s.email = 'swillett@outlook.com'
   s.homepage = 'https://github.com/xarael/devise_ldap_multiple'
   s.description = s.summary

data/lib/devise_ldap_multiple.rb

@@ -6,6 +6,12 @@ require 'devise_ldap_multiple/exception'
 require 'devise_ldap_multiple/logger'
 require 'devise_ldap_multiple/ldap/adapter'
 require 'devise_ldap_multiple/ldap/connection'
+require 'devise_ldap_multiple/concern'
+
+# Open this class to allow myhash to be read (the data in an object of this type is within this instance variable)
+class Net::LDAP::Entry
+  attr_reader :myhash
+end
 
 # Nearly all configuration is in each scope.yml file under config/ldap/ for each scope.
 module Devise

data/lib/devise_ldap_multiple/concern.rb

@@ -0,0 +1,31 @@
+# To be included in models
+
+module DeviseLDAPMultiple
+
+  extend ActiveSupport::Concern
+
+  # Lets you specify a list off attributes to return, and returns them in a hash
+  # If not attributes are specified, all attributes are returned in a hash
+  # (with the exception of some fields which clog up the console since they're huge)
+  def ldap (*options)
+    attributes = {}
+    unless options.empty?
+      options.each do |option|
+        attributes[option] = Devise::LDAP::Adapter.get_ldap_param(self.email, option, self.current_scope).first
+      end
+    else
+      attributes = Devise::LDAP::Adapter.get_ldap_entry(self.email, self.current_scope).myhash.except(:usercertificate).except :thumbnailphoto, :usercertificate, :homemdb, :msexchsafesendershash
+    end
+    attributes
+  end
+
+  # Returns the name of the model from the object calling this function
+  def current_scope
+    self.class.name.downcase.split("::").last.to_s
+  end
+
+  # Placeholder for future class methods
+  module ClassMethods
+  end
+
+end

data/lib/devise_ldap_multiple/version.rb

@@ -1,3 +1,3 @@
 module DeviseLdapMultiple
-  VERSION = "0.9.1".freeze
+  VERSION = "0.9.2".freeze
 end

data/lib/generators/devise_ldap_multiple/devise_ldap_multiple_generator.rb

@@ -11,7 +11,10 @@
     end
 
     def update_user_model
-      gsub_file "app/models/#{user_model}.rb", /:database_authenticatable/, ":ldap_authenticatable" if options.update_model?
+      gsub_file "app/models/#{user_model}.rb", /:database_authenticatable/, ":ldap_authenticatable"
+      inject_into_class "app/models/#{user_model}.rb", user_model.capitalize.constantize do
+        "\n  include DeviseLDAPMultiple\n"
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_ldap_multiple
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Curtis Schiewek
@@ -187,8 +187,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Devise extension to allow authentication to multiple LDAPs. Fork of the
-  devise_ldap_authenticatable project.
+description: Devise extension to allow authentication to multiple LDAP servers, or
+  with multiple configurations to the same LDAP server. Fork of the devise_ldap_authenticatable
+  project.
 email: swillett@outlook.com
 executables: []
 extensions: []
@@ -201,6 +202,7 @@ files:
 - Rakefile
 - devise_ldap_multiple.gemspec
 - lib/devise_ldap_multiple.rb
+- lib/devise_ldap_multiple/concern.rb
 - lib/devise_ldap_multiple/exception.rb
 - lib/devise_ldap_multiple/ldap/adapter.rb
 - lib/devise_ldap_multiple/ldap/connection.rb
@@ -234,6 +236,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Devise extension to allow authentication to multiple LDAPs. Fork of the devise_ldap_authenticatable
+summary: Devise extension to allow authentication to multiple LDAP servers, or with
+  multiple configurations to the same LDAP server. Fork of the devise_ldap_authenticatable
   project.
 test_files: []