Lazy load settings and removed deprecation warning in comments config

Author: gregbell

lib/active_admin/application.rb

@@ -58,7 +58,6 @@ class Application
     include AssetRegistration
 
     def initialize
-      initialize_defaults!
       register_default_assets
     end
 

lib/active_admin/comments/configuration.rb

@@ -9,7 +9,7 @@ module Configuration
         #
         #   config.allow_comments_in = [:admin, :root]
         #
-        attr_accessor_with_default :allow_comments_in, [:admin]
+        setting :allow_comments_in, [:admin]
       end
 
     end

lib/active_admin/helpers/settings.rb

@@ -25,19 +25,25 @@ def default_settings
         self.class.default_settings
       end
 
-      def initialize_defaults!
-        default_settings.each do |key, value|
-          send("#{key}=".to_sym, value)
-        end
-      end
-
     end
 
     module ClassMethods
 
       def setting(name, default)
         default_settings[name] = default
         attr_accessor(name)
+
+        # Create an accessor that grabs from the defaults
+        # if @name has not been set yet
+        class_eval <<-EOC, __FILE__, __LINE__
+          def #{name}
+            if instance_variable_defined? :@#{name}
+              @#{name}
+            else
+              default_settings[:#{name}]
+            end
+          end
+        EOC
       end
 
       def default_settings

spec/unit/helpers/settings_spec.rb

@@ -7,9 +7,6 @@
   let(:klass) do
     Class.new do
       include ActiveAdmin::Settings
-      def initialize
-        initialize_defaults!
-      end
     end
   end
 
@@ -23,4 +20,11 @@ def initialize
     klass.new.my_setting.should == "Hello World"
   end
 
+  it "should support settings of nil" do
+    klass.setting :my_setting, :some_val
+    inst = klass.new
+    inst.my_setting = nil
+    inst.my_setting.should == nil
+  end
+
 end