net-ldap 0.16.2 → 0.16.3

data/test/test_ssl_ber.rb

@@ -5,7 +5,7 @@ class TestSSLBER < Test::Unit::TestCase
   # Transmits str to @to and reads it back from @from.
   #
   def transmit(str)
-    Timeout::timeout(1) do
+    Timeout.timeout(1) do
       @to.write(str)
       @to.close
 
@@ -22,18 +22,22 @@ class TestSSLBER < Test::Unit::TestCase
     #
     # TODO: Replace test with real socket
     # https://github.com/ruby-ldap/ruby-net-ldap/pull/121#discussion_r18746386
-    flexmock(OpenSSL::SSL::SSLSocket).
-      new_instances.should_receive(:connect => nil)
+    flexmock(OpenSSL::SSL::SSLSocket)
+      .new_instances.should_receive(:connect => nil)
 
     @to   = Net::LDAP::Connection.wrap_with_ssl(@to)
     @from = Net::LDAP::Connection.wrap_with_ssl(@from)
   end
 
   def test_transmit_strings
+    omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket"
+
     assert_equal "foo", transmit("foo")
   end
 
   def test_transmit_ber_encoded_numbers
+    omit_if RUBY_PLATFORM == "java", "JRuby throws an error without a real socket"
+
     @to.write 1234.to_ber
     assert_equal 1234, @from.read_ber
   end

data/testserver/ldapserver.rb

@@ -15,7 +15,6 @@
 #------------------------------------------------
 
 module LdapServer
-
   LdapServerAsnSyntax = {
     :application => {
       :constructed => {
@@ -46,7 +45,7 @@ module LdapServer
     @data ||= ""; @data << data
     while pdu = @data.read_ber!(LdapServerAsnSyntax)
       begin
-      handle_ldap_pdu pdu
+        handle_ldap_pdu pdu
       rescue
         $logger.error "closing connection due to error #{$!}"
         close_connection
@@ -87,9 +86,7 @@ module LdapServer
     end
   end
 
-
-
-  #--
+  # --
   # Search Response ::=
   #       CHOICE {
   #            entry          [APPLICATION 4] SEQUENCE {
@@ -119,9 +116,9 @@ module LdapServer
     # pdu[1][7] is the list of requested attributes.
     # If it's an empty array, that means that *all* attributes were requested.
     requested_attrs = if pdu[1][7].length > 0
-      pdu[1][7].map(&:downcase)
-    else
-      :all
+                        pdu[1][7].map(&:downcase)
+                      else
+                        :all
     end
 
     filters = pdu[1][6]
@@ -131,13 +128,13 @@ module LdapServer
     end
 
     # TODO, what if this returns nil?
-    filter = Net::LDAP::Filter.parse_ldap_filter( filters )
+    filter = Net::LDAP::Filter.parse_ldap_filter(filters)
 
     $ldif.each do |dn, entry|
-      if filter.match( entry )
+      if filter.match(entry)
         attrs = []
         entry.each do |k, v|
-          if requested_attrs == :all or requested_attrs.include?(k.downcase)
+          if requested_attrs == :all || requested_attrs.include?(k.downcase)
             attrvals = v.map(&:to_ber).to_ber_set
             attrs << [k.to_ber, attrvals].to_ber_sequence
           end
@@ -149,32 +146,27 @@ module LdapServer
       end
     end
 
-
     send_ldap_response 5, pdu[0].to_i, 0, "", "Was that what you wanted?"
   end
 
-
-
   def send_ldap_response pkt_tag, msgid, code, dn, text
-    send_data( [msgid.to_ber, [code.to_ber, dn.to_ber, text.to_ber].to_ber_appsequence(pkt_tag)].to_ber )
+    send_data([msgid.to_ber, [code.to_ber, dn.to_ber, text.to_ber].to_ber_appsequence(pkt_tag)].to_ber)
   end
-
 end
 
-
 #------------------------------------------------
 
 # Rather bogus, a global method, which reads a HARDCODED filename
 # parses out LDIF data. It will be used to serve LDAP queries out of this server.
 #
 def load_test_data
-  ary = File.readlines( "./testdata.ldif" )
+  ary = File.readlines("./testdata.ldif")
   hash = {}
-  while line = ary.shift and line.chomp!
+  while (line = ary.shift) && line.chomp!
     if line =~ /^dn:[\s]*/i
       dn = $'
       hash[dn] = {}
-      while attr = ary.shift and attr.chomp! and attr =~ /^([\w]+)[\s]*:[\s]*/
+      while (attr = ary.shift) && attr.chomp! && attr =~ /^([\w]+)[\s]*:[\s]*/
         hash[dn][$1.downcase] ||= []
         hash[dn][$1.downcase] << $'
       end
@@ -183,7 +175,6 @@ def load_test_data
   hash
 end
 
-
 #------------------------------------------------
 
 if __FILE__ == $0
@@ -204,6 +195,6 @@ if __FILE__ == $0
   EventMachine.run do
     $logger.info "starting LDAP server on 127.0.0.1 port 3890"
     EventMachine.start_server "127.0.0.1", 3890, LdapServer
-    EventMachine.add_periodic_timer 60, proc {$logger.info "heartbeat"}
+    EventMachine.add_periodic_timer 60, proc { $logger.info "heartbeat" }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ldap
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -10,10 +10,10 @@ authors:
 - Kaspar Schiess
 - Austin Ziegler
 - Michael Schaarschmidt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flexmock
@@ -35,28 +35,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ homepage: http://github.com/ruby-ldap/ruby-net-ldap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -207,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Net::LDAP for Ruby (also called net-ldap) implements client access for the
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing