jruby-ldap 0.0.1 → 0.0.2

data/.gitignore

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

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in jruby-ldap.gemspec
+gemspec

data/History.txt

@@ -0,0 +1,7 @@
+== 0.0.2 (03/12/12)
+
+- 1.9 compatibility (thanks Arkadiy Kraportov)
+
+== 0.0.1 (10/09/07)
+
+- Initial release.

data/Rakefile

@@ -1,7 +1,7 @@
-require 'rake'
 require 'rake/testtask'
+require 'bundler/gem_tasks'
 
-task :default => [:test, :package]
+task :default => [:test, :build]
 
 desc "Run all tests"
 task :test => [:test_all]
@@ -12,31 +12,3 @@ Rake::TestTask.new(:test_all) do |t|
   t.libs.delete("lib") unless defined?(JRUBY_VERSION)
 end
 
-
-task :filelist do
-  puts FileList['pkg/**/*'].inspect
-end
-
-MANIFEST = FileList["lib/**/*.rb", "test/**/*.rb", "Rakefile", "LICENSE", "README"]
-
-file "Manifest.txt" => :manifest
-task :manifest do
-  File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
-end
-
-Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
-
-begin
-  require 'hoe'
-  Hoe.new("jruby-ldap", "0.0.1") do |p|
-    p.rubyforge_name = "jruby-extras"
-    p.url = "http://jruby-extras.rubyforge.org/jruby-ldap"
-    p.author = "Ola Bini"
-    p.email = "ola.bini@gmail.com"
-    p.summary = "Port of Ruby/LDAP to JRuby"
-  end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
-rescue LoadError
-  puts "You really need Hoe installed to be able to package this gem"
-rescue => e
-  puts "ignoring error while loading hoe: #{e.to_s}"
-end

data/jruby-ldap.gemspec

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "jruby-ldap/version"
+
+Gem::Specification.new do |s|
+  s.name        = "jruby-ldap"
+  s.version     = JRuby::LDAP::VERSION
+  s.authors     = ["Ola Bini"]
+  s.email       = ["ola.bini@gmail.com"]
+  s.homepage    = "http://jruby-extras.rubyforge.org/jruby-ldap"
+  s.summary     = "Port of Ruby/LDAP to JRuby"
+  s.description = "Port of Ruby/LDAP to JRuby"
+  s.rubyforge_project = "jruby-extras"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/jruby-ldap.rb

@@ -0,0 +1,7 @@
+require "jruby-ldap/version"
+
+module JRuby
+  module LDAP
+    # Your code goes here...
+  end
+end

data/lib/jruby-ldap/version.rb

@@ -0,0 +1,5 @@
+module JRuby
+  module LDAP
+    VERSION = "0.0.2"
+  end
+end

data/lib/ldap.rb

@@ -3,51 +3,51 @@ require 'java'
 module LDAP
   def self.err2string(err)
     case err||0
-    when -1: "Can't contact LDAP server"
-    when 0: "Success"
-    when 1: "Operations error"
-    when 2: "Protocol error"
-    when 3: "Time limit exceeded"
-    when 4: "Size limit exceeded"
-    when 5: "Compare False"
-    when 6: "Compare True"
-    when 7: "Authentication method not supported"
-    when 8: "Strong(er) authentication required"
-    when 9: "Partial results and referral received"
-    when 10: "Referral"
-    when 11: "Administrative limit exceeded"
-    when 12: "Critical extension is unavailable"
-    when 13: "Confidentiality required"
-    when 14: "SASL bind in progress"
-    when 15: "Unknown error"
-    when 16: "No such attribute"
-    when 17: "Undefined attribute type"
-    when 18: "Inappropriate matching"
-    when 19: "Constraint violation"
-    when 20: "Type or value exists"
-    when 21: "Invalid syntax"
-    when 32: "No such object"
-    when 33: "Alias problem"
-    when 34: "Invalid DN syntax"
-    when 35: "Entry is a leaf"
-    when 36: "Alias dereferencing problem"
-    when 47: "Proxy Authorization Failure"
-    when 48: "Inappropriate authentication"
-    when 49: "Invalid credentials"
-    when 50: "Insufficient access"
-    when 51: "Server is busy"
-    when 52: "Server is unavailable"
-    when 53: "Server is unwilling to perform"
-    when 54: "Loop detected"
-    when 64: "Naming violation"
-    when 65: "Object class violation"
-    when 66: "Operation not allowed on non-leaf"
-    when 67: "Operation not allowed on RDN"
-    when 68: "Already exists"
-    when 69: "Cannot modify object class"
-    when 70: "Results too large"
-    when 71: "Operation affects multiple DSAs"
-    when 80: "Internal (implementation specific) error"
+    when -1 then "Can't contact LDAP server"
+    when 0 then "Success"
+    when 1 then "Operations error"
+    when 2 then "Protocol error"
+    when 3 then "Time limit exceeded"
+    when 4 then "Size limit exceeded"
+    when 5 then "Compare False"
+    when 6 then "Compare True"
+    when 7 then "Authentication method not supported"
+    when 8 then "Strong(er) authentication required"
+    when 9 then "Partial results and referral received"
+    when 10 then "Referral"
+    when 11 then "Administrative limit exceeded"
+    when 12 then "Critical extension is unavailable"
+    when 13 then "Confidentiality required"
+    when 14 then "SASL bind in progress"
+    when 15 then "Unknown error"
+    when 16 then "No such attribute"
+    when 17 then "Undefined attribute type"
+    when 18 then "Inappropriate matching"
+    when 19 then "Constraint violation"
+    when 20 then "Type or value exists"
+    when 21 then "Invalid syntax"
+    when 32 then "No such object"
+    when 33 then "Alias problem"
+    when 34 then "Invalid DN syntax"
+    when 35 then "Entry is a leaf"
+    when 36 then "Alias dereferencing problem"
+    when 47 then "Proxy Authorization Failure"
+    when 48 then "Inappropriate authentication"
+    when 49 then "Invalid credentials"
+    when 50 then "Insufficient access"
+    when 51 then "Server is busy"
+    when 52 then "Server is unavailable"
+    when 53 then "Server is unwilling to perform"
+    when 54 then "Loop detected"
+    when 64 then "Naming violation"
+    when 65 then "Object class violation"
+    when 66 then "Operation not allowed on non-leaf"
+    when 67 then "Operation not allowed on RDN"
+    when 68 then "Already exists"
+    when 69 then "Cannot modify object class"
+    when 70 then "Results too large"
+    when 71 then "Operation affects multiple DSAs"
+    when 80 then "Internal (implementation specific) error"
     else "Unknown error"
     end
   end
@@ -70,7 +70,7 @@ module LDAP
   end
   
   def self.configuration(attrs = { })
-    @environment.update attrs
+    @environment.merge attrs
   end
 end
 

data/lib/ldap/conn.rb

@@ -1,9 +1,5 @@
 module LDAP  
   module ConnImplementation
-    def compare(*args)
-      raise "NOT IMPLEMENTED"
-    end
-
     def controls(*args)
       raise "NOT IMPLEMENTED"
     end
@@ -12,8 +8,35 @@ module LDAP
       raise "NOT IMPLEMENTED"
     end
     
-    def modrdn(*args)
-      raise "NOT IMPLEMENTED"
+    # Modify the RDN of the entry with DN, +dn+, giving it the new RDN,
+    # +new_rdn+. If +delete_old_rdn+ is *true*, the old RDN value will be deleted
+    # from the entry.
+    def modrdn(dn, new_rdn, delete_old_rdn)
+      begin 
+        if delete_old_rdn
+          @context.rename(dn, new_rdn)
+        else
+          obj = @context.lookup(dn)
+          @context.bind(new_rdn, obj)
+        end
+        @err = 0
+      rescue javax.naming.NameAlreadyBoundException => e
+        @err = 68
+      rescue javax.naming.InvalidNameException => e
+        @err = 34
+      rescue javax.naming.NoPermissionException => e
+        @err = 50
+      rescue javax.naming.directory.SchemaViolationException => e
+        @err = 65
+      rescue javax.naming.NamingException => e
+        @err = 21
+      rescue javax.naming.NoPermissionException => e
+        @err = 50
+      rescue javax.naming.NamingException => e
+        @err = -1
+      end
+      raise LDAP::ResultError.wrap(LDAP::err2string(@err), e) if @err != 0
+      self
     end
 
     def perror(*args)

data/lib/ldap/mod.rb

@@ -26,9 +26,9 @@ module LDAP
 
       def ruby_mod_to_java(mod_op)
         case (mod_op&~LDAP::LDAP_MOD_BVALUES)
-          when LDAP::LDAP_MOD_ADD: DirContext::ADD_ATTRIBUTE
-          when LDAP::LDAP_MOD_REPLACE: DirContext::REPLACE_ATTRIBUTE
-          when LDAP::LDAP_MOD_DELETE: DirContext::REMOVE_ATTRIBUTE
+          when LDAP::LDAP_MOD_ADD then DirContext::ADD_ATTRIBUTE
+          when LDAP::LDAP_MOD_REPLACE then DirContext::REPLACE_ATTRIBUTE
+          when LDAP::LDAP_MOD_DELETE then DirContext::REMOVE_ATTRIBUTE
           else raise LDAP::Error, "can't handle operation #{mod_op}"
         end
       end
@@ -59,7 +59,7 @@ module LDAP
     def to_java_attribute
       v = BasicAttribute.new(self.mod_type)
       binary = mod_op & LDAP::LDAP_MOD_BVALUES
-      if binary 
+      if binary != 0
         self.mod_vals.each do |val|
           v.add(val.to_java_bytes)
         end

data/test/setup.rb

@@ -1,4 +1,5 @@
-
+require 'rubygems'
+require 'bundler/setup'
 require 'ldap'
 require './username_and_password'
 

metadata

@@ -1,64 +1,83 @@
---- !ruby/object:Gem::Specification
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  requirements: 
-  - - '>'
-    - !ruby/object:Gem::Version
-      version: 0.0.0
-  version: 
-email: ola.bini@gmail.com
-cert_chain: 
-summary: Port of Ruby/LDAP to JRuby
-post_install_message: 
-homepage: http://jruby-extras.rubyforge.org/jruby-ldap
-extra_rdoc_files: []
-signing_key: 
+--- !ruby/object:Gem::Specification 
 name: jruby-ldap
-rdoc_options: 
-- --main
-- README.txt
-rubyforge_project: jruby-extras
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.0.2
+platform: ruby
+authors: 
+  - Ola Bini
 autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2012-03-12 00:00:00 Z
+dependencies: []
+
+description: Port of Ruby/LDAP to JRuby
+email: 
+  - ola.bini@gmail.com
 executables: []
-description: The author was too lazy to write a description
-default_executable: 
-files: 
-- lib/ldap.rb
-- lib/ldap/conn.rb
-- lib/ldap/constants.rb
-- lib/ldap/control.rb
-- lib/ldap/entry.rb
-- lib/ldap/error.rb
-- lib/ldap/ldif.rb
-- lib/ldap/mod.rb
-- lib/ldap/schema.rb
-- test/setup.rb
-- test/test_add.rb
-- test/test_connection.rb
-- test/test_delete.rb
-- test/test_search.rb
-- test/test_ssl.rb
-- test/username_and_password.rb
-- Rakefile
-- LICENSE
-- README
-specification_version: 1
+
 extensions: []
-rubygems_version: 0.9.4
-requirements: []
-authors: 
-- Ola Bini
-platform: ruby
-date: 2007-10-09 23:00:00 +00:00
+
+extra_rdoc_files: []
+
+files: 
+  - .gitignore
+  - Gemfile
+  - History.txt
+  - LICENSE
+  - README
+  - Rakefile
+  - jruby-ldap.gemspec
+  - lib/jruby-ldap.rb
+  - lib/jruby-ldap/version.rb
+  - lib/ldap.rb
+  - lib/ldap/conn.rb
+  - lib/ldap/constants.rb
+  - lib/ldap/control.rb
+  - lib/ldap/entry.rb
+  - lib/ldap/error.rb
+  - lib/ldap/ldif.rb
+  - lib/ldap/mod.rb
+  - lib/ldap/schema.rb
+  - test/setup.rb
+  - test/test_add.rb
+  - test/test_connection.rb
+  - test/test_delete.rb
+  - test/test_search.rb
+  - test/test_ssl.rb
+homepage: http://jruby-extras.rubyforge.org/jruby-ldap
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
-- lib
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+requirements: []
+
+rubyforge_project: jruby-extras
+rubygems_version: 1.8.15
+signing_key: 
+specification_version: 3
+summary: Port of Ruby/LDAP to JRuby
 test_files: 
-- test/test_add.rb
-- test/test_connection.rb
-- test/test_delete.rb
-- test/test_search.rb
-- test/test_ssl.rb
-bindir: bin
-dependencies: []
-has_rdoc: true
+  - test/setup.rb
+  - test/test_add.rb
+  - test/test_connection.rb
+  - test/test_delete.rb
+  - test/test_search.rb
+  - test/test_ssl.rb

data/test/username_and_password.rb

@@ -1,2 +0,0 @@
-$LDAP_test_username = 'cn=olabini'
-$LDAP_test_password = 'd3$tRuct1on'