deprecate csv_column_separator in favor of using csv_options

Author: rheaton

lib/active_admin/application.rb

@@ -12,6 +12,11 @@ def self.inheritable_setting(name, default)
       setting name, default
     end
 
+    def self.deprecated_inheritable_setting(name, default)
+      Namespace.deprecated_setting name, nil
+      deprecated_setting name, default
+    end
+
     # The default namespace to put controllers and routes inside. Set this
     # in config/initializers/active_admin.rb using:
     #
@@ -66,9 +71,6 @@ def self.inheritable_setting(name, default)
     # The namespace root.
     inheritable_setting :root_to, 'dashboard#index'
 
-    # Default CSV separator
-    inheritable_setting :csv_column_separator, ','
-
     # Default CSV options
     inheritable_setting :csv_options, {}
 
@@ -85,6 +87,9 @@ def self.inheritable_setting(name, default)
 
     # == Deprecated Settings
 
+    # @deprecated Default CSV separator will be removed in 0.6.0. Use `csv_options = { :col_sep => ',' }` instead.
+    deprecated_inheritable_setting :csv_column_separator, ','
+
     # @deprecated The default sort order for index pages
     deprecated_setting :default_sort_order, 'id_desc'
 

spec/unit/application_spec.rb

@@ -30,7 +30,7 @@
     application.site_title = "New Title"
     application.site_title.should == "New Title"
   end
-  
+
   it "should store the site's title link" do
     application.site_title_link.should == ""
   end
@@ -39,11 +39,11 @@
     application.site_title_link = "http://www.mygreatsite.com"
     application.site_title_link.should == "http://www.mygreatsite.com"
   end
-  
+
   it "should store the site's title image" do
     application.site_title_image.should == ""
   end
-  
+
   it "should set the site's title image" do
     application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
     application.site_title_image.should == "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
@@ -53,7 +53,7 @@
     application.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)
   end
 
-  it "should have deprecated admin notes by default" do 
+  it "should have deprecated admin notes by default" do
     application.admin_notes.should be_nil
   end
 
@@ -80,6 +80,19 @@
     end
   end
 
+  describe "inheritable settings" do
+    it "should set csv_options" do
+      application.csv_options.should == {}
+    end
+
+    context "when deprecated" do
+      it "should set and warn csv_column_separator" do
+        ActiveAdmin::Deprecation.should_receive(:warn)
+        application.csv_column_separator.should == ','
+      end
+    end
+  end
+
   describe "files in load path" do
     it "should load files in the first level directory" do
       application.files_in_load_path.should include(File.expand_path("app/admin/dashboard.rb", Rails.root))