[asl-commit] ActiveSambaLdap (trunk) r83:

[null at cozmixng.org]

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

  New Revision: 83

  Modified files:
    trunk/lib/active_samba_ldap/samba_account.rb
    trunk/lib/active_samba_ldap/samba_entry.rb
    trunk/lib/active_samba_ldap/samba_group_entry.rb

  Log:


  Modified: trunk/lib/active_samba_ldap/samba_group_entry.rb (+5 -9)
===================================================================
--- trunk/lib/active_samba_ldap/samba_group_entry.rb	2007-04-27 14:10:11 +09:00 (rev 82)
+++ trunk/lib/active_samba_ldap/samba_group_entry.rb	2007-08-04 11:52:14 +09:00 (rev 83)
@@ -58,6 +58,10 @@
     }
 
     module ClassMethods
+      def samba_object_class
+        "sambaGroupMapping"
+      end
+
       def gid2rid(gid)
         gid = Integer(gid)
         if WELL_KNOWN_RIDS.include?(gid)
@@ -82,18 +86,10 @@
 
       private
       def default_recommended_classes
-        super + ["sambaGroupMapping"]
+        super + [samba_object_class]
       end
     end
 
-    def samba_available?
-      classes.include?("sambaGroupMapping")
-    end
-
-    def ensure_samba_available
-      ensure_recommended_classes
-    end
-
     def fill_default_values(options={})
       if samba_available?
         change_type(options[:group_type] || "domain") unless samba_group_type

  Modified: trunk/lib/active_samba_ldap/samba_entry.rb (+16 -0)
===================================================================
--- trunk/lib/active_samba_ldap/samba_entry.rb	2007-04-27 14:10:11 +09:00 (rev 82)
+++ trunk/lib/active_samba_ldap/samba_entry.rb	2007-08-04 11:52:14 +09:00 (rev 83)
@@ -1,5 +1,21 @@
 module ActiveSambaLdap
   module SambaEntry
+    def samba_available?
+      classes.include?(samba_object_class)
+    end
+
+    def remove_samba_availability
+      remove_class(samba_object_class)
+    end
+
+    def ensure_samba_available
+      add_class(samba_object_class)
+    end
+
+    def samba_object_class
+      self.class.samba_object_class
+    end
+
     private
     def assert_samba_available
       unless samba_available?

  Modified: trunk/lib/active_samba_ldap/samba_account.rb (+5 -9)
===================================================================
--- trunk/lib/active_samba_ldap/samba_account.rb	2007-04-27 14:10:11 +09:00 (rev 82)
+++ trunk/lib/active_samba_ldap/samba_account.rb	2007-08-04 11:52:14 +09:00 (rev 83)
@@ -29,6 +29,10 @@
     ACCOUNT_FLAGS_RE = /\A\[([NDHTUMWSLXI ]+)\]\z/
 
     module ClassMethods
+      def samba_object_class
+        "sambaSamAccount"
+      end
+
       def uid2rid(uid)
         uid = Integer(uid)
         if WELL_KNOWN_RIDS.include?(uid)
@@ -53,7 +57,7 @@
 
       private
       def default_recommended_classes
-        super + ["sambaSamAccount"]
+        super + [samba_object_class]
       end
 
       def primary_group_options(options)
@@ -78,14 +82,6 @@
       end
     end
 
-    def samba_available?
-      classes.include?("sambaSamAccount")
-    end
-
-    def ensure_samba_available
-      ensure_recommended_classes
-    end
-
     def fill_default_values(options={})
       result = super
       return result unless samba_available?