sheffield_ldap_lookup 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f1fb61d37a5823114d379ab1a345d184b1c35b17
+  data.tar.gz: 86156649e10b28a2ff876a165a86eb15ca25b97c
+SHA512:
+  metadata.gz: 080c9715362eb34846ec609100cfc7ba7936caa346d8ad99f6a0d9d45d03823a171b245d03f1646a3e3417b7d28ac3feff62d3976e9a889f7ed718950ea33051
+  data.tar.gz: 0116b41bd5caa1e52ced95c481721c1641669af4838b76207ba581a1d5234b725db5e0fc709568f2fa6f592b280cc5c8665d082e365d2935944f5f76f586023f

data/lib/sheffield_ldap_lookup/ldap_finder.rb

@@ -33,7 +33,23 @@ module SheffieldLdapLookup
     end
 
     def connection(ldap_class = Net::LDAP)
-      @connection ||= ldap_class.new(host: ldap_config["#{@config_prefix}host"], port: ldap_config["#{@config_prefix}port"], base: ldap_config["#{@config_prefix}base"])
+      @connection ||= ldap_class.new(connection_settings)
     end
+    
+    def connection_settings
+      base_settings = {
+        host: ldap_config["#{@config_prefix}host"], port: ldap_config["#{@config_prefix}port"], base: ldap_config["#{@config_prefix}base"]
+      }
+      
+      if ldap_config.key?("#{@config_prefix}username") && ldap_config.key?("#{@config_prefix}password")
+        base_settings[:auth] = {
+          method: :simple,
+          username: ldap_config["#{@config_prefix}username"],
+          password: ldap_config["#{@config_prefix}password"]
+        }
+      end
+      base_settings
+    end
+    
   end
 end

data/lib/sheffield_ldap_lookup/version.rb

@@ -1,3 +1,3 @@
 module SheffieldLdapLookup
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/sheffield_ldap_lookup.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["s.chen@epigenesys.co.uk"]
   gem.description   = "A gem to fetch information from University of Sheffield LDAP server based on username or email address."
   gem.summary       = "LDAP lookup"
-  gem.homepage      = "http://www.epigenesys.co.uk"
+  gem.homepage      = "http://www.epigenesys.org.uk"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,6 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency('net-ldap')
   
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rails', '~> 3.2')
+  gem.add_development_dependency('rails', '>= 3.2')
   gem.add_development_dependency('rspec')
 end

data/spec/lib/ldap_finder_spec.rb

@@ -6,7 +6,7 @@ describe SheffieldLdapLookup::LdapFinder do
   describe "#connection" do
     it "should create a new LDAP connection" do
       subject.stub(ldap_config: LDAP_CONFIG)
-      ldap_class = mock
+      ldap_class = double
       ldap_class.should_receive(:new).with(host: LDAP_CONFIG['host'], port: LDAP_CONFIG['port'], base: LDAP_CONFIG['base'])
       subject.connection(ldap_class)
     end
@@ -37,7 +37,7 @@ describe SheffieldLdapLookup::LdapFinder do
     it "should create a LDAP filter for the attribute and keyword" do
       finder = SheffieldLdapLookup::LdapFinder.new('username')
       finder.stub(search_attribute: 'uid')
-      filter_class = mock
+      filter_class = double
       filter_class.should_receive(:eq).with('uid', 'username')
       finder.ldap_filter filter_class
     end
@@ -45,8 +45,8 @@ describe SheffieldLdapLookup::LdapFinder do
   
   describe "#lookup" do
     describe "use the LDAP filter to search for the entity and return the first result" do
-      let(:ldap_filter) { mock }
-      let(:connection)  { mock }
+      let(:ldap_filter) { double }
+      let(:connection)  { double }
       before { subject.stub(ldap_filter: ldap_filter, connection: connection) }
       
       it "should search the LDAP connection using the filter" do
@@ -55,7 +55,7 @@ describe SheffieldLdapLookup::LdapFinder do
       end
       
       it "should return the first result" do
-        result = mock
+        result = double
         connection.stub(search: [result])
         subject.lookup.should == result
       end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: sheffield_ldap_lookup
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Shuo Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem to fetch information from University of Sheffield LDAP server based
@@ -97,35 +88,28 @@ files:
 - sheffield_ldap_lookup.gemspec
 - spec/lib/ldap_finder_spec.rb
 - spec/spec_helper.rb
-homepage: http://www.epigenesys.co.uk
+homepage: http://www.epigenesys.org.uk
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2227935076351519590
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2227935076351519590
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: LDAP lookup
 test_files:
 - spec/lib/ldap_finder_spec.rb