net-ldap 0.8.0 → 0.9.0

data/test/test_ldif.rb

@@ -1,6 +1,6 @@
 # $Id: testldif.rb 61 2006-04-18 20:55:55Z blackhedd $
 
-require 'common'
+require_relative 'test_helper'
 
 require 'digest/sha1'
 require 'base64'
@@ -13,6 +13,12 @@ class TestLdif < Test::Unit::TestCase
     assert_equal(true, ds.empty?)
   end
 
+  def test_ldif_with_version
+    io = StringIO.new("version: 1")
+    ds = Net::LDAP::Dataset.read_ldif(io)
+    assert_equal "1", ds.version
+  end
+
   def test_ldif_with_comments
     str = ["# Hello from LDIF-land", "# This is an unterminated comment"]
     io = StringIO.new(str[0] + "\r\n" + str[1])
@@ -47,6 +53,18 @@ class TestLdif < Test::Unit::TestCase
     assert_equal(true, ds.has_key?("key"))
   end
 
+  def test_ldif_with_base64_dn
+    str = "dn:: Q049QmFzZTY0IGRuIHRlc3QsT1U9VGVzdCxPVT1Vbml0cyxEQz1leGFtcGxlLERDPWNvbQ==\r\n\r\n"
+    ds = Net::LDAP::Dataset::read_ldif(StringIO.new(str))
+    assert_equal(true, ds.has_key?("CN=Base64 dn test,OU=Test,OU=Units,DC=example,DC=com"))
+  end
+
+  def test_ldif_with_base64_dn_and_continuation_lines
+    str = "dn:: Q049QmFzZTY0IGRuIHRlc3Qgd2l0aCBjb250aW51YXRpb24gbGluZSxPVT1UZXN0LE9VPVVua\r\n XRzLERDPWV4YW1wbGUsREM9Y29t\r\n\r\n"
+    ds = Net::LDAP::Dataset::read_ldif(StringIO.new(str))
+    assert_equal(true, ds.has_key?("CN=Base64 dn test with continuation line,OU=Test,OU=Units,DC=example,DC=com"))
+  end
+
   # TODO, INADEQUATE. We need some more tests
   # to verify the content.
   def test_ldif
@@ -76,4 +94,11 @@ class TestLdif < Test::Unit::TestCase
     assert_equal(entries.size, ds.size)
     assert_equal(entries.sort, ds.to_ldif.grep(/^dn:\s*/) { $'.chomp })
   end
+
+  def test_to_ldif_with_version
+    ds = Net::LDAP::Dataset.new
+    ds.version = "1"
+
+    assert_equal "version: 1", ds.to_ldif_string.chomp
+  end
 end

data/test/test_password.rb

@@ -1,17 +1,10 @@
 # $Id: testpsw.rb 72 2006-04-24 21:58:14Z blackhedd $
 
-require 'common'
+require_relative 'test_helper'
 
 class TestPassword < Test::Unit::TestCase
-
   def test_psw
-    assert_equal(
-	"{MD5}xq8jwrcfibi0sZdZYNkSng==",
-	Net::LDAP::Password.generate( :md5, "cashflow" ))
-
-    assert_equal(
-	"{SHA}YE4eGkN4BvwNN1f5R7CZz0kFn14=",
-	Net::LDAP::Password.generate( :sha, "cashflow" ))
+    assert_equal("{MD5}xq8jwrcfibi0sZdZYNkSng==", Net::LDAP::Password.generate( :md5, "cashflow" ))
+    assert_equal("{SHA}YE4eGkN4BvwNN1f5R7CZz0kFn14=", Net::LDAP::Password.generate( :sha, "cashflow" ))
   end
-
 end

data/test/test_rename.rb

@@ -1,7 +1,7 @@
-require 'common'
+require_relative 'test_helper'
 
 # Commented out since it assumes you have a live LDAP server somewhere. This
-# will be migrated to the integration specs, as soon as they are ready. 
+# will be migrated to the integration specs, as soon as they are ready.
 =begin
 class TestRename < Test::Unit::TestCase
   HOST= '10.10.10.71'

data/test/test_search.rb

@@ -0,0 +1,39 @@
+# -*- ruby encoding: utf-8 -*-
+require_relative 'test_helper'
+
+class TestSearch < Test::Unit::TestCase
+  class FakeConnection
+    def search(args)
+      OpenStruct.new(:result_code => Net::LDAP::ResultCodeOperationsError, :message => "error", :success? => false)
+    end
+  end
+
+  def setup
+    @service = MockInstrumentationService.new
+    @connection = Net::LDAP.new :instrumentation_service => @service
+    @connection.instance_variable_set(:@open_connection, FakeConnection.new)
+  end
+
+  def test_true_result
+    assert_nil @connection.search(:return_result => true)
+  end
+
+  def test_false_result
+    refute @connection.search(:return_result => false)
+  end
+
+  def test_no_result
+    assert_nil @connection.search
+  end
+
+  def test_instrumentation_publishes_event
+    events = @service.subscribe "search.net_ldap"
+
+    @connection.search(:filter => "test")
+
+    payload, result = events.pop
+    assert payload.has_key?(:result)
+    assert payload.has_key?(:filter)
+    assert_equal "test", payload[:filter]
+  end
+end

data/test/test_snmp.rb

@@ -1,6 +1,6 @@
 # $Id: testsnmp.rb 231 2006-12-21 15:09:29Z blackhedd $
 
-require 'common'
+require_relative 'test_helper'
 require 'net/snmp'
 
 class TestSnmp < Test::Unit::TestCase

data/test/test_ssl_ber.rb

@@ -0,0 +1,40 @@
+require_relative 'test_helper'
+require 'timeout'
+
+class TestSSLBER < Test::Unit::TestCase
+  # Transmits str to @to and reads it back from @from.
+  #
+  def transmit(str)
+    Timeout::timeout(1) do
+      @to.write(str)
+      @to.close
+
+      @from.read
+    end
+  end
+
+  def setup
+    @from, @to = IO.pipe
+
+    # The production code operates on sockets, which do need #connect called
+    # on them to work. Pipes are more robust for this test, so we'll skip
+    # the #connect call since it fails.
+    #
+    # 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)
+
+    @to   = Net::LDAP::Connection.wrap_with_ssl(@to)
+    @from = Net::LDAP::Connection.wrap_with_ssl(@from)
+  end
+
+  def test_transmit_strings
+    assert_equal "foo", transmit("foo")
+  end
+
+  def test_transmit_ber_encoded_numbers
+    @to.write 1234.to_ber
+    assert_equal 1234, @from.read_ber
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ldap
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -13,106 +13,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: metaid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '2.9'
 description: |-
   Net::LDAP for Ruby (also called net-ldap) implements client access for the
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for
@@ -122,30 +80,28 @@ description: |-
 
   Net::LDAP has been tested against modern popular LDAP servers including
   OpenLDAP and Active Directory. The current release is mostly compliant with
-  earlier versions of the IETF LDAP RFCs (2251–2256, 2829–2830, 3377, and 3771).
+  earlier versions of the IETF LDAP RFCs (2251-2256, 2829-2830, 3377, and 3771).
   Our roadmap for Net::LDAP 1.0 is to gain full <em>client</em> compliance with
-  the most recent LDAP RFCs (4510–4519, plus portions of 4520–4532).
+  the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).
 email:
 - blackhedd@rubyforge.org
 - gemiel@gmail.com
 - rory.ocon@gmail.com
 - kaspar.schiess@absurd.li
 - austin@rubyforge.org
-- michael@schaaryworks.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- Manifest.txt
 - Contributors.rdoc
 - Hacking.rdoc
 - History.rdoc
 - License.rdoc
-- Manifest.txt
 - README.rdoc
 files:
-- ".autotest"
-- ".gemtest"
-- ".rspec"
+- ".gitignore"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Contributors.rdoc
 - Gemfile
 - Hacking.rdoc
@@ -154,7 +110,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- autotest/discover.rb
 - lib/net-ldap.rb
 - lib/net/ber.rb
 - lib/net/ber/ber_parser.rb
@@ -166,6 +121,7 @@ files:
 - lib/net/ber/core_ext/string.rb
 - lib/net/ber/core_ext/true_class.rb
 - lib/net/ldap.rb
+- lib/net/ldap/connection.rb
 - lib/net/ldap/dataset.rb
 - lib/net/ldap/dn.rb
 - lib/net/ldap/entry.rb
@@ -176,30 +132,43 @@ files:
 - lib/net/ldap/version.rb
 - lib/net/snmp.rb
 - net-ldap.gemspec
-- spec/integration/ssl_ber_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/unit/ber/ber_spec.rb
-- spec/unit/ber/core_ext/array_spec.rb
-- spec/unit/ber/core_ext/string_spec.rb
-- spec/unit/ldap/dn_spec.rb
-- spec/unit/ldap/entry_spec.rb
-- spec/unit/ldap/filter_parser_spec.rb
-- spec/unit/ldap/filter_spec.rb
-- spec/unit/ldap/search_spec.rb
-- spec/unit/ldap_spec.rb
-- test/common.rb
+- script/install-openldap
+- script/package
+- script/release
+- test/ber/core_ext/test_array.rb
+- test/ber/core_ext/test_string.rb
+- test/ber/test_ber.rb
+- test/fixtures/openldap/memberof.ldif
+- test/fixtures/openldap/retcode.ldif
+- test/fixtures/openldap/slapd.conf.ldif
+- test/fixtures/seed.ldif
+- test/integration/test_add.rb
+- test/integration/test_ber.rb
+- test/integration/test_bind.rb
+- test/integration/test_delete.rb
+- test/integration/test_open.rb
+- test/integration/test_return_codes.rb
+- test/integration/test_search.rb
+- test/support/vm/openldap/.gitignore
+- test/support/vm/openldap/README.md
+- test/support/vm/openldap/Vagrantfile
+- test/test_dn.rb
 - test/test_entry.rb
 - test/test_filter.rb
+- test/test_filter_parser.rb
+- test/test_helper.rb
+- test/test_ldap.rb
 - test/test_ldap_connection.rb
 - test/test_ldif.rb
 - test/test_password.rb
 - test/test_rename.rb
+- test/test_search.rb
 - test/test_snmp.rb
+- test/test_ssl_ber.rb
 - test/testdata.ldif
 - testserver/ldapserver.rb
 - testserver/testdata.ldif
-homepage: http://rubyldap.com/'
+homepage: http://github.com/ruby-ldap/ruby-net-ldap
 licenses:
 - MIT
 metadata: {}
@@ -213,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -228,10 +197,36 @@ summary: Net::LDAP for Ruby (also called net-ldap) implements client access for
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing
   distributed directory services
 test_files:
+- test/ber/core_ext/test_array.rb
+- test/ber/core_ext/test_string.rb
+- test/ber/test_ber.rb
+- test/fixtures/openldap/memberof.ldif
+- test/fixtures/openldap/retcode.ldif
+- test/fixtures/openldap/slapd.conf.ldif
+- test/fixtures/seed.ldif
+- test/integration/test_add.rb
+- test/integration/test_ber.rb
+- test/integration/test_bind.rb
+- test/integration/test_delete.rb
+- test/integration/test_open.rb
+- test/integration/test_return_codes.rb
+- test/integration/test_search.rb
+- test/support/vm/openldap/.gitignore
+- test/support/vm/openldap/README.md
+- test/support/vm/openldap/Vagrantfile
+- test/test_dn.rb
 - test/test_entry.rb
 - test/test_filter.rb
+- test/test_filter_parser.rb
+- test/test_helper.rb
+- test/test_ldap.rb
 - test/test_ldap_connection.rb
 - test/test_ldif.rb
 - test/test_password.rb
 - test/test_rename.rb
+- test/test_search.rb
 - test/test_snmp.rb
+- test/test_ssl_ber.rb
+- test/testdata.ldif
+- testserver/ldapserver.rb
+- testserver/testdata.ldif