[asl-commit] ActiveSambaLdap r26:

[null at cozmixng.org]

retro	2007-08-04 11:32:16 +0900 (Sat, 04 Aug 2007)

  New Revision: 26

  Modified files:
    trunk/lib/active_samba_ldap/command.rb
    trunk/lib/active_samba_ldap/populate.rb
    trunk/rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_controller.rb
    trunk/test/asl-test-utils.rb
    trunk/test/test_asl_populate.rb

  Log:


  Modified: trunk/test/asl-test-utils.rb (+2 -2)
===================================================================
--- trunk/test/asl-test-utils.rb	2006-11-14 13:16:26 +09:00 (rev 25)
+++ trunk/test/asl-test-utils.rb	2007-08-04 11:32:16 +09:00 (rev 26)
@@ -70,14 +70,14 @@
         @dumped_data = ActiveSambaLdap::Base.dump(:scope => :sub)
       rescue ActiveLdap::ConnectionError
       end
-      ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
+      ActiveSambaLdap::Base.purge
       ActiveSambaLdap::Base.populate
     end
 
     def teardown
       super
       ActiveSambaLdap::Base.establish_connection(update_configuration)
-      ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
+      ActiveSambaLdap::Base.purge
       ActiveSambaLdap::Base.load(@dumped_data)
     end
   end

  Modified: trunk/lib/active_samba_ldap/populate.rb (+4 -0)
===================================================================
--- trunk/lib/active_samba_ldap/populate.rb	2006-11-14 13:16:26 +09:00 (rev 25)
+++ trunk/lib/active_samba_ldap/populate.rb	2007-08-04 11:32:16 +09:00 (rev 26)
@@ -9,6 +9,10 @@
         Private.new(self, options).populate
       end
 
+      def purge(options={})
+        self.delete_all(nil, {:scope => :sub}.merge(options))
+      end
+
       class Private
         def initialize(base, options)
           @base = base

  Modified: trunk/lib/active_samba_ldap/command.rb (+4 -1)
===================================================================
--- trunk/lib/active_samba_ldap/command.rb	2006-11-14 13:16:26 +09:00 (rev 25)
+++ trunk/lib/active_samba_ldap/command.rb	2007-08-04 11:32:16 +09:00 (rev 26)
@@ -14,7 +14,10 @@
         opts.separator ""
         opts.separator "Common options:"
 
-        opts.on_tail("--config=CONFIG", "Specify configuration file") do |file|
+        opts.on_tail("--config=CONFIG",
+                     "Specify configuration file",
+                     "Default configuration files:",
+                     *configuration_files.collect {|x| "  #{x}"}) do |file|
           configuration_files << file
         end
 

  Modified: trunk/test/test_asl_populate.rb (+2 -2)
===================================================================
--- trunk/test/test_asl_populate.rb	2006-11-14 13:16:26 +09:00 (rev 25)
+++ trunk/test/test_asl_populate.rb	2007-08-04 11:32:16 +09:00 (rev 26)
@@ -14,7 +14,7 @@
   end
 
   def test_populate
-    ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
+    ActiveSambaLdap::Base.purge
     assert_equal([], ActiveSambaLdap::Base.search)
     assert_asl_populate_successfully("Administrator")
     base = ActiveSambaLdap::Base.base
@@ -54,7 +54,7 @@
   end
 
   def test_wrong_password
-    ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
+    ActiveSambaLdap::Base.purge
     assert_asl_populate_miss_match_password
   end
 

  Modified: trunk/rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_controller.rb (+1 -1)
===================================================================
--- trunk/rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_controller.rb	2006-11-14 13:16:26 +09:00 (rev 25)
+++ trunk/rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_controller.rb	2007-08-04 11:32:16 +09:00 (rev 26)
@@ -7,6 +7,6 @@
   end
 
   def purge
-    ActiveSambaLdap::Base.delete_all(nil, :scope => :sub)
+    ActiveSambaLdap::Base.purge
   end
 end