activeldap 1.0.0 → 1.0.1

data/lib/active_ldap/connection.rb

@@ -191,7 +191,7 @@ module ActiveLdap
       end
 
       def guess_available_adapter
-        defined?(java) ? "jndi" : "ldap"
+        Object.respond_to?(:java) ? "jndi" : "ldap"
       end
     end
 

data/lib/active_ldap/distinguished_name.rb

@@ -11,6 +11,9 @@ module ActiveLdap
       def initialize(source)
         @dn = nil
         source = source.to_s if source.is_a?(DN)
+        unless source.is_a?(String)
+          raise DistinguishedNameInputInvalid.new(source)
+        end
         @source = source
       end
 

data/lib/active_ldap/entry_attribute.rb

@@ -45,7 +45,7 @@ module ActiveLdap
       return nil if @names.empty? and @aliases.empty?
       name = name.to_s
       real_name = @names[name]
-      real_name ||= @aliases[Inflector.underscore(name)]
+      real_name ||= @aliases[name.underscore]
       if real_name
         real_name
       elsif allow_normalized_name
@@ -70,7 +70,7 @@ module ActiveLdap
       @schemata[real_name] = attribute
       ([real_name] + attribute.aliases).each do |name|
         @names[name] = real_name
-        @aliases[Inflector.underscore(name)] = real_name
+        @aliases[name.underscore] = real_name
         @normalized_names[normalize_attribute_name(name)] = real_name
       end
     end

data/lib/active_ldap/ldif.rb

@@ -1,5 +1,4 @@
 require "strscan"
-require "base64"
 require "uri"
 require "open-uri"
 
@@ -117,7 +116,7 @@ module ActiveLdap
       def read_base64_value
         value = @scanner.scan(/[a-zA-Z0-9\+\/=]+/u)
         return nil if value.nil?
-        Base64.decode64(value).chomp
+        value.unpack("m")[0].chomp
       end
 
       def read_external_file
@@ -480,6 +479,7 @@ module ActiveLdap
       def initialize(source)
         @source = source
         @scanner = StringScanner.new(@source)
+        @sub_scanner = nil
         @sub_scanner = next_segment || StringScanner.new("")
       end
 

data/lib/active_ldap/operations.rb

@@ -161,13 +161,14 @@ module ActiveLdap
 
       def split_search_value(value)
         attr = prefix = nil
-        return [attr, value, prefix] unless value.is_a?(String)
 
         begin
           dn = DN.parse(value)
           attr, value = dn.rdns.first.to_a.first
           rest = dn.rdns[1..-1]
           prefix = DN.new(*rest).to_s unless rest.empty?
+        rescue DistinguishedNameInputInvalid
+          return [attr, value, prefix]
         rescue DistinguishedNameInvalid
           begin
             dn = DN.parse("DUMMY=#{value}")
@@ -332,9 +333,12 @@ module ActiveLdap
         ldif.to_s
       end
 
+      def to_ldif_record(dn, attributes)
+        Ldif::Record.new(dn, attributes)
+      end
+
       def to_ldif(dn, attributes)
-        record = Ldif::Record.new(dn, attributes)
-        Ldif.new([record]).to_s
+        Ldif.new([to_ldif_record(dn, attributes)]).to_s
       end
 
       def load(ldif, options={})

data/lib/active_ldap/user_password.rb

@@ -1,5 +1,4 @@
 require 'English'
-require 'base64'
 require 'md5'
 require 'sha1'
 

data/lib/active_ldap/validations.rb

@@ -13,6 +13,8 @@ module ActiveLdap
         end
         include ActiveRecord::Validations
         class << self
+          alias_method :human_attribute_name_active_record,
+                       :human_attribute_name
           alias_method :human_attribute_name,
                        :human_attribute_name_active_ldap
           unless method_defined?(:human_attribute_name_with_gettext)

data/po/en/active-ldap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveLdap 1.0.0\n"
+"Project-Id-Version: Ruby/ActiveLdap 1.0.1\n"
 "POT-Creation-Date: 2008-02-10 22:36+0900\n"
 "PO-Revision-Date: 2007-08-19 09:49+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"

data/po/ja/active-ldap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveLdap 1.0.0\n"
+"Project-Id-Version: Ruby/ActiveLdap 1.0.1\n"
 "POT-Creation-Date: 2008-02-10 22:36+0900\n"
 "PO-Revision-Date: 2008-02-10 22:37+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"

data/rails/plugin/active_ldap/init.rb

@@ -1,7 +1,7 @@
 require_library_or_gem 'active_ldap'
 ActiveLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 
-required_version = ["0", "10", "0"]
+required_version = ["1", "0", "0"]
 if (ActiveLdap::VERSION.split(".") <=> required_version) < 0
   ActiveLdap::Base.class_eval do
     format = _("You need ActiveLdap %s or later")
@@ -25,40 +25,9 @@ class ::ActionView::Base
   include ActiveLdap::Helper
 end
 
+require 'active_ldap/action_controller/ldap_benchmarking'
 module ::ActionController
-  module LdapBenchmarking
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :render, :active_ldap_benchmark
-        alias_method_chain :rendering_runtime, :active_ldap
-      end
-    end
-
-    protected
-    def render_with_active_ldap_benchmark(*args, &block)
-      if logger
-        @ldap_runtime_before_render = ActiveLdap::Base.reset_runtime
-        result = render_without_active_ldap_benchmark(*args, &block)
-        @ldap_runtime_after_render = ActiveLdap::Base.reset_runtime
-        @rendering_runtime -= @ldap_runtime_after_render
-        result
-      else
-        render_without_active_ldap_benchmark(*args, &block)
-      end
-    end
-
-    private
-    def rendering_runtime_with_active_ldap(runtime)
-      result = rendering_runtime_without_active_ldap(runtime)
-      ldap_runtime = ActiveLdap::Base.reset_runtime
-      ldap_runtime += @ldap_runtime_before_render || 0
-      ldap_runtime += @ldap_runtime_after_render || 0
-      ldap_percentage = ldap_runtime * 100 / runtime
-      result + (" | LDAP: %.5f (%d%%)" % [ldap_runtime, ldap_percentage])
-    end
-  end
-
   class Base
-    include LdapBenchmarking
+    include ActiveLdap::ActionController::LdapBenchmarking
   end
 end

data/test-unit/History.txt

@@ -0,0 +1,32 @@
+=== 2.0.0 / 2008-06-15
+
+* 15 major enhancements
+
+  * support startup/shutdown. (test case level setup/teardown)
+  * support multiple setup/teardown.
+  * support pending.
+  * support omission.
+  * support notification.
+  * support colorize.
+  * support diff.
+  * support test attribute.
+  * add assert_boolean.
+  * add assert_true.
+  * add assert_false.
+  * add --priority-mode option.
+  * don't use ObjectSpace to collect test cases.
+  * make more customizable. (additional options, exception handling and so on)
+  * improve Emacs integration.
+
+* 4 major changes
+
+  * remove GTK+1 support.
+  * split GTK+ runner as another gem.
+  * split FOX runner as another gem.
+  * split Tk runner as another gem.
+
+=== 1.2.3 / 2008-02-25
+
+* 1 major enhancement
+
+  * Birthday (as a gem)!

data/test-unit/Manifest.txt

@@ -0,0 +1,70 @@
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/testrb
+lib/test/unit.rb
+lib/test/unit/assertionfailederror.rb
+lib/test/unit/assertions.rb
+lib/test/unit/attribute.rb
+lib/test/unit/autorunner.rb
+lib/test/unit/collector.rb
+lib/test/unit/collector/descendant.rb
+lib/test/unit/collector/dir.rb
+lib/test/unit/collector/load.rb
+lib/test/unit/collector/objectspace.rb
+lib/test/unit/color.rb
+lib/test/unit/diff.rb
+lib/test/unit/error.rb
+lib/test/unit/exceptionhandler.rb
+lib/test/unit/failure.rb
+lib/test/unit/fixture.rb
+lib/test/unit/notification.rb
+lib/test/unit/omission.rb
+lib/test/unit/pending.rb
+lib/test/unit/priority.rb
+lib/test/unit/runner/console.rb
+lib/test/unit/runner/emacs.rb
+lib/test/unit/testcase.rb
+lib/test/unit/testresult.rb
+lib/test/unit/testsuite.rb
+lib/test/unit/ui/console/outputlevel.rb
+lib/test/unit/ui/console/testrunner.rb
+lib/test/unit/ui/emacs/testrunner.rb
+lib/test/unit/ui/testrunner.rb
+lib/test/unit/ui/testrunnermediator.rb
+lib/test/unit/ui/testrunnerutilities.rb
+lib/test/unit/util/backtracefilter.rb
+lib/test/unit/util/observable.rb
+lib/test/unit/util/procwrapper.rb
+lib/test/unit/version.rb
+sample/adder.rb
+sample/subtracter.rb
+sample/tc_adder.rb
+sample/tc_subtracter.rb
+sample/ts_examples.rb
+test/collector/test_descendant.rb
+test/collector/test_dir.rb
+test/collector/test_load.rb
+test/collector/test_objectspace.rb
+test/run-test.rb
+test/test_assertions.rb
+test/test_attribute.rb
+test/test_color.rb
+test/test_diff.rb
+test/test_emacs_runner.rb
+test/test_error.rb
+test/test_failure.rb
+test/test_fixture.rb
+test/test_notification.rb
+test/test_omission.rb
+test/test_pending.rb
+test/test_priority.rb
+test/test_testcase.rb
+test/test_testresult.rb
+test/test_testsuite.rb
+test/testunit_test_util.rb
+test/ui/test_testrunmediator.rb
+test/util/test_backtracefilter.rb
+test/util/test_observable.rb
+test/util/test_procwrapper.rb

data/test-unit/README.txt

@@ -0,0 +1,32 @@
+= Test::Unit (Classic)
+
+* http://rubyforge.org/projects/test-unit/
+
+== DESCRIPTION:
+
+Test::Unit (Classic) - Nathaniel Talbott's originial test-unit,
+externalized from the ruby project as a gem (for tool developers).
+
+== FEATURES/PROBLEMS:
+
+* Test::Unit 1.2.3 is the original Test::Unit, taken
+  straight from the ruby distribution. It is being
+  distributed as a gem to allow tool builders to use it as a
+  stand-alone package. (The test framework in ruby is going
+  to radically change very soon).
+
+* DO NOT INSTALL THIS GEM unless you're active state or some other
+  development tool provider! You don't need it.
+
+* Test::Unit 2.0.0 or later are extended versions of the
+  original Test::Unit (== Tset::Unit 1.2.3).
+
+== INSTALL:
+
+* sudo gem install test-unit
+
+== LICENSE:
+
+(The Ruby License)
+
+This software is distributed under the same terms as ruby.

data/test-unit/Rakefile

@@ -0,0 +1,22 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+require './lib/test/unit/version.rb'
+
+Hoe.new('test-unit', Test::Unit::VERSION) do |p|
+  p.developer('Kouhei Sutou', 'kou@cozmixng.org')
+  p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+
+  # Ex-Parrot:
+  # p.developer('Nathaniel Talbott', 'nathaniel@talbott.ws')
+end
+
+task :check_manifest => :clean_test_result
+
+task :clean_test_result do
+  test_results = Dir.glob("**/.test-result")
+  sh("rm", "-rf", *test_results) unless test_results.empty?
+end
+
+# vim: syntax=Ruby

data/test-unit/bin/testrb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+  abort r.options.banner + " tests..."
+exit r.run

data/test-unit/lib/test/unit.rb

@@ -0,0 +1,280 @@
+require 'test/unit/testcase'
+require 'test/unit/autorunner'
+
+module Test # :nodoc:
+  #
+  # = Test::Unit - Ruby Unit Testing Framework
+  # 
+  # == Introduction
+  # 
+  # Unit testing is making waves all over the place, largely due to the
+  # fact that it is a core practice of XP. While XP is great, unit testing
+  # has been around for a long time and has always been a good idea. One
+  # of the keys to good unit testing, though, is not just writing tests,
+  # but having tests. What's the difference? Well, if you just _write_ a
+  # test and throw it away, you have no guarantee that something won't
+  # change later which breaks your code. If, on the other hand, you _have_
+  # tests (obviously you have to write them first), and run them as often
+  # as possible, you slowly build up a wall of things that cannot break
+  # without you immediately knowing about it. This is when unit testing
+  # hits its peak usefulness.
+  # 
+  # Enter Test::Unit, a framework for unit testing in Ruby, helping you to
+  # design, debug and evaluate your code by making it easy to write and
+  # have tests for it.
+  # 
+  # 
+  # == Notes
+  # 
+  # Test::Unit has grown out of and superceded Lapidary.
+  # 
+  # 
+  # == Feedback
+  # 
+  # I like (and do my best to practice) XP, so I value early releases,
+  # user feedback, and clean, simple, expressive code. There is always
+  # room for improvement in everything I do, and Test::Unit is no
+  # exception. Please, let me know what you think of Test::Unit as it
+  # stands, and what you'd like to see expanded/changed/improved/etc. If
+  # you find a bug, let me know ASAP; one good way to let me know what the
+  # bug is is to submit a new test that catches it :-) Also, I'd love to
+  # hear about any successes you have with Test::Unit, and any
+  # documentation you might add will be greatly appreciated. My contact
+  # info is below.
+  # 
+  # 
+  # == Contact Information
+  # 
+  # A lot of discussion happens about Ruby in general on the ruby-talk
+  # mailing list (http://www.ruby-lang.org/en/ml.html), and you can ask
+  # any questions you might have there. I monitor the list, as do many
+  # other helpful Rubyists, and you're sure to get a quick answer. Of
+  # course, you're also welcome to email me (Nathaniel Talbott) directly
+  # at mailto:testunit@talbott.ws, and I'll do my best to help you out.
+  # 
+  # 
+  # == Credits
+  # 
+  # I'd like to thank...
+  # 
+  # Matz, for a great language!
+  # 
+  # Masaki Suketa, for his work on RubyUnit, which filled a vital need in
+  # the Ruby world for a very long time. I'm also grateful for his help in
+  # polishing Test::Unit and getting the RubyUnit compatibility layer
+  # right. His graciousness in allowing Test::Unit to supercede RubyUnit
+  # continues to be a challenge to me to be more willing to defer my own
+  # rights.
+  # 
+  # Ken McKinlay, for his interest and work on unit testing, and for his
+  # willingness to dialog about it. He was also a great help in pointing
+  # out some of the holes in the RubyUnit compatibility layer.
+  # 
+  # Dave Thomas, for the original idea that led to the extremely simple
+  # "require 'test/unit'", plus his code to improve it even more by
+  # allowing the selection of tests from the command-line. Also, without
+  # RDoc, the documentation for Test::Unit would stink a lot more than it
+  # does now.
+  # 
+  # Everyone who's helped out with bug reports, feature ideas,
+  # encouragement to continue, etc. It's a real privilege to be a part of
+  # the Ruby community.
+  # 
+  # The guys at RoleModel Software, for putting up with me repeating, "But
+  # this would be so much easier in Ruby!" whenever we're coding in Java.
+  # 
+  # My Creator, for giving me life, and giving it more abundantly.
+  # 
+  # 
+  # == License
+  # 
+  # Test::Unit is copyright (c) 2000-2003 Nathaniel Talbott. It is free
+  # software, and is distributed under the Ruby license. See the COPYING
+  # file in the standard Ruby distribution for details.
+  # 
+  # 
+  # == Warranty
+  # 
+  # This software is provided "as is" and without any express or
+  # implied warranties, including, without limitation, the implied
+  # warranties of merchantibility and fitness for a particular
+  # purpose.
+  # 
+  # 
+  # == Author
+  # 
+  # Nathaniel Talbott.
+  # Copyright (c) 2000-2003, Nathaniel Talbott
+  #
+  # ----
+  #
+  # = Usage
+  #
+  # The general idea behind unit testing is that you write a _test_
+  # _method_ that makes certain _assertions_ about your code, working
+  # against a _test_ _fixture_. A bunch of these _test_ _methods_ are
+  # bundled up into a _test_ _suite_ and can be run any time the
+  # developer wants. The results of a run are gathered in a _test_
+  # _result_ and displayed to the user through some UI. So, lets break
+  # this down and see how Test::Unit provides each of these necessary
+  # pieces.
+  #
+  #
+  # == Assertions
+  #
+  # These are the heart of the framework. Think of an assertion as a
+  # statement of expected outcome, i.e. "I assert that x should be equal
+  # to y". If, when the assertion is executed, it turns out to be
+  # correct, nothing happens, and life is good. If, on the other hand,
+  # your assertion turns out to be false, an error is propagated with
+  # pertinent information so that you can go back and make your
+  # assertion succeed, and, once again, life is good. For an explanation
+  # of the current assertions, see Test::Unit::Assertions.
+  #
+  #
+  # == Test Method & Test Fixture
+  #
+  # Obviously, these assertions have to be called within a context that
+  # knows about them and can do something meaningful with their
+  # pass/fail value. Also, it's handy to collect a bunch of related
+  # tests, each test represented by a method, into a common test class
+  # that knows how to run them. The tests will be in a separate class
+  # from the code they're testing for a couple of reasons. First of all,
+  # it allows your code to stay uncluttered with test code, making it
+  # easier to maintain. Second, it allows the tests to be stripped out
+  # for deployment, since they're really there for you, the developer,
+  # and your users don't need them. Third, and most importantly, it
+  # allows you to set up a common test fixture for your tests to run
+  # against.
+  #
+  # What's a test fixture? Well, tests do not live in a vacuum; rather,
+  # they're run against the code they are testing. Often, a collection
+  # of tests will run against a common set of data, also called a
+  # fixture. If they're all bundled into the same test class, they can
+  # all share the setting up and tearing down of that data, eliminating
+  # unnecessary duplication and making it much easier to add related
+  # tests.
+  #
+  # Test::Unit::TestCase wraps up a collection of test methods together
+  # and allows you to easily set up and tear down the same test fixture
+  # for each test. This is done by overriding #setup and/or #teardown,
+  # which will be called before and after each test method that is
+  # run. The TestCase also knows how to collect the results of your
+  # assertions into a Test::Unit::TestResult, which can then be reported
+  # back to you... but I'm getting ahead of myself. To write a test,
+  # follow these steps:
+  #
+  # * Make sure Test::Unit is in your library path.
+  # * require 'test/unit' in your test script.
+  # * Create a class that subclasses Test::Unit::TestCase.
+  # * Add a method that begins with "test" to your class.
+  # * Make assertions in your test method.
+  # * Optionally define #setup and/or #teardown to set up and/or tear
+  #   down your common test fixture.
+  # * You can now run your test as you would any other Ruby
+  #   script... try it and see!
+  #
+  # A really simple test might look like this (#setup and #teardown are
+  # commented out to indicate that they are completely optional):
+  #
+  #     require 'test/unit'
+  #     
+  #     class TC_MyTest < Test::Unit::TestCase
+  #       # def setup
+  #       # end
+  #     
+  #       # def teardown
+  #       # end
+  #     
+  #       def test_fail
+  #         assert(false, 'Assertion was false.')
+  #       end
+  #     end
+  #
+  #
+  # == Test Runners
+  #
+  # So, now you have this great test class, but you still need a way to
+  # run it and view any failures that occur during the run. This is
+  # where Test::Unit::UI::Console::TestRunner (and others, such as
+  # Test::Unit::UI::GTK::TestRunner) comes into play. The console test
+  # runner is automatically invoked for you if you require 'test/unit'
+  # and simply run the file. To use another runner, or to manually
+  # invoke a runner, simply call its run class method and pass in an
+  # object that responds to the suite message with a
+  # Test::Unit::TestSuite. This can be as simple as passing in your
+  # TestCase class (which has a class suite method). It might look
+  # something like this:
+  #
+  #    require 'test/unit/ui/console/testrunner'
+  #    Test::Unit::UI::Console::TestRunner.run(TC_MyTest)
+  #
+  #
+  # == Test Suite
+  #
+  # As more and more unit tests accumulate for a given project, it
+  # becomes a real drag running them one at a time, and it also
+  # introduces the potential to overlook a failing test because you
+  # forget to run it. Suddenly it becomes very handy that the
+  # TestRunners can take any object that returns a Test::Unit::TestSuite
+  # in response to a suite method. The TestSuite can, in turn, contain
+  # other TestSuites or individual tests (typically created by a
+  # TestCase). In other words, you can easily wrap up a group of
+  # TestCases and TestSuites like this:
+  #
+  #  require 'test/unit/testsuite'
+  #  require 'tc_myfirsttests'
+  #  require 'tc_moretestsbyme'
+  #  require 'ts_anothersetoftests'
+  #
+  #  class TS_MyTests
+  #    def self.suite
+  #      suite = Test::Unit::TestSuite.new
+  #      suite << TC_MyFirstTests.suite
+  #      suite << TC_MoreTestsByMe.suite
+  #      suite << TS_AnotherSetOfTests.suite
+  #      return suite
+  #    end
+  #  end
+  #  Test::Unit::UI::Console::TestRunner.run(TS_MyTests)
+  #
+  # Now, this is a bit cumbersome, so Test::Unit does a little bit more
+  # for you, by wrapping these up automatically when you require
+  # 'test/unit'. What does this mean? It means you could write the above
+  # test case like this instead:
+  #
+  #  require 'test/unit'
+  #  require 'tc_myfirsttests'
+  #  require 'tc_moretestsbyme'
+  #  require 'ts_anothersetoftests'
+  #
+  # Test::Unit is smart enough to find all the test cases existing in
+  # the ObjectSpace and wrap them up into a suite for you. It then runs
+  # the dynamic suite using the console TestRunner.
+  #
+  #
+  # == Questions?
+  #
+  # I'd really like to get feedback from all levels of Ruby
+  # practitioners about typos, grammatical errors, unclear statements,
+  # missing points, etc., in this document (or any other).
+  #
+
+  module Unit
+    # If set to false Test::Unit will not automatically run at exit.
+    def self.run=(flag)
+      @run = flag
+    end
+
+    # Automatically run tests at exit?
+    def self.run?
+      @run ||= false
+    end
+  end
+end
+
+at_exit do
+  unless $! || Test::Unit.run?
+    exit Test::Unit::AutoRunner.run
+  end
+end