activeldap 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (137) hide show
  1. data/CHANGES +10 -0
  2. data/README +3 -2
  3. data/data/locale/en/LC_MESSAGES/active-ldap.mo +0 -0
  4. data/data/locale/ja/LC_MESSAGES/active-ldap.mo +0 -0
  5. data/examples/al-admin/po/en/al-admin.po +1 -1
  6. data/examples/al-admin/po/ja/al-admin.po +1 -1
  7. data/examples/al-admin/po/nl/al-admin.po +1 -1
  8. data/examples/al-admin/vendor/plugins/exception_notification/lib/exception_notifier.rb +7 -8
  9. data/examples/al-admin/vendor/plugins/exception_notification/lib/exception_notifier_helper.rb +2 -1
  10. data/examples/al-admin/vendor/plugins/exception_notification/views/exception_notifier/_environment.rhtml +1 -1
  11. data/examples/al-admin/vendor/plugins/exception_notification/views/exception_notifier/_request.rhtml +2 -1
  12. data/lib/active_ldap.rb +9 -3
  13. data/lib/active_ldap/action_controller/ldap_benchmarking.rb +36 -0
  14. data/lib/active_ldap/adapter/jndi.rb +1 -1
  15. data/lib/active_ldap/adapter/jndi_connection.rb +2 -1
  16. data/lib/active_ldap/association/belongs_to_many.rb +10 -2
  17. data/lib/active_ldap/association/collection.rb +10 -0
  18. data/lib/active_ldap/association/has_many_utils.rb +13 -9
  19. data/lib/active_ldap/association/has_many_wrap.rb +10 -2
  20. data/lib/active_ldap/associations.rb +3 -3
  21. data/lib/active_ldap/base.rb +95 -32
  22. data/lib/active_ldap/connection.rb +1 -1
  23. data/lib/active_ldap/distinguished_name.rb +3 -0
  24. data/lib/active_ldap/entry_attribute.rb +2 -2
  25. data/lib/active_ldap/ldif.rb +2 -2
  26. data/lib/active_ldap/operations.rb +7 -3
  27. data/lib/active_ldap/user_password.rb +0 -1
  28. data/lib/active_ldap/validations.rb +2 -0
  29. data/po/en/active-ldap.po +1 -1
  30. data/po/ja/active-ldap.po +1 -1
  31. data/rails/plugin/active_ldap/init.rb +3 -34
  32. data/test-unit/History.txt +32 -0
  33. data/test-unit/Manifest.txt +70 -0
  34. data/test-unit/README.txt +32 -0
  35. data/test-unit/Rakefile +22 -0
  36. data/test-unit/bin/testrb +5 -0
  37. data/test-unit/lib/test/unit.rb +280 -0
  38. data/test-unit/lib/test/unit/assertionfailederror.rb +14 -0
  39. data/test-unit/lib/test/unit/assertions.rb +722 -0
  40. data/test-unit/lib/test/unit/attribute.rb +125 -0
  41. data/test-unit/lib/test/unit/autorunner.rb +250 -0
  42. data/test-unit/lib/test/unit/collector.rb +43 -0
  43. data/test-unit/lib/test/unit/collector/descendant.rb +23 -0
  44. data/test-unit/lib/test/unit/collector/dir.rb +108 -0
  45. data/test-unit/lib/test/unit/collector/load.rb +135 -0
  46. data/test-unit/lib/test/unit/collector/objectspace.rb +34 -0
  47. data/test-unit/lib/test/unit/color.rb +61 -0
  48. data/test-unit/lib/test/unit/diff.rb +524 -0
  49. data/test-unit/lib/test/unit/error.rb +124 -0
  50. data/test-unit/lib/test/unit/exceptionhandler.rb +39 -0
  51. data/test-unit/lib/test/unit/failure.rb +110 -0
  52. data/test-unit/lib/test/unit/fixture.rb +185 -0
  53. data/test-unit/lib/test/unit/notification.rb +116 -0
  54. data/test-unit/lib/test/unit/omission.rb +129 -0
  55. data/test-unit/lib/test/unit/pending.rb +130 -0
  56. data/test-unit/lib/test/unit/priority.rb +146 -0
  57. data/test-unit/lib/test/unit/runner/console.rb +46 -0
  58. data/test-unit/lib/test/unit/runner/emacs.rb +8 -0
  59. data/test-unit/lib/test/unit/testcase.rb +174 -0
  60. data/test-unit/lib/test/unit/testresult.rb +89 -0
  61. data/test-unit/lib/test/unit/testsuite.rb +110 -0
  62. data/test-unit/lib/test/unit/ui/console/outputlevel.rb +14 -0
  63. data/test-unit/lib/test/unit/ui/console/testrunner.rb +195 -0
  64. data/test-unit/lib/test/unit/ui/emacs/testrunner.rb +49 -0
  65. data/test-unit/lib/test/unit/ui/testrunner.rb +20 -0
  66. data/test-unit/lib/test/unit/ui/testrunnermediator.rb +77 -0
  67. data/test-unit/lib/test/unit/ui/testrunnerutilities.rb +41 -0
  68. data/test-unit/lib/test/unit/util/backtracefilter.rb +41 -0
  69. data/test-unit/lib/test/unit/util/observable.rb +90 -0
  70. data/test-unit/lib/test/unit/util/procwrapper.rb +48 -0
  71. data/test-unit/lib/test/unit/version.rb +7 -0
  72. data/test-unit/sample/adder.rb +13 -0
  73. data/test-unit/sample/subtracter.rb +12 -0
  74. data/test-unit/sample/tc_adder.rb +18 -0
  75. data/test-unit/sample/tc_subtracter.rb +18 -0
  76. data/test-unit/sample/ts_examples.rb +7 -0
  77. data/test-unit/test/collector/test_descendant.rb +135 -0
  78. data/test-unit/test/collector/test_dir.rb +406 -0
  79. data/test-unit/test/collector/test_load.rb +333 -0
  80. data/test-unit/test/collector/test_objectspace.rb +98 -0
  81. data/test-unit/test/run-test.rb +13 -0
  82. data/test-unit/test/test_assertions.rb +693 -0
  83. data/test-unit/test/test_attribute.rb +86 -0
  84. data/{test-unit-ext → test-unit}/test/test_color.rb +3 -5
  85. data/{test-unit-ext → test-unit}/test/test_diff.rb +18 -16
  86. data/test-unit/test/test_emacs_runner.rb +60 -0
  87. data/test-unit/test/test_error.rb +26 -0
  88. data/test-unit/test/test_failure.rb +33 -0
  89. data/test-unit/test/test_fixture.rb +275 -0
  90. data/{test-unit-ext → test-unit}/test/test_notification.rb +7 -6
  91. data/test-unit/test/test_omission.rb +81 -0
  92. data/{test-unit-ext → test-unit}/test/test_pending.rb +15 -15
  93. data/{test-unit-ext → test-unit}/test/test_priority.rb +4 -3
  94. data/test-unit/test/test_testcase.rb +411 -0
  95. data/test-unit/test/test_testresult.rb +113 -0
  96. data/test-unit/test/test_testsuite.rb +129 -0
  97. data/test-unit/test/testunit_test_util.rb +12 -0
  98. data/test-unit/test/ui/test_testrunmediator.rb +20 -0
  99. data/test-unit/test/util/test_backtracefilter.rb +41 -0
  100. data/test-unit/test/util/test_observable.rb +102 -0
  101. data/test-unit/test/util/test_procwrapper.rb +36 -0
  102. data/test/al-test-utils.rb +4 -4
  103. data/test/command.rb +1 -1
  104. data/test/run-test.rb +5 -4
  105. data/test/test_associations.rb +143 -9
  106. data/test/test_base.rb +25 -1
  107. data/test/test_dn.rb +2 -0
  108. data/test/test_find.rb +8 -1
  109. data/test/test_ldif.rb +51 -114
  110. data/test/test_reflection.rb +4 -8
  111. data/test/test_usermod-lang-add.rb +2 -1
  112. data/test/test_validation.rb +4 -3
  113. metadata +76 -31
  114. data/test-unit-ext/NEWS.en +0 -28
  115. data/test-unit-ext/NEWS.ja +0 -28
  116. data/test-unit-ext/README.en +0 -247
  117. data/test-unit-ext/README.ja +0 -246
  118. data/test-unit-ext/Rakefile +0 -111
  119. data/test-unit-ext/lib/test-unit-ext.rb +0 -16
  120. data/test-unit-ext/lib/test-unit-ext/always-show-result.rb +0 -28
  121. data/test-unit-ext/lib/test-unit-ext/assertions.rb +0 -40
  122. data/test-unit-ext/lib/test-unit-ext/attributes.rb +0 -129
  123. data/test-unit-ext/lib/test-unit-ext/backtrace-filter.rb +0 -17
  124. data/test-unit-ext/lib/test-unit-ext/color.rb +0 -59
  125. data/test-unit-ext/lib/test-unit-ext/colorized-runner.rb +0 -111
  126. data/test-unit-ext/lib/test-unit-ext/diff.rb +0 -516
  127. data/test-unit-ext/lib/test-unit-ext/long-display-for-emacs.rb +0 -25
  128. data/test-unit-ext/lib/test-unit-ext/notification.rb +0 -79
  129. data/test-unit-ext/lib/test-unit-ext/omission.rb +0 -96
  130. data/test-unit-ext/lib/test-unit-ext/pending.rb +0 -97
  131. data/test-unit-ext/lib/test-unit-ext/priority.rb +0 -158
  132. data/test-unit-ext/lib/test-unit-ext/version.rb +0 -3
  133. data/test-unit-ext/lib/test-unit-ext/xml-report.rb +0 -224
  134. data/test-unit-ext/test/run-test.rb +0 -14
  135. data/test-unit-ext/test/test_attributes.rb +0 -139
  136. data/test-unit-ext/test/test_omission.rb +0 -64
  137. data/test-unit-ext/test/test_xml_report.rb +0 -161
@@ -0,0 +1,49 @@
1
+ require 'test/unit/ui/console/testrunner'
2
+
3
+ module Test
4
+ module Unit
5
+ module UI
6
+ module Emacs
7
+ class TestRunner < Console::TestRunner
8
+ private
9
+ def output_setup_end
10
+ end
11
+
12
+ def output_started
13
+ end
14
+
15
+ def format_fault(fault)
16
+ return super unless fault.respond_to?(:label)
17
+ format_method_name = "format_fault_#{fault.label.downcase}"
18
+ if respond_to?(format_method_name, true)
19
+ send(format_method_name, fault)
20
+ else
21
+ super
22
+ end
23
+ end
24
+
25
+ def format_fault_failure(failure)
26
+ if failure.location.size == 1
27
+ location = failure.location[0]
28
+ location_display = location.sub(/\A(.+:\d+).*/, ' [\\1]')
29
+ else
30
+ location_display = "\n" + failure.location.join("\n")
31
+ end
32
+ result = "#{failure.label}:\n"
33
+ result << "#{failure.test_name}#{location_display}:\n"
34
+ result << failure.message
35
+ result
36
+ end
37
+
38
+ def format_fault_error(error)
39
+ result = "#{error.label}:\n"
40
+ result << "#{error.test_name}:\n"
41
+ result << "#{error.message}\n"
42
+ result << error.backtrace.join("\n")
43
+ result
44
+ end
45
+ end
46
+ end
47
+ end
48
+ end
49
+ end
@@ -0,0 +1,20 @@
1
+ require 'test/unit/ui/testrunnerutilities'
2
+
3
+ module Test
4
+ module Unit
5
+ module UI
6
+ class TestRunner
7
+ extend TestRunnerUtilities
8
+
9
+ def initialize(suite, options={})
10
+ if suite.respond_to?(:suite)
11
+ @suite = suite.suite
12
+ else
13
+ @suite = suite
14
+ end
15
+ @options = options
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
@@ -0,0 +1,77 @@
1
+ #--
2
+ #
3
+ # Author:: Nathaniel Talbott.
4
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
5
+ # License:: Ruby license.
6
+
7
+ require 'test/unit'
8
+ require 'test/unit/util/observable'
9
+ require 'test/unit/testresult'
10
+
11
+ module Test
12
+ module Unit
13
+ module UI
14
+
15
+ # Provides an interface to write any given UI against,
16
+ # hopefully making it easy to write new UIs.
17
+ class TestRunnerMediator
18
+ RESET = name + "::RESET"
19
+ STARTED = name + "::STARTED"
20
+ FINISHED = name + "::FINISHED"
21
+
22
+ include Util::Observable
23
+
24
+ # Creates a new TestRunnerMediator initialized to run
25
+ # the passed suite.
26
+ def initialize(suite)
27
+ @suite = suite
28
+ end
29
+
30
+ # Runs the suite the TestRunnerMediator was created
31
+ # with.
32
+ def run_suite
33
+ Unit.run = true
34
+
35
+ result = create_result
36
+ result_listener = result.add_listener(TestResult::CHANGED) do |*args|
37
+ notify_listeners(TestResult::CHANGED, *args)
38
+ end
39
+ fault_listener = result.add_listener(TestResult::FAULT) do |*args|
40
+ notify_listeners(TestResult::FAULT, *args)
41
+ end
42
+
43
+ start_time = Time.now
44
+ begin
45
+ notify_listeners(RESET, @suite.size)
46
+ notify_listeners(STARTED, result)
47
+
48
+ @suite.run(result) do |channel, value|
49
+ notify_listeners(channel, value)
50
+ end
51
+ ensure
52
+ elapsed_time = Time.now - start_time
53
+ result.remove_listener(TestResult::FAULT, fault_listener)
54
+ result.remove_listener(TestResult::CHANGED, result_listener)
55
+ notify_listeners(FINISHED, elapsed_time)
56
+ end
57
+
58
+ result
59
+ end
60
+
61
+ private
62
+ # A factory method to create the result the mediator
63
+ # should run with. Can be overridden by subclasses if
64
+ # one wants to use a different result.
65
+ def create_result
66
+ TestResult.new
67
+ end
68
+
69
+ def measure_time
70
+ begin_time = Time.now
71
+ yield
72
+ Time.now - begin_time
73
+ end
74
+ end
75
+ end
76
+ end
77
+ end
@@ -0,0 +1,41 @@
1
+ #--
2
+ #
3
+ # Author:: Nathaniel Talbott.
4
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
5
+ # License:: Ruby license.
6
+
7
+ module Test
8
+ module Unit
9
+ module UI
10
+
11
+ # Provides some utilities common to most, if not all,
12
+ # TestRunners.
13
+ #
14
+ #--
15
+ #
16
+ # Perhaps there ought to be a TestRunner superclass? There
17
+ # seems to be a decent amount of shared code between test
18
+ # runners.
19
+
20
+ module TestRunnerUtilities
21
+
22
+ # Creates a new TestRunner and runs the suite.
23
+ def run(suite, options={})
24
+ return new(suite, options).start
25
+ end
26
+
27
+ # Takes care of the ARGV parsing and suite
28
+ # determination necessary for running one of the
29
+ # TestRunners from the command line.
30
+ def start_command_line_test
31
+ if ARGV.empty?
32
+ puts "You should supply the name of a test suite file to the runner"
33
+ exit
34
+ end
35
+ require ARGV[0].gsub(/.+::/, '')
36
+ new(eval(ARGV[0])).start
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end
@@ -0,0 +1,41 @@
1
+ module Test
2
+ module Unit
3
+ module Util
4
+ module BacktraceFilter
5
+ TESTUNIT_FILE_SEPARATORS = %r{[\\/:]}
6
+ TESTUNIT_PREFIX = __FILE__.split(TESTUNIT_FILE_SEPARATORS)[0..-3]
7
+ TESTUNIT_RB_FILE = /\.rb\Z/
8
+
9
+ module_function
10
+ def filter_backtrace(backtrace, prefix=nil)
11
+ return ["No backtrace"] unless(backtrace)
12
+ split_p = if(prefix)
13
+ prefix.split(TESTUNIT_FILE_SEPARATORS)
14
+ else
15
+ TESTUNIT_PREFIX
16
+ end
17
+ match = proc do |e|
18
+ split_e = e.split(TESTUNIT_FILE_SEPARATORS)[0, split_p.size]
19
+ next false unless(split_e[0..-2] == split_p[0..-2])
20
+ split_e[-1].sub(TESTUNIT_RB_FILE, '') == split_p[-1]
21
+ end
22
+ return backtrace unless(backtrace.detect(&match))
23
+ found_prefix = false
24
+ new_backtrace = backtrace.reverse.reject do |e|
25
+ if(match[e])
26
+ found_prefix = true
27
+ true
28
+ elsif(found_prefix)
29
+ false
30
+ else
31
+ true
32
+ end
33
+ end.reverse
34
+ new_backtrace = (new_backtrace.empty? ? backtrace : new_backtrace)
35
+ new_backtrace = new_backtrace.reject(&match)
36
+ new_backtrace.empty? ? backtrace : new_backtrace
37
+ end
38
+ end
39
+ end
40
+ end
41
+ end
@@ -0,0 +1,90 @@
1
+ #--
2
+ #
3
+ # Author:: Nathaniel Talbott.
4
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
5
+ # License:: Ruby license.
6
+
7
+ require 'test/unit/util/procwrapper'
8
+
9
+ module Test
10
+ module Unit
11
+ module Util
12
+
13
+ # This is a utility class that allows anything mixing
14
+ # it in to notify a set of listeners about interesting
15
+ # events.
16
+ module Observable
17
+ # We use this for defaults since nil might mean something
18
+ NOTHING = "NOTHING/#{__id__}"
19
+
20
+ # Adds the passed proc as a listener on the
21
+ # channel indicated by channel_name. listener_key
22
+ # is used to remove the listener later; if none is
23
+ # specified, the proc itself is used.
24
+ #
25
+ # Whatever is used as the listener_key is
26
+ # returned, making it very easy to use the proc
27
+ # itself as the listener_key:
28
+ #
29
+ # listener = add_listener("Channel") { ... }
30
+ # remove_listener("Channel", listener)
31
+ def add_listener(channel_name, listener_key=NOTHING, &listener) # :yields: value
32
+ unless(block_given?)
33
+ raise ArgumentError.new("No callback was passed as a listener")
34
+ end
35
+
36
+ key = listener_key
37
+ if (listener_key == NOTHING)
38
+ listener_key = listener
39
+ key = ProcWrapper.new(listener)
40
+ end
41
+
42
+ channels[channel_name] ||= {}
43
+ channels[channel_name][key] = listener
44
+ return listener_key
45
+ end
46
+
47
+ # Removes the listener indicated by listener_key
48
+ # from the channel indicated by
49
+ # channel_name. Returns the registered proc, or
50
+ # nil if none was found.
51
+ def remove_listener(channel_name, listener_key)
52
+ channel = channels[channel_name]
53
+ return nil unless (channel)
54
+ key = listener_key
55
+ if (listener_key.instance_of?(Proc))
56
+ key = ProcWrapper.new(listener_key)
57
+ end
58
+ if (channel.has_key?(key))
59
+ return channel.delete(key)
60
+ end
61
+ return nil
62
+ end
63
+
64
+ # Calls all the procs registered on the channel
65
+ # indicated by channel_name. If value is
66
+ # specified, it is passed in to the procs,
67
+ # otherwise they are called with no arguments.
68
+ #
69
+ #--
70
+ #
71
+ # Perhaps this should be private? Would it ever
72
+ # make sense for an external class to call this
73
+ # method directly?
74
+ def notify_listeners(channel_name, *arguments)
75
+ channel = channels[channel_name]
76
+ return 0 unless (channel)
77
+ listeners = channel.values
78
+ listeners.each { |listener| listener.call(*arguments) }
79
+ return listeners.size
80
+ end
81
+
82
+ private
83
+ def channels
84
+ @channels ||= {}
85
+ return @channels
86
+ end
87
+ end
88
+ end
89
+ end
90
+ end
@@ -0,0 +1,48 @@
1
+ #--
2
+ #
3
+ # Author:: Nathaniel Talbott.
4
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
5
+ # License:: Ruby license.
6
+
7
+ module Test
8
+ module Unit
9
+ module Util
10
+
11
+ # Allows the storage of a Proc passed through '&' in a
12
+ # hash.
13
+ #
14
+ # Note: this may be inefficient, since the hash being
15
+ # used is not necessarily very good. In Observable,
16
+ # efficiency is not too important, since the hash is
17
+ # only accessed when adding and removing listeners,
18
+ # not when notifying.
19
+
20
+ class ProcWrapper
21
+
22
+ # Creates a new wrapper for a_proc.
23
+ def initialize(a_proc)
24
+ @a_proc = a_proc
25
+ @hash = a_proc.inspect.sub(/^(#<#{a_proc.class}:)/){''}.sub(/(>)$/){''}.hex
26
+ end
27
+
28
+ def hash
29
+ return @hash
30
+ end
31
+
32
+ def ==(other)
33
+ case(other)
34
+ when ProcWrapper
35
+ return @a_proc == other.to_proc
36
+ else
37
+ return super
38
+ end
39
+ end
40
+ alias :eql? :==
41
+
42
+ def to_proc
43
+ return @a_proc
44
+ end
45
+ end
46
+ end
47
+ end
48
+ end
@@ -0,0 +1,7 @@
1
+
2
+ # HACK: quick and dirty to get integrated into the new project - ryan
3
+ module Test
4
+ module Unit
5
+ VERSION = '2.0.0'
6
+ end
7
+ end
@@ -0,0 +1,13 @@
1
+ # Author:: Nathaniel Talbott.
2
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
3
+ # License:: Ruby license.
4
+
5
+ class Adder
6
+ def initialize(number)
7
+ @number = number
8
+ end
9
+ def add(number)
10
+ return @number + number
11
+ end
12
+ end
13
+
@@ -0,0 +1,12 @@
1
+ # Author:: Nathaniel Talbott.
2
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
3
+ # License:: Ruby license.
4
+
5
+ class Subtracter
6
+ def initialize(number)
7
+ @number = number
8
+ end
9
+ def subtract(number)
10
+ return @number - number
11
+ end
12
+ end
@@ -0,0 +1,18 @@
1
+ # Author:: Nathaniel Talbott.
2
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
3
+ # License:: Ruby license.
4
+
5
+ require 'test/unit'
6
+ require 'adder'
7
+
8
+ class TC_Adder < Test::Unit::TestCase
9
+ def setup
10
+ @adder = Adder.new(5)
11
+ end
12
+ def test_add
13
+ assert_equal(7, @adder.add(2), "Should have added correctly")
14
+ end
15
+ def teardown
16
+ @adder = nil
17
+ end
18
+ end
@@ -0,0 +1,18 @@
1
+ # Author:: Nathaniel Talbott.
2
+ # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
3
+ # License:: Ruby license.
4
+
5
+ require 'test/unit'
6
+ require 'subtracter'
7
+
8
+ class TC_Subtracter < Test::Unit::TestCase
9
+ def setup
10
+ @subtracter = Subtracter.new(5)
11
+ end
12
+ def test_subtract
13
+ assert_equal(3, @subtracter.subtract(2), "Should have subtracted correctly")
14
+ end
15
+ def teardown
16
+ @subtracter = nil
17
+ end
18
+ end