From null at cozmixng.org Tue Dec 11 08:20:32 2007 From: null at cozmixng.org (null at cozmixng.org) Date: Tue, 11 Dec 2007 22:20:32 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r135: Message-ID: <20071211132032.8ED269BE36@www.cozmixng.org> retro 2007-12-11 22:20:29 +0900 (Tue, 11 Dec 2007) New Revision: 135 Modified files: trunk/NEWS.en trunk/NEWS.ja trunk/README.en trunk/README.ja trunk/lib/active_samba_ldap.rb trunk/lib/active_samba_ldap/account_entry.rb trunk/lib/active_samba_ldap/group_entry.rb trunk/lib/active_samba_ldap/samba_group_entry.rb trunk/test/test_asl_useradd.rb Log: Modified: trunk/lib/active_samba_ldap/samba_group_entry.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap/samba_group_entry.rb 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/lib/active_samba_ldap/samba_group_entry.rb 2007-12-11 22:20:29 +09:00 (rev 135) @@ -102,7 +102,7 @@ def change_gid_number(gid, allow_non_unique=false) result = super return result unless samba_available? - rid = self.class.gid2rid(gid_number.to_s) + rid = self.class.gid2rid(gid_number) change_sid(rid, allow_non_unique) end Modified: trunk/NEWS.ja (+1 -0) =================================================================== --- trunk/NEWS.ja 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/NEWS.ja 2007-12-11 22:20:29 +09:00 (rev 135) @@ -6,6 +6,7 @@ == 0.0.6: 2008-XX-XX + * Ruby/ActiveLdap 0.9.1??? * ... == 0.0.5: 2007-11-19 Modified: trunk/lib/active_samba_ldap.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap.rb 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/lib/active_samba_ldap.rb 2007-12-11 22:20:29 +09:00 (rev 135) @@ -8,7 +8,7 @@ end end -required_active_ldap_version = ">= 0.9.0" +required_active_ldap_version = ">= 0.9.1" require_gem_if_need.call("active_ldap", "activeldap", required_active_ldap_version) Modified: trunk/README.en (+1 -1) =================================================================== --- trunk/README.en 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/README.en 2007-12-11 22:20:29 +09:00 (rev 135) @@ -37,7 +37,7 @@ == Dependency libraries - * ActiveLdap >= 0.9.0 + * ActiveLdap >= 0.9.1 == Usage Modified: trunk/test/test_asl_useradd.rb (+2 -2) =================================================================== --- trunk/test/test_asl_useradd.rb 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/test/test_asl_useradd.rb 2007-12-11 22:20:29 +09:00 (rev 135) @@ -149,7 +149,7 @@ user = @user_class.find(uid) primary_group = @group_class.find(:first, :attribute => "gidNumber", - :value => user.gid_number.to_s) + :value => user.gid_number) groups = @group_class.find(:all, :attribute => "memberUid", :value => uid) @@ -167,7 +167,7 @@ computer = @computer_class.find(uid) primary_group = @group_class.find(:first, :attribute => "gidNumber", - :value => computer.gid_number.to_s) + :value => computer.gid_number) groups = @group_class.find(:all, :attribute => "memberUid", :value => uid) Modified: trunk/README.ja (+1 -1) =================================================================== --- trunk/README.ja 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/README.ja 2007-12-11 22:20:29 +09:00 (rev 135) @@ -34,7 +34,7 @@ == ??????? - * ActiveLdap >= 0.9.0 + * ActiveLdap >= 0.9.1 == ??? Modified: trunk/lib/active_samba_ldap/group_entry.rb (+3 -5) =================================================================== --- trunk/lib/active_samba_ldap/group_entry.rb 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/lib/active_samba_ldap/group_entry.rb 2007-12-11 22:20:29 +09:00 (rev 135) @@ -30,9 +30,7 @@ end def find_by_gid_number(number) - attribute = "gidNumber" - value = Integer(number).to_s - find(:first, :filter => "(#{attribute}=#{value})") + find(:first, :filter => ["gidNumber", Integer(number)]) end private @@ -129,7 +127,7 @@ def change_gid_number(gid, allow_non_unique=false) check_unique_gid_number(gid) unless allow_non_unique - self.gid_number = gid.to_s + self.gid_number = gid end def destroy(options={}) @@ -159,7 +157,7 @@ def check_unique_gid_number(gid_number) ActiveSambaLdap::Base.restart_nscd do - if self.class.find_by_gid_number(Integer(gid_number)) + if self.class.find_by_gid_number(gid_number) raise GidNumberAlreadyExists.new(gid_number) end end Modified: trunk/NEWS.en (+1 -0) =================================================================== --- trunk/NEWS.en 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/NEWS.en 2007-12-11 22:20:29 +09:00 (rev 135) @@ -6,6 +6,7 @@ == 0.0.6: 2008-XX-XX + * Supported Ruby/ActiveLdap 0.9.1. * ... == 0.0.5: 2007-11-19 Modified: trunk/lib/active_samba_ldap/account_entry.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap/account_entry.rb 2007-11-19 21:00:03 +09:00 (rev 134) +++ trunk/lib/active_samba_ldap/account_entry.rb 2007-12-11 22:20:29 +09:00 (rev 135) @@ -121,7 +121,7 @@ def change_uid_number(uid, allow_non_unique=false) check_unique_uid_number(uid) unless allow_non_unique - self.uid_number = Integer(uid).to_s + self.uid_number = Integer(uid) end def change_password(password) From null at cozmixng.org Wed Dec 12 06:01:01 2007 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 12 Dec 2007 20:01:01 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r136: Message-ID: <20071212110101.1D2DE9BE26@www.cozmixng.org> retro 2007-12-12 20:00:54 +0900 (Wed, 12 Dec 2007) New Revision: 136 Modified files: trunk/README.en trunk/README.ja trunk/Rakefile Log: Modified: trunk/Rakefile (+1 -1) =================================================================== --- trunk/Rakefile 2007-12-11 22:00:29 +09:00 (rev 135) +++ trunk/Rakefile 2007-12-12 20:00:54 +09:00 (rev 136) @@ -61,7 +61,7 @@ p.rubyforge_name = "asl" p.full_name = "ActiveSambaLdap" p.summary = "Samba+LDAP administration tools" - p.extra_deps << ["ruby-activeldap", required_active_ldap_version] + p.extra_deps << ["activeldap", required_active_ldap_version] p.email = "kou at cozmixng.org" p.author = "Kouhei Sutou" p.url = "http://asl.rubyforge.org/" Modified: trunk/README.en (+1 -0) =================================================================== --- trunk/README.en 2007-12-11 22:00:29 +09:00 (rev 135) +++ trunk/README.en 2007-12-12 20:00:54 +09:00 (rev 136) @@ -331,3 +331,4 @@ * Henrik Kr?g: He reported some bugs. * Olivier DIRRENBERGER: He reported a bug. + * Francesco Malvezzi: He reported a bug. Modified: trunk/README.ja (+1 -0) =================================================================== --- trunk/README.ja 2007-12-11 22:00:29 +09:00 (rev 135) +++ trunk/README.ja 2007-12-12 20:00:54 +09:00 (rev 136) @@ -326,3 +326,4 @@ * Henrik Kr?g: ????????????? * Olivier DIRRENBERGER: ????????????? + * Francesco Malvezzi: ????????????? From null at cozmixng.org Wed Dec 12 06:01:04 2007 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 12 Dec 2007 20:01:04 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r137: Message-ID: <20071212110104.E50579BE34@www.cozmixng.org> retro 2007-12-12 20:01:02 +0900 (Wed, 12 Dec 2007) New Revision: 137 Modified files: trunk/README.en trunk/lib/active_samba_ldap/reloadable.rb Log: Modified: trunk/README.en (+1 -1) =================================================================== --- trunk/README.en 2007-12-12 19:36:39 +09:00 (rev 136) +++ trunk/README.en 2007-12-12 20:01:02 +09:00 (rev 137) @@ -331,4 +331,4 @@ * Henrik Kr?g: He reported some bugs. * Olivier DIRRENBERGER: He reported a bug. - * Francesco Malvezzi: He reported a bug. + * Francesco Malvezzi: He reported some bugs. Modified: trunk/lib/active_samba_ldap/reloadable.rb (+2 -0) =================================================================== --- trunk/lib/active_samba_ldap/reloadable.rb 2007-12-12 19:36:39 +09:00 (rev 136) +++ trunk/lib/active_samba_ldap/reloadable.rb 2007-12-12 20:01:02 +09:00 (rev 137) @@ -1,6 +1,8 @@ module ActiveSambaLdap module Reloadable def self.included(base) + super + return unless Object.const_defined?(:Reloadable) base.class_eval do if ::Reloadable.const_defined?(:Deprecated) include ::Reloadable::Deprecated