Move Jackad methods to module

.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea/
+.rvmrc

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Nick Kugaevsky
+Copyright (c) 2012 — 2013 Nick Kugaevsky
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jackad.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/jackad/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Nick Kugaevsky"]
   gem.email         = ["nick@kugaevsky.ru"]
-  gem.description   = %q{ Active Directory connector }
+  gem.description   = %q{ Simple LDAP (Active Directory) connector }
   gem.summary       = gem.description
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/pantsu/jackad"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Jackad::VERSION
 
   gem.add_dependency 'net-ldap', '~>0.2.0'
+  # gem.add_dependency 'yaml'
 
   #gem.add_development_dependency('rspec')
 

lib/jackad.rb

@@ -4,37 +4,4 @@
 require "jackad/version"
 require "jackad/config"
 require "jackad/ad_connect"
-
-module Jackad
-
-  class ConnectionRefused < StandardError; end
-  class RecordNotFound < StandardError; end
-
-  # Check validity of username and password
-  # Returns true or false
-  def self.credentials_valid?(username, password)
-    ad = AdConnect.new
-    ad.ldap.auth(username, password)
-    ad.ldap.bind
-  end
-
-  # Check user existance by configured attribute
-  # Returns true or false
-  def self.entry_exists?(username)
-    ad = AdConnect.new
-    filter = Net::LDAP::Filter.eq(ad.attribute.to_s, username)
-    ad.ldap.search(filter: filter, size: 1).size > 0 ? true : false
-  end
-
-  # Check user validity by configured attribute, useraccountcontrol flags and pwdlastset attribute
-  # Returns true or false
-  def self.entry_valid?(username)
-    ad = AdConnect.new
-    filter_by_attr = Net::LDAP::Filter.eq(ad.attribute.to_s, username)
-    filter_by_uac = ~Net::LDAP::Filter.construct('useraccountcontrol:1.2.840.113556.1.4.803:=2')
-    filter_by_pass = ~Net::LDAP::Filter.eq('pwdlastset', '0')
-    filter = filter_by_attr & filter_by_uac & filter_by_pass
-    ad.ldap.search(filter: filter, size: 1).size > 0 ? true : false
-  end
-
-end
+require "jackad/jackad"

lib/jackad/config.rb

@@ -1,14 +1,7 @@
 module Jackad
-
-  LDAP_CONFIG = { host: 'example.com',
-                port: 389,
-                base: 'dc=example,dc=com',
-                attribute: 'sAMAccountName',
-                admin_user: 'admin_username',
-                admin_password: 'admin_password',
-                method: 'simple',
-                ssl: false,
-                admin: false
-                }
-
-end
+  class Config
+    def self.setup
+      @@options ||= YAML.load_file('/usr/local/jackad.yml')
+    end
+  end
+end

lib/jackad/jackad.rb

@@ -0,0 +1,32 @@
+module Jackad
+  class ConnectionRefused < StandardError; end
+  class RecordNotFound < StandardError; end
+
+  # Check validity of username and password
+  # Returns true or false
+  def self.credentials_valid?(username, password)
+    ad = AdConnect.new
+    ad.ldap.auth(username, password)
+    ad.ldap.bind
+  end
+
+  # Check user existance by configured attribute
+  # Returns true or false
+  def self.entry_exists?(username)
+    ad = AdConnect.new
+    filter = Net::LDAP::Filter.eq(ad.attribute.to_s, username)
+    ad.ldap.search(filter: filter, size: 1).size > 0 ? true : false
+  end
+
+  # Check user validity by configured attribute, useraccountcontrol flags and pwdlastset attribute
+  # Returns true or false
+  def self.entry_valid?(username)
+    ad = AdConnect.new
+    filter_by_attr = Net::LDAP::Filter.eq(ad.attribute.to_s, username)
+    filter_by_uac = ~Net::LDAP::Filter.construct('useraccountcontrol:1.2.840.113556.1.4.803:=2')
+    filter_by_pass = ~Net::LDAP::Filter.eq('pwdlastset', '0')
+    filter = filter_by_attr & filter_by_uac & filter_by_pass
+    ad.ldap.search(filter: filter, size: 1).size > 0 ? true : false
+  end
+
+end

lib/jackad/version.rb

@@ -1,5 +1,3 @@
 module Jackad
-
-  VERSION = "0.1.1"
-
+  VERSION = "0.1.2"
 end