[asl-commit] ActiveSambaLdap (trunk) r93:

[null at cozmixng.org]

retro	2007-08-04 11:52:44 +0900 (Sat, 04 Aug 2007)

  New Revision: 93

  Modified files:
    trunk/NEWS.en
    trunk/NEWS.ja
    trunk/lib/active_samba_ldap/configuration.rb
    trunk/lib/active_samba_ldap/populate.rb

  Log:


  Modified: trunk/NEWS.ja (+2 -1)
===================================================================
--- trunk/NEWS.ja	2007-05-02 18:35:00 +09:00 (rev 92)
+++ trunk/NEWS.ja	2007-08-04 11:52:44 +09:00 (rev 93)
@@ -4,9 +4,10 @@
 
 $Id$
 
-== 0.0.3: XXXX-XX-XX
+== 0.0.3: 2007-05-26
 
   * Ruby/ActiveLDAPのRubyGems名を修正．
+  * Ruby/ActiveLDAP 0.8.2対応。
   * ActiveSambaLdap::SambaUser,
     ActiveSambaLdap::SambaComputer,
     ActiveSambaLdap::SambaGroupを廃止し、

  Modified: trunk/lib/active_samba_ldap/populate.rb (+4 -1)
===================================================================
--- trunk/lib/active_samba_ldap/populate.rb	2007-05-02 18:35:00 +09:00 (rev 92)
+++ trunk/lib/active_samba_ldap/populate.rb	2007-08-04 11:52:44 +09:00 (rev 93)
@@ -112,7 +112,10 @@
             next if container_class.exists?(value, :prefix => suffix)
             container = container_class.new(value)
             yield(container) if block_given?
-            container.save!
+            begin
+              container.save!
+            rescue ActiveLdap::OperationNotPermitted
+            end
             entries << container
           end
           entries

  Modified: trunk/lib/active_samba_ldap/configuration.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap/configuration.rb	2007-05-02 18:35:00 +09:00 (rev 92)
+++ trunk/lib/active_samba_ldap/configuration.rb	2007-08-04 11:52:44 +09:00 (rev 93)
@@ -51,7 +51,7 @@
       def remove_connection_related_configuration(config)
         target_keys = Private::VARIABLES.collect do |name|
           name.to_sym
-        end - ActiveLdap::Adaptor::Base::VALID_ADAPTOR_CONFIGURATION_KEYS
+        end - ActiveLdap::Adapter::Base::VALID_ADAPTER_CONFIGURATION_KEYS
         super(config).reject do |key, value|
           target_keys.include?(key)
         end

  Modified: trunk/NEWS.en (+4 -3)
===================================================================
--- trunk/NEWS.en	2007-05-02 18:35:00 +09:00 (rev 92)
+++ trunk/NEWS.en	2007-08-04 11:52:44 +09:00 (rev 93)
@@ -4,9 +4,10 @@
 
 $Id$
 
-== 0.0.3: XXXX-XX-XX
+== 0.0.3: 2007-05-26
 
-  * Fixed typo of Ruby/ActiveLDAP's RubyGems name.
+  * Fixed a typo of Ruby/ActiveLDAP's RubyGems name.
+  * Supported Ruby/AtiveLDAP 0.8.2.
   * Integrated ActiveLdap::User, ActiveLdap::Computer and ActiveLdap::Group
     with ActiveLdap::SambaUser, ActiveLdap::SambaComputer and
     ActiveLdap::SambaGroup.
@@ -14,7 +15,7 @@
 == 0.0.2: 2007-01-29
 
   * Supported ActiveSupport 1.4.0.
-  * Fixed typo of Ruby/ActiveLDAP's RubyGems name.
+  * Fixed a typo of Ruby/ActiveLDAP's RubyGems name.
 
 == 0.0.1: 2006-11-17