Merge pull request #3267 from nebulab/kennyadsl/move-preferences-to-lib

Make preferences usage uniform across all Solidus gems

api/lib/spree/api.rb

@@ -2,11 +2,4 @@
 
 require 'spree/core'
 
-require 'responders'
-
-module Spree
- module Api
- end
-end
-
 require 'spree/api/engine'

api/lib/spree/api/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/api_configuration'
+
+module Spree
+ module Api
+ Config = Spree::ApiConfiguration.new
+ end
+end

api/lib/spree/api/engine.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'rails/engine'
+require 'spree/api/config'
 
 module Spree
  module Api
  class Engine < Rails::Engine
  isolate_namespace Spree
  engine_name 'spree_api'
 
- initializer "spree.api.environment", before: :load_config_initializers do |_app|
-  Spree::Api::Config = Spree::ApiConfiguration.new
- end
+ # Leave initializer empty for backwards-compatability. Other apps
+ # might still rely on this event.
+ initializer "spree.api.environment", before: :load_config_initializers do; end
  end
  end
 end

api/lib/spree/api/responders.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'responders'
 require 'spree/api/responders/rabl_template'
 
 module Spree

backend/lib/spree/backend/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/backend_configuration'
+
+module Spree
+ module Backend
+ Config = Spree::BackendConfiguration.new
+ end
+end

backend/lib/spree/backend/engine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'spree/backend/config'
+
 module Spree
  module Backend
  class Engine < ::Rails::Engine
  config.middleware.use "Spree::Backend::Middleware::SeoAssist"
 
- initializer "spree.backend.environment", before: :load_config_initializers do |_app|
-  Spree::Backend::Config = Spree::BackendConfiguration.new
- end
+ # Leave initializer empty for backwards-compatability. Other apps
+ # might still rely on this event.
+ initializer "spree.backend.environment", before: :load_config_initializers do; end
  end
  end
 end

backend/app/models/spree/backend_configuration.rb → backend/lib/spree/backend_configuration.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'spree/preferences/configuration'
+
 module Spree
  class BackendConfiguration < Preferences::Configuration
- preference :locale, :string, default: Rails.application.config.i18n.default_locale
+ preference :locale, :string, default: I18n.default_locale
 
  ORDER_TABS ||= [:orders, :payments, :creditcard_payments,
  :shipments, :credit_cards, :return_authorizations,

frontend/lib/spree/frontend/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/frontend_configuration'
+
+module Spree
+ module Frontend
+ Config = Spree::FrontendConfiguration.new
+ end
+end

frontend/lib/spree/frontend/engine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'spree/frontend/config'
+
 module Spree
  module Frontend
  class Engine < ::Rails::Engine
  config.middleware.use "Spree::Frontend::Middleware::SeoAssist"
 
- initializer "spree.frontend.environment", before: :load_config_initializers do |_app|
-  Spree::Frontend::Config = Spree::FrontendConfiguration.new
- end
+ # Leave initializer empty for backwards-compatability. Other apps
+ # might still rely on this event.
+ initializer "spree.frontend.environment", before: :load_config_initializers do; end
  end
  end
 end

frontend/app/models/spree/frontend_configuration.rb → frontend/lib/spree/frontend_configuration.rb

@@ -2,7 +2,7 @@
 
 module Spree
  class FrontendConfiguration < Preferences::Configuration
- preference :locale, :string, default: Rails.application.config.i18n.default_locale
+ preference :locale, :string, default: I18n.default_locale
 
  # Add your terms and conditions in app/views/spree/checkout/_terms_and_conditions.en.html.erb
  preference :require_terms_and_conditions_acceptance, :boolean, default: false