Remove unnecessary change to config

Author: lcreid

lib/bootstrap_form.rb

@@ -26,15 +26,6 @@ def eager_load!
       BootstrapForm::Inputs.eager_load!
     end
 
-    def config
-      deprecator.warn(<<~MESSAGE.squish)
-        BootstrapForm.config will be removed in a future release.
-        Please use BootstrapForm.configuration instead.
-      MESSAGE
-
-      configuration
-    end
-
     def deprecator
       @deprecator ||= ActiveSupport::Deprecation.new("a future release", "BootstrapForm")
     end

lib/bootstrap_form/configuration.rb

@@ -9,10 +9,10 @@ def default_form_attributes=(attributes)
       when Hash
         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.
+          Please use BootstrapForm.config.default_form_attributes= instead.
         MESSAGE
         @default_form_attributes = attributes
-        Rails.application.config.bootstrap_form.default_form_attributes = attributes
+        BootstrapForm.config.default_form_attributes = attributes
       else
         raise ArgumentError, "Unsupported default_form_attributes #{attributes.inspect}"
       end
@@ -21,17 +21,17 @@ def default_form_attributes=(attributes)
     def 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.
+        Please use BootstrapForm.config.default_form_attributes instead.
       MESSAGE
-      Rails.application.config.bootstrap_form.default_form_attributes
+      BootstrapForm.config.default_form_attributes
     end
   end
 
-  mattr_accessor :configuration, default: ActiveSupport::OrderedOptions.new
+  mattr_accessor :config, default: ActiveSupport::OrderedOptions.new
 
   class << self
     def configure
-      yield(configuration) if block_given?
+      yield(config) if block_given?
     end
   end
 end

lib/bootstrap_form/engine.rb

@@ -7,7 +7,7 @@ class Engine < Rails::Engine
     config.eager_load_namespaces << BootstrapForm
     config.autoload_paths << File.expand_path("lib", __dir__)
 
-    config.bootstrap_form = BootstrapForm.configuration
+    config.bootstrap_form = BootstrapForm.config
     config.bootstrap_form.default_form_attributes ||= {}
 
     initializer "bootstrap_form.deprecator" do |app|

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.configuration.default_form_attributes)
+      options[:html].reverse_merge!(BootstrapForm.config.default_form_attributes)
 
       return unless options[:layout] == :inline
 

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.configuration.stubs(:default_form_attributes).returns({})
+    BootstrapForm.config.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.configuration.stubs(:default_form_attributes).returns(foo: "bar")
+    BootstrapForm.config.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>