Warn if setting creation fails, override delete_all

.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+test/debug.log

lib/setting.rb

@@ -70,10 +70,9 @@ def destroy
     end
   end
 
-  # Overrides the delete method to ensure the default scope is not passed in the query
-  def delete
-    Setting.without_default_scope{ super }
-  end  
+  # Overrides the delete methods to ensure the default scope is not passed in the query
+  def delete;           Setting.without_default_scope{ super } end  
+  def self.delete_all;  Setting.without_default_scope{ super } end    
 
   # Resets this setting to the default stored in the settler configuration
   def reset!

lib/settler.rb

@@ -20,10 +20,11 @@ def load!
       self.config = config[namespace] if namespace
       self.config.each do  |key, attributes| 
         Setting.without_default_scope do 
-          Setting.find_or_create_by_key(attributes.only(:alt, :value).merge(:key => key)) do |s|
+          setting = Setting.find_or_create_by_key(attributes.only(:alt, :value).merge(:key => key)) do |s|
              s.editable = attributes['editable']
              s.deletable = attributes['deletable']
           end
+          p "[Settler] Validation failed for setting '#{setting.key}': #{setting.errors.full_messages.to_sentence}" if !setting.valid?
         end 
       end
       Setting.all.each{ |s| key = s.key; Settler.class.send(:define_method, key){ Setting.find_by_key(key) } }

settler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{settler}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]

test/test_settler.rb

@@ -51,14 +51,23 @@ def test_should_destroy_setting
     assert_nil Settler.search_algorithm
   end
 
-  def test_should_delete_destroy_setting
+  def test_should_delete_destroyed_setting
     deletable_setting = Settler.search_algorithm
     assert deletable_setting.destroy
     deletable_setting.delete
     assert Setting.deleted.empty?
     Settler.load!
     assert Settler.search_algorithm.present?
   end  
+
+  def test_should_delete_all_destroyed_setting
+    deletable_setting = Settler.search_algorithm
+    assert deletable_setting.destroy
+    Setting.delete_all
+    assert Setting.deleted.empty?
+    Settler.load!
+    assert Settler.search_algorithm.present?
+  end    
 
   def test_should_not_update_uneditable_setting
     uneditable_setting = Settler.search_algorithm