ad_search 0.0.1 → 0.0.2

data/ad_search.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{Search Active Directory}
   s.description = %q{Allows you to connect to and search your Active Directory system for users that have
-                     not been disabled.}
+                     not been disabled.  Returns a hash.}
 
   s.rubyforge_project = "ad_search"
 

data/lib/ad_search.rb

@@ -1,14 +1,12 @@
+require 'net-ldap'
+
 require "ad_search/version"
 
+# Search Active Directory and get a hash in return
 module AdSearch
-  # Search Active Directory and get a hash in return
-
-  def initialize(user, pw, domain, host, base)
-    @ad_connection = connect_to_ad(user, pw, domain, host, base)
-  end
 
   # Connection to Active Directory
-  def connect_to_ad(username, password, domain, host, base)
+  def self.connect_to_ad(username, password, domain, host, base)
     ldap = Net::LDAP.new :host => host,
                          :port => 389,
                          :base => base,
@@ -24,7 +22,7 @@ module AdSearch
     end
   end
 
-  def search_active_users_by_username(search_term, treebase)
+  def self.search_active_users_by_username(ad_connection, search_term, treebase)
     users = Hash.new
 
     #Create a filter based on the username
@@ -35,7 +33,7 @@ module AdSearch
     joined_filter = Net::LDAP::Filter.join(filter, filter2)
 
     count = 0
-    @ad_connection.search(:base => treebase, :filter => joined_filter) do |entry|
+    ad_connection.search(:base => treebase, :filter => joined_filter) do |entry|
       if active_account?(entry)
         username = entry.sAMAccountName.to_s[2..-3]
         #Split the first name and last name and remove un-needed characters
@@ -78,17 +76,18 @@ module AdSearch
     return users
   end
 
-  #Microsoft Active Directory's way of keeping track of time: BIGEPOCH (01/01/1970) is 116444916000000000 "100 nanosecond intervals since 01/01/1601"
+  #Microsoft Active Directories way of keeping track of time: BIGEPOCH (01/01/1970) is 116444916000000000 "100 nanosecond intervals since 01/01/1601"
   BIGEPOCH = 116444916000000000
-  def active_account?(ad_object)
+  def self.active_account?(ad_object)
     #See if account is disabled or the account is expired
     tmpuac = ad_object.userAccountControl[0].to_i
     if tmpuac & 2 == 2
       return false
-    elsif ad_object.accountExpires[0].to_i != 0 and Time.now > Time.at((ad_object.accountExpires[0].to_i - BIGEPOCH) / 10000000) #Microsoft time to epoch time
+    elsif ad_object.accountExpires[0].to_i != 0 and Time.now > Time.at((ad_object.accountExpires[0].to_i - BIGEPOCH) / 10000000) #Microsoft to epoch time
       return false
     else
       return true
     end
   end
+
 end

data/lib/ad_search/version.rb

@@ -1,3 +1,3 @@
 module AdSearch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_search
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22654416 !ruby/object:Gem::Requirement
+  requirement: &25423128 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22654416
+  version_requirements: *25423128
 - !ruby/object:Gem::Dependency
   name: net-ldap
-  requirement: &22653852 !ruby/object:Gem::Requirement
+  requirement: &25422648 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,9 +32,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22653852
+  version_requirements: *25422648
 description: ! "Allows you to connect to and search your Active Directory system for
-  users that have\n                     not been disabled."
+  users that have\n                     not been disabled.  Returns a hash."
 email:
 - neilhoff@gmail.com
 executables: []