ad-ldap 0.0.1 → 0.1.0

data/ad-ldap.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "net-ldap", "~>0.2.2"
 
-  s.add_development_dependency "assert" #TODO: lock the version of assert
-  s.add_development_dependency "mocha", "=0.9.12"
+  s.add_development_dependency "assert",  "=0.2.0"
+  s.add_development_dependency "mocha",   "=0.9.12"
 end

data/lib/ad-ldap.rb

@@ -80,7 +80,7 @@ module AD
       # Inspired by https://github.com/tpett/perry logger
       def run(method, *args)
         result, time = [ nil, -1 ]
-        if self.config.run_commands
+        if self.config.run_commands || method == :search
           time = (Benchmark.measure do
             result = self.adapter.send(method, *args)
           end).real

data/lib/ad-ldap/adapter.rb

@@ -13,11 +13,11 @@ module AD
         super({
           :host => self.config.host,
           :port => self.config.port,
-          :base => self.config.base,
+          :base => self.config.treebase,
           :encryption => self.config.encryption
         })
         if self.config.auth
-          self.auth(self.config.auth.username, self.config.auth.password)
+          self.auth(self.config.auth[:username], self.config.auth[:password])
         end
       end
 

data/lib/ad-ldap/exceptions.rb

@@ -1,6 +1,8 @@
-module AD::LDAP
+module AD
+  module LDAP
 
-  class Error < StandardError
-  end
+    class Error < StandardError
+    end
 
+  end
 end

data/lib/ad-ldap/logger.rb

@@ -14,7 +14,7 @@ module AD
         color = "4;32;1"
         name = "%s (%.1fms)" % [ "LDAP", time ]
         message = self.generate_message(method, args)
-        output = "  \e[#{color}]#{name}   #{message}\e[0m"
+        output = "  \e[#{color}m#{name}   #{message}\e[0m"
         if self.logger
           self.logger.debug(output)
         elsif !self.silent

data/lib/ad-ldap/search_args.rb

@@ -20,6 +20,9 @@ module AD
             conditions[key.to_sym] = value
           end
         end
+        if !self[:base]
+          self[:base] = AD::LDAP.config.treebase
+        end
         if !self[:filter] && (filters = self.build_filters(conditions))
           self[:filter] = filters ? filters.to_s : nil
         end

data/lib/ad-ldap/version.rb

@@ -1,5 +1,5 @@
 module AD
   module LDAP
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/test/unit/ad-ldap/search_args_test.rb

@@ -5,6 +5,7 @@ class AD::LDAP::SearchArgs
   class BaseTest < Assert::Context
     desc "the AD::LDAP::SearchArgs class"
     setup do
+      AD::LDAP.config.treebase = @treebase = "DC=example, DC=com"
       @search_args = AD::LDAP::SearchArgs.new({})
     end
     subject{ @search_args }
@@ -12,6 +13,9 @@ class AD::LDAP::SearchArgs
     should "be a kind of Hash" do
       assert_kind_of Hash, subject
     end
+    should "set the base to the configured value for AD::LDAP" do
+      assert_equal @treebase, subject[:base]
+    end
   end
   
   class WithOnlyLDAPKeysTest < Assert::Context
@@ -75,7 +79,7 @@ class AD::LDAP::SearchArgs
       @original = { :dn => "something", :objectclass => "top" }
       first_filter = Net::LDAP::Filter.eq(:dn, @original[:dn])
       second_filter = Net::LDAP::Filter.eq(:objectclass, @original[:objectclass])
-      @expected_filter = Net::LDAP::Filter.join(second_filter, first_filter)
+      @expected_filter = Net::LDAP::Filter.join(first_filter, second_filter)
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }

data/test/unit/ad-ldap_test.rb

@@ -13,7 +13,7 @@ module AD::LDAP
       :search, :bind_as
     ].each do |method|
       should "respond to ##{method}" do
-        assert_respond_to subject, method
+        assert_respond_to method, subject
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ad-ldap
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 -05:00
+date: 2011-08-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,14 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   requirement: *id002
 - !ruby/object:Gem::Dependency