net-ldap 0.2 → 0.2.1

data/History.rdoc

@@ -1,4 +1,8 @@
-=== Net::LDAP 0.2 / 2011-03-__
+=== Net::LDAP 0.2.1 / 2011-03-23
+* Bug Fixes:
+  * Net::LDAP.modify_ops was broken and is now fixed.
+
+=== Net::LDAP 0.2 / 2011-03-22
 * Major Enhancements:
   * Net::LDAP::Filter changes:
     * Filters can only be constructed using our custom constructors (eq, ge,

data/Rakefile

@@ -6,6 +6,7 @@ require 'hoe'
 Hoe.plugin :doofus
 Hoe.plugin :git
 Hoe.plugin :gemspec
+Hoe.plugin :rubyforge
 
 Hoe.spec 'net-ldap' do |spec|
   spec.rubyforge_name = spec.name

data/lib/net/ber.rb

@@ -106,7 +106,7 @@ module Net # :nodoc:
   # <tr><th>BMPString</th><th>C</th><td>30: 62 (0x3e, 0b00111110)</td></tr>
   # </table>
   module BER
-    VERSION = '0.2'
+    VERSION = '0.2.1'
 
     ##
     # Used for BER-encoding the length and content bytes of a Fixnum integer

data/lib/net/ldap.rb

@@ -241,7 +241,7 @@ require 'net/ldap/entry'
 # and then keeps it open while it executes a user-supplied block.
 # Net::LDAP#open closes the connection on completion of the block.
 class Net::LDAP
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 
   class LdapError < StandardError; end
 
@@ -1452,18 +1452,25 @@ class Net::LDAP::Connection #:nodoc:
     result_code
   end
 
-  def self.modify_ops args
-      modify_ops = []
-      a = args[:operations] and a.each {|op, attr, values|
-        # TODO, fix the following line, which gives a bogus error
-        # if the opcode is invalid.
-        op_1 = {:add => 0, :delete => 1, :replace => 2} [op.to_sym].to_ber_enumerated
-        values = [values].flatten.map { |v|
-            v.to_ber unless v.nil?
-        }.to_ber_set
-        modify_ops << [op_1,[attr.to_s.to_ber,values].to_ber_sequence].to_ber
+  MODIFY_OPERATIONS = { #:nodoc:
+    :add => 0,
+    :delete => 1,
+    :replace => 2
+  }
+
+  def self.modify_ops(operations)
+    modify_ops = []
+    if operations
+      operations.each { |op, attrib, values|
+        # TODO, fix the following line, which gives a bogus error if the
+        # opcode is invalid.
+        op_ber = MODIFY_OPERATIONS[op.to_sym].to_ber_enumerated
+        values = [ values ].flatten.map { |v| v.to_ber if v }.to_ber_set
+        values = [ attrib.to_s.to_ber, values ].to_ber_sequence
+        modify_ops << [ op_ber, values ].to_ber
       }
-      modify_ops
+    end
+    modify_ops
   end
 
   #--
@@ -1476,9 +1483,9 @@ class Net::LDAP::Connection #:nodoc:
   def modify(args)
     modify_dn = args[:dn] or raise "Unable to modify empty DN"
     modify_ops = modify_ops args[:operations]
-    request = [modify_dn.to_ber,
-      modify_ops.to_ber_sequence].to_ber_appsequence(6)
-    pkt = [next_msgid.to_ber, request].to_ber_sequence
+    request = [ modify_dn.to_ber,
+      modify_ops.to_ber_sequence ].to_ber_appsequence(6)
+    pkt = [ next_msgid.to_ber, request ].to_ber_sequence
     @conn.write pkt
 
     (be = @conn.read_ber(Net::LDAP::AsnSyntax)) && (pdu = Net::LDAP::PDU.new(be)) && (pdu.app_tag == 7) or raise Net::LDAP::LdapError, "response missing or invalid"

data/lib/net/snmp.rb

@@ -2,7 +2,7 @@
 # :stopdoc:
 module Net
     class SNMP
-      VERSION = '0.2'
+      VERSION = '0.2.1'
 
 	AsnSyntax = Net::BER.compile_syntax({
 	    :application => {

data/test/test_ldap_connection.rb

@@ -1,24 +1,24 @@
 require 'common'
 
 class TestLDAP < Test::Unit::TestCase
-    def test_modify_ops_delete
-        args = {:operations=>[[:delete, "mail"]]}
-        result = Net::LDAP::Connection.modify_ops(args)
-        expected = ["0\r\n\x01\x010\b\x04\x04mail1\x00"]
-        assert_equal(expected, result)
-    end
+  def test_modify_ops_delete
+    args = { :operations => [ [ :delete, "mail" ] ] }
+    result = Net::LDAP::Connection.modify_ops(args[:operations])
+    expected = [ "0\r\n\x01\x010\b\x04\x04mail1\x00" ]
+    assert_equal(expected, result)
+  end
 
-    def test_modify_ops_add
-        args = {:operations=>[[:add, "mail", "testuser@example.com"]]}
-        result = Net::LDAP::Connection.modify_ops(args)
-        expected = ["0#\n\x01\x000\x1E\x04\x04mail1\x16\x04\x14testuser@example.com"]
-        assert_equal(expected, result)
-    end
+  def test_modify_ops_add
+    args = { :operations => [ [ :add, "mail", "testuser@example.com" ] ] }
+    result = Net::LDAP::Connection.modify_ops(args[:operations])
+    expected = [ "0#\n\x01\x000\x1E\x04\x04mail1\x16\x04\x14testuser@example.com" ]
+    assert_equal(expected, result)
+  end
 
-    def test_modify_ops_replace
-        args = {:operations=>[[:replace, "mail", "testuser@example.com"]]}
-        result = Net::LDAP::Connection.modify_ops(args)
-        expected = ["0#\n\x01\x020\x1E\x04\x04mail1\x16\x04\x14testuser@example.com"]
-        assert_equal(expected, result)
-    end
+  def test_modify_ops_replace
+    args = { :operations =>[ [ :replace, "mail", "testuser@example.com" ] ] }
+    result = Net::LDAP::Connection.modify_ops(args[:operations])
+    expected = [ "0#\n\x01\x020\x1E\x04\x04mail1\x16\x04\x14testuser@example.com" ]
+    assert_equal(expected, result)
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ldap
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -18,13 +19,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
+date: 2011-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe-git
+  name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe-git
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,11 +51,11 @@ dependencies:
         - 1
         version: "1"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe-gemspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +65,11 @@ dependencies:
         - 1
         version: "1"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: metaid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,11 +79,11 @@ dependencies:
         - 1
         version: "1"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,11 +95,11 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,11 +110,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,7 +126,7 @@ dependencies:
         - 1
         version: 2.9.1
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: "Net::LDAP for Ruby (also called net-ldap) implements client access for the\n\
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for\n\
   accessing distributed directory services. Net::LDAP is written completely in\n\