activeldap 1.0.1 → 1.0.2

data/CHANGES

@@ -1,3 +1,37 @@
+1.0.2:
+  * Removed Base64 module use.
+  * Improved LDIF parser.
+  * Improved scheme parser.
+  * Supported Base64 in XML serialization.
+  * Supported TLS options.
+  * Supported ActiveRecord 2.2.2.
+  * Supported Ruby on Rails 2.2.2.
+  * Used rails/init.rb and rails_generators/ directory structure convention
+    for Rails and gem. rails/ directory will be removed after 1.0.2 is released.
+  * AL-Admin migrated to Ruby on Rails 2.2.2 form 2.0.2.
+  * Improved ActiveDirectory integration.
+  * Accepted :class_name for belong_to and has_many option.
+  * Improved default port guess.
+  * Bug fixes:
+    * [#4] ModifyRecord#load doesn't operate atomic. [gwarf12]
+    * [#5] to_xml supports :except option. [baptiste.grenier]
+    * [#6] to_xml uses ActiveResource format. [baptiste.grenier]
+    * Out of ranged GeneralizedTime uses Time.at(0) as fallback value.
+      [Richard Nicholas]
+    * ActiveLdap::Base#to_s uses #to_ldif. [Kazuhiro NISHIYAMA]
+    * Fixed excess prefix extraction. [Grzegorz Marszałek]
+    * Skiped read only attribute validation. [しまさわらさん]
+    * Treated "" as empty value. [Ted Lepich]
+    * [#9][#16] Reduced raising when DN value is invalid.
+      [danger1986][Alexey.Chebotar]
+    * [#10][#12] Fixed needless ',' is appeared. [michael.j.konopka]
+    * [#11] Required missing 'active_ldap/user_password'. [michael.j.konopka]
+    * [#13] Returned entries if has_many :wrap has nonexistent entry.
+      [ingersoll]
+    * [#15] Fixed type error on computing DN. [ery.lee]
+    * ">=" filter operator doesn't work. [id:dicdak]
+    * [#17] ActiveLdap::Base.create doesn't raise exception. [Alexey.Chebotar]
+
 1.0.1:
   * Fixed GetText integration.
   * Fixed ActiveLdap::Base.find with ActiveLdap::DN. (Reported by Jeremy Pruitt)

data/README

@@ -109,3 +109,16 @@ list, please point out.
 * Tilo: A bug report.
 * Matt Mencel: A bug report.
 * CultureSpy: A bug report.
+* gwarf12: A bug report.
+* Baptiste Grenier: API improvement ideas.
+* Richard 3 Nicholas: API improvement ideas.
+* Kazuhiro NISHIYAMA: A bug report.
+* Grzegorz Marszałek: A bug report.
+* しまさわらさん: A suggesetion.
+* Ted Lepich: A suggestion.
+* danger1986: A suggestion.
+* michael.j.konopka: Bug reports.
+* ingersoll: A suggestion.
+* Alexey.Chebotar: Bug reports.
+* ery.lee: A bug report.
+* id:dicdak: A bug report.

data/Rakefile

@@ -21,7 +21,8 @@ excluded_components = %w(.svn .test-result .config doc log tmp
 excluded_suffixes = %w(.help .sqlite3)
 white_list_paths =
   [
-   "rails/plugin/active_ldap/generators/scaffold_al/templates/ldap.yml"
+   "rails/plugin/active_ldap/generators/scaffold_al/templates/ldap.yml",
+   "rails_generators/scaffold_active_ldap/templates/ldap.yml",
   ]
 Find.find(base_dir + File::SEPARATOR) do |target|
   target = truncate_base_dir[target]

data/TODO

@@ -1,3 +1,9 @@
+- [1.1.x] ActiveLdap::Base#dn returns ActiveLdap::DN. [#23932] [Marc Dequènes]
+- How to support dSCorePropagationData? ignore it?
+  all systemOnly == "TRUE" attribute can be ignored?
+- Add parsing position to DistinguishedNameInvalid error like
+  <NAME=VALUE,INVALID_HERE>@<REST=INPUT>.
+- Support TLS optioins (e.g. CA certification file and so on)
 - Provide FormHelper for LDAP entry's attribute to handle multiple values
   (["foo", "bar", ...]) and option value ({"binary" => "..."},
   {"lang-en-us" => "..."})

data/benchmark/bench-al.rb

@@ -21,31 +21,57 @@ ActiveLdap::Base.establish_connection
 config = ActiveLdap::Base.configuration
 
 LDAP_HOST = config[:host]
-LDAP_PORT = config[:port]
+LDAP_METHOD = config[:method]
+if LDAP_METHOD == :ssl
+  LDAP_PORT = config[:port] || URI::LDAPS::DEFAULT_PORT
+else
+  LDAP_PORT = config[:port] || URI::LDAP::DEFAULT_PORT
+end
 LDAP_BASE = config[:base]
 LDAP_PREFIX = options.prefix
 LDAP_USER = config[:bind_dn]
 LDAP_PASSWORD = config[:password]
-LDAP_METHOD = config[:method]
 
 class ALUser < ActiveLdap::Base
   ldap_mapping :dn_attribute => 'uid', :prefix => LDAP_PREFIX,
                :classes => ['posixAccount', 'person']
 end
 
-# === search_al
-#
-def search_al
+class ALUserLdap < ALUser
+end
+ALUserLdap.establish_connection(config.merge(:adapter => "ldap"))
+
+class ALUserNetLdap < ALUser
+end
+ALUserNetLdap.establish_connection(config.merge(:adapter => "net-ldap"))
+
+def search_al_ldap
+  count = 0
+  ALUserLdap.find(:all).each do |e|
+    count += 1
+  end
+  count
+end
+
+def search_al_net_ldap
   count = 0
-  ALUser.find(:all).each do |e|
+  ALUserNetLdap.find(:all).each do |e|
     count += 1
   end
   count
-end # -- search_al
+end
+
+def search_al_ldap_without_object_creation
+  count = 0
+  ALUserLdap.search.each do |e|
+    count += 1
+  end
+  count
+end
 
-def search_al_without_object_creation
+def search_al_net_ldap_without_object_creation
   count = 0
-  ALUser.search.each do |e|
+  ALUserNetLdap.search.each do |e|
     count += 1
   end
   count
@@ -161,6 +187,7 @@ def main(do_populate)
     dumped_data = ActiveLdap::Base.dump(:scope => :sub)
     ActiveLdap::Base.delete_all(nil, :scope => :sub)
     populate
+    puts
   end
 
   # Standard connection
@@ -168,18 +195,33 @@ def main(do_populate)
   ldap_conn = ldap_connection
   net_ldap_conn = net_ldap_connection
 
-  al_count = 0
-  al_count_without_object_creation = 0
+  al_ldap_count = 0
+  al_net_ldap_count = 0
+  al_ldap_count_without_object_creation = 0
+  al_net_ldap_count_without_object_creation = 0
   ldap_count = 0
   net_ldap_count = 0
   Benchmark.bmbm(20) do |x|
     [1].each do |n|
       GC.start
-      x.report("%3dx: AL" % n) {n.times {al_count = search_al}}
+      x.report("%3dx: AL(LDAP)" % n) do
+        n.times {al_ldap_count = search_al_ldap}
+      end
+      GC.start
+      x.report("%3dx: AL(Net::LDAP)" % n) do
+        n.times {al_net_ldap_count = search_al_net_ldap}
+      end
       GC.start
-      x.report("%3dx: AL(No Obj)" % n) do
+      x.report("%3dx: AL(LDAP: No Obj)" % n) do
         n.times do
-          al_count_without_object_creation = search_al_without_object_creation
+          al_ldap_count_without_object_creation =
+            search_al_ldap_without_object_creation
+        end
+      end
+      x.report("%3dx: AL(Net::LDAP: No Obj)" % n) do
+        n.times do
+          al_net_ldap_count_without_object_creation =
+            search_al_net_ldap_without_object_creation
         end
       end
       GC.start
@@ -196,13 +238,22 @@ def main(do_populate)
       end
     end
   end
-  puts(_("Entries processed by Ruby/ActiveLdap: %d") % al_count)
-  puts(_("Entries processed by Ruby/ActiveLdap (without object creation): " \
-         "%d") % al_count_without_object_creation)
+
+  puts
+  puts(_("Entries processed by Ruby/ActiveLdap + LDAP: %d") % al_ldap_count)
+  puts(_("Entries processed by Ruby/ActiveLdap + Net::LDAP: %d") % \
+       al_net_ldap_count)
+  puts(_("Entries processed by Ruby/ActiveLdap + LDAP: " \
+         "(without object creation): %d") % \
+       al_ldap_count_without_object_creation)
+  puts(_("Entries processed by Ruby/ActiveLdap + Net::LDAP: " \
+         "(without object creation): %d") % \
+       al_net_ldap_count_without_object_creation)
   puts(_("Entries processed by Ruby/LDAP: %d") % ldap_count)
   puts(_("Entries processed by Net::LDAP: %d") % net_ldap_count)
 ensure
   if do_populate
+    puts
     puts(_("Cleaning..."))
     ActiveLdap::Base.delete_all(nil, :scope => :sub)
     ActiveLdap::Base.load(dumped_data)

data/examples/al-admin/app/helpers/application_helper.rb

@@ -24,14 +24,12 @@ module ApplicationHelper
     "#{flash_box_div}\n#{javascript_tag(javascript_content)}"
   end
 
-  def switcher(prefix, title, options={}, &proc)
+  def switcher(prefix, title, options={})
     concat(render(:partial => "_switcher/before",
-                  :locals => {:prefix => prefix, :title => title}),
-           proc.binding)
+                  :locals => {:prefix => prefix, :title => title}))
     yield
     concat(render(:partial => "_switcher/after",
-                  :locals => {:prefix => prefix, :options => options}),
-           proc.binding)
+                  :locals => {:prefix => prefix, :options => options}))
   end
 
   def switcher_element(prefix, options={})

data/examples/al-admin/app/views/layouts/_footer.html.erb

@@ -5,5 +5,7 @@
     <%= link_to("Ruby/ActiveLdap",
 		"http://rubyforge.org/projects/ruby-activeldap") %>
     <%= ActiveLdap::VERSION %>
+    and
+    Ruby on Rails <%= Rails::VERSION::STRING %>
   </address>
 </div>

data/examples/al-admin/config/boot.rb

@@ -24,9 +24,8 @@ module Rails
       File.exist?("#{RAILS_ROOT}/vendor/rails")
     end
 
-    # FIXME : Ruby 1.9
     def preinitialize
-      load(preinitializer_path) if File.exists?(preinitializer_path)
+      load(preinitializer_path) if File.exist?(preinitializer_path)
     end
 
     def preinitializer_path
@@ -44,6 +43,7 @@ module Rails
   class VendorBoot < Boot
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
     end
   end
 
@@ -67,7 +67,7 @@ module Rails
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -82,14 +82,14 @@ module Rails
 
       def load_rubygems
         require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+        min_version = '1.3.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
         end
 
       rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
 

data/examples/al-admin/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -16,10 +16,19 @@ Rails::Initializer.run do |config|
   # -- all .rb files in that directory are automatically loaded.
   # See Rails::Configuration for more options.
 
-  # Skip frameworks you're not going to use (only works if using vendor/rails).
-  # To use Rails without a database, you must remove the Active Record framework
+  # Skip frameworks you're not going to use. To use Rails without a database
+  # you must remove the Active Record framework.
   # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
+  # Specify gems that this application depends on. 
+  # They can then be installed with "rake gems:install" on new installations.
+  # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
+  # config.gem "bj"
+  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+  # config.gem "sqlite3-ruby", :lib => "sqlite3"
+  # config.gem "aws-s3", :lib => "aws/s3"
+  config.gem "locale_rails"
+
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
@@ -28,11 +37,22 @@ Rails::Initializer.run do |config|
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
   config.load_paths += %W(#{RAILS_ROOT}/../../lib)
-  config.plugin_paths += %W(#{RAILS_ROOT}/../../rails/plugin)
+  config.plugin_paths += %W(#{RAILS_ROOT}/../..)
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
+  config.log_path = Logger::LogDevice.new(config.log_path)
+
+  # Make Time.zone default to the specified zone, and make Active Record store time values
+  # in the database in UTC, and return them converted to the specified local zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
+  config.time_zone = 'UTC'
+
+  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
+  # All files from config/locales/*.rb,yml are added automatically.
+  # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :de
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
@@ -45,7 +65,7 @@ Rails::Initializer.run do |config|
 
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information
-  # (create the session table with 'rake db:sessions:create')
+  # (create the session table with "rake db:sessions:create")
   # config.action_controller.session_store = :active_record_store
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
@@ -54,11 +74,6 @@ Rails::Initializer.run do |config|
   # config.active_record.schema_format = :sql
 
   # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector
-
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-
-  config.logger = Logger.new(config.log_path, 7)
-  config.logger.level = Logger.const_get(config.log_level.to_s.upcase)
+  # Please note that observers generated using script/generate observer need to have an _observer suffix
+  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 end

data/examples/al-admin/config/environments/development.rb

@@ -12,7 +12,6 @@ config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/examples/al-admin/config/environments/production.rb

@@ -4,13 +4,18 @@
 # Code is not reloaded between requests
 config.cache_classes = true
 
+# Enable threaded mode
+# config.threadsafe!
+
 # Use a different logger for distributed setups
 # config.logger = SyslogLogger.new
 
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
-config.action_view.cache_template_loading            = true
+
+# Use a different cache store in production
+# config.cache_store = :mem_cache_store
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"

data/examples/al-admin/config/environments/test.rb

@@ -16,7 +16,7 @@ config.action_controller.perform_caching             = false
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false
 
-# Tell ActionMailer not to deliver emails to the real world.
+# Tell Action Mailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test

data/examples/al-admin/config/initializers/gettext.rb

@@ -1 +1,15 @@
-require 'gettext/rails'
+# GetText doesn't support Rails 2.2.2 yet. :<
+# require 'gettext/rails'
+
+class ::ActionController::Base
+  include ActiveLdap::GetText
+
+  class << self
+    def init_gettext(*args)
+    end
+  end
+end
+
+class ::ActionView::Base
+  include ActiveLdap::GetText
+end

data/examples/al-admin/po/en/al-admin.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 1.0.1\n"
+"Project-Id-Version: AL Admin 1.0.2\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
 "PO-Revision-Date: 2007-08-19 09:44+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"

data/examples/al-admin/po/ja/al-admin.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 1.0.1\n"
+"Project-Id-Version: AL Admin 1.0.2\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
 "PO-Revision-Date: 2007-11-04 16:02+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"

data/examples/al-admin/po/nl/al-admin.po

@@ -6,7 +6,7 @@
 # Ace Suares <ace@suares.an>, 2007,2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 1.0.1\n"
+"Project-Id-Version: AL Admin 1.0.2\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
 "PO-Revision-Date: 2007-08-24 22:03+0900\n"
 "Last-Translator: Ace Suares <ace@suares.an>\n"