ad-ldap 0.1.0 → 0.1.1

data/.gitignore

@@ -1,4 +1,3 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    ad-ldap (0.1.1)
+      net-ldap (~> 0.2.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ansi (1.3.0)
+    assert (0.3.0)
+      ansi (~> 1.3)
+    mocha (0.9.12)
+    net-ldap (0.2.2)
+    rake (0.9.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ad-ldap!
+  assert (~> 0.3.0)
+  mocha (~> 0.9.12)
+  rake (~> 0.9.2)

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",  "=0.2.0"
-  s.add_development_dependency "mocha",   "=0.9.12"
+  s.add_development_dependency "assert",  "~>0.3.0"
+  s.add_development_dependency "mocha",   "~>0.9.12"
 end

data/lib/ad-ldap.rb

@@ -70,7 +70,7 @@ module AD
           size = search_args.delete(:size)
         end
         results = (self.run(:search, search_args) || [])
-        if !self.config.search_size_supported && size && results.kind_of?(Array)
+        if !self.config.search_size_supported && size
           results[0..(size.to_i - 1)]
         else
           results

data/lib/ad-ldap/search_args.rb

@@ -31,7 +31,7 @@ module AD
       protected
 
       def build_filters(conditions = {})
-        conditions.inject(nil) do |filters, (key, value)|
+        conditions.sort_by{|(key, value)| key.to_s }.inject(nil) do |filters, (key, value)|
           field, operator = key.to_s.split("__")
           operator ||= "eq"
           if mapping = AD::LDAP.config.mappings[field.to_sym]

data/lib/ad-ldap/version.rb

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

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

@@ -1,7 +1,7 @@
 require 'assert'
 
 class AD::LDAP::SearchArgs
-  
+
   class BaseTest < Assert::Context
     desc "the AD::LDAP::SearchArgs class"
     setup do
@@ -9,7 +9,7 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new({})
     end
     subject{ @search_args }
-    
+
     should "be a kind of Hash" do
       assert_kind_of Hash, subject
     end
@@ -17,7 +17,7 @@ class AD::LDAP::SearchArgs
       assert_equal @treebase, subject[:base]
     end
   end
-  
+
   class WithOnlyLDAPKeysTest < Assert::Context
     desc "the AD::LDAP::SearchArgs initialized with only net-ldap keys"
     setup do
@@ -28,14 +28,14 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "not alter the hash passed to it" do
       @original.each do |key, value|
         assert_equal value, @search_args[key]
       end
     end
   end
-  
+
   class WithNonLDAPKeysTest < Assert::Context
     desc "the AD::LDAP::SearchArgs initialized with non net-ldap keys"
     setup do
@@ -47,13 +47,13 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "set the filter based off the non net-ldap keys" do
       assert_equal @original[:base], subject[:base]
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
   end
-  
+
   class WithMappingsTest < Assert::Context
     desc "search args with a mapping filter"
     setup do
@@ -63,16 +63,16 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "use the mapping for the field" do
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
-    
+
     teardown do
       AD::LDAP.config.mappings = {}
     end
   end
-  
+
   class WithMultipleFiltersTest < Assert::Context
     desc "search args with a multiple filters"
     setup do
@@ -83,12 +83,12 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "join the filters together" do
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
   end
-  
+
   class WithEqualFilterTest < Assert::Context
     desc "search args with a equal filter"
     setup do
@@ -97,12 +97,12 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "create an equal filter for the field" do
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
   end
-  
+
   class WithNotEqualFilterTest < Assert::Context
     desc "search args with a not equal filter"
     setup do
@@ -111,12 +111,12 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "create a not equal filter for the field" do
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
   end
-  
+
   class WithGreaterThanOrEqualFilterTest < Assert::Context
     desc "search args with a greater than or equal filter"
     setup do
@@ -125,12 +125,12 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "create a greater than or equal filter for the field" do
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
   end
-  
+
   class WithLessThanOrEqualFilterTest < Assert::Context
     desc "search args with a less than or equal filter"
     setup do
@@ -139,10 +139,10 @@ class AD::LDAP::SearchArgs
       @search_args = AD::LDAP::SearchArgs.new(@original)
     end
     subject{ @search_args }
-    
+
     should "create a less than or equal filter for the field" do
       assert_equal @expected_filter.to_s, subject[:filter].to_s
     end
   end
-  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ad-ldap
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Collin Redding
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 -05:00
-default_executable: 
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: net-ldap
+  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,31 +31,31 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
-  type: :runtime
-  requirement: *id001
+  version_requirements: *id001
+  name: net-ldap
 - !ruby/object:Gem::Dependency 
-  name: assert
+  type: :development
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
-  type: :development
-  requirement: *id002
+        version: 0.3.0
+  version_requirements: *id002
+  name: assert
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  type: :development
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 35
         segments: 
@@ -64,8 +63,8 @@ dependencies:
         - 9
         - 12
         version: 0.9.12
-  type: :development
-  requirement: *id003
+  version_requirements: *id003
+  name: mocha
 description: A small wrapper to Net::LDAP to provide some extended functionality and utility.
 email: 
 executables: []
@@ -77,6 +76,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - README.markdown
 - Rakefile
 - ad-ldap.gemspec
@@ -93,7 +93,6 @@ files:
 - test/unit/ad-ldap/response_test.rb
 - test/unit/ad-ldap/search_args_test.rb
 - test/unit/ad-ldap_test.rb
-has_rdoc: true
 homepage: http://github.com/teaminsight/ad-ldap
 licenses: []
 
@@ -123,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ad-ldap
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A small wrapper to Net::LDAP to provide some extended functionality and utility.