Deprecations of old configuration methods

Author: lcreid

lib/bootstrap_form.rb

@@ -27,11 +27,12 @@ def eager_load!
     end
 
     def config
-      @config ||= BootstrapForm::Configuration.new
-    end
+      deprecator.warn(<<~MESSAGE.squish)
+        BootstrapForm.config will be removed in a future release.
+        Please use BootstrapForm.configuration instead.
+      MESSAGE
 
-    def configure
-      yield config
+      configuration
     end
 
     def deprecator

lib/bootstrap_form/configuration.rb

@@ -8,8 +8,8 @@ def default_form_attributes=(attributes)
         @default_form_attributes = {}
       when Hash
         BootstrapForm.deprecator.warn(<<~MESSAGE.squish)
-          BootstrapForm::Configuation#default_form_attributes will be removed in a future release.
-          Please use Rails.application.config.bootstrap_form.default_form_attributes instead.
+          BootstrapForm::Configuration#default_form_attributes= will be removed in a future release.
+          Please use Rails.application.config.bootstrap_form.default_form_attributes= instead.
         MESSAGE
         @default_form_attributes = attributes
         Rails.application.config.bootstrap_form.default_form_attributes = attributes
@@ -19,9 +19,11 @@ def default_form_attributes=(attributes)
     end
 
     def default_form_attributes
-      return @default_form_attributes if defined? @default_form_attributes
-
-      {}
+      BootstrapForm.deprecator.warn(<<~MESSAGE.squish)
+        BootstrapForm::Configuration#default_form_attributes will be removed in a future release.
+        Please use Rails.application.config.bootstrap_form.default_form_attributes instead.
+      MESSAGE
+      Rails.application.config.bootstrap_form.default_form_attributes
     end
   end
 

lib/bootstrap_form/form_builder.rb

@@ -71,7 +71,7 @@ def initialize(object_name, object, template, options)
 
     def add_default_form_attributes_and_form_inline(options)
       options[:html] ||= {}
-      options[:html].reverse_merge!(BootstrapForm.config.default_form_attributes)
+      options[:html].reverse_merge!(BootstrapForm.configuration.default_form_attributes)
 
       return unless options[:layout] == :inline
 

test/bootstrap_configuration_test.rb

@@ -13,7 +13,9 @@ class BootstrapConfigurationTest < ActionView::TestCase
   test "has default form attributes" do
     config = BootstrapForm::Configuration.new
 
-    assert_equal({}, config.default_form_attributes)
+    assert_deprecated(BootstrapForm.deprecator) do
+      assert_equal({}, config.default_form_attributes)
+    end
   end
 
   test "allows to set default_form_attributes with custom value" do
@@ -22,14 +24,18 @@ class BootstrapConfigurationTest < ActionView::TestCase
       config.default_form_attributes = { foo: "bar" }
     end
 
-    assert_equal({ foo: "bar" }, config.default_form_attributes)
+    assert_deprecated(BootstrapForm.deprecator) do
+      assert_equal({ foo: "bar" }, config.default_form_attributes)
+    end
   end
 
   test "allows to set default_form_attributes with nil" do
     config = BootstrapForm::Configuration.new
     config.default_form_attributes = nil
 
-    assert_equal({}, config.default_form_attributes)
+    assert_deprecated(BootstrapForm.deprecator) do
+      assert_equal({}, config.default_form_attributes)
+    end
   end
 
   test "does not allow to set default_form_attributes with unsupported value" do

test/bootstrap_form_test.rb

@@ -377,7 +377,7 @@ def warn(message, ...)
   end
 
   test "allows to set blank default form attributes via configuration" do
-    BootstrapForm.config.stubs(:default_form_attributes).returns({})
+    BootstrapForm.configuration.stubs(:default_form_attributes).returns({})
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
       </form>
@@ -386,7 +386,7 @@ def warn(message, ...)
   end
 
   test "allows to set custom default form attributes via configuration" do
-    BootstrapForm.config.stubs(:default_form_attributes).returns(foo: "bar")
+    BootstrapForm.configuration.stubs(:default_form_attributes).returns(foo: "bar")
     expected = <<~HTML
       <form accept-charset="UTF-8" action="/users" class="new_user" foo="bar" id="new_user" method="post">
       </form>