Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Move preferences into lib directory

Damian Legawiecc8304d04d469
diff --git a/api/app/models/spree/api_configuration.rb b/api/app/models/spree/api_configuration.rb
deleted file mode 100644
index 1b9b27cfbe..0000000000
--- a/api/app/models/spree/api_configuration.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Spree
- class ApiConfiguration < Preferences::Configuration
- preference :requires_authentication, :boolean, default: true
- preference :api_v2_serializers_cache_ttl, :integer, default: 3600 # 1 hour in seconds
- preference :api_v2_collection_cache_ttl, :integer, default: 3600 # 1 hour in seconds
- preference :api_v2_collection_cache_namespace, :string, default: 'api_v2_collection_cache'
- preference :api_v2_content_type, :string, default: 'application/vnd.api+json'
- preference :api_v2_per_page_limit, :integer, default: 500
- end
-end
diff --git a/api/lib/spree/api.rb b/api/lib/spree/api.rb
index e9a86283fc..889152191d 100644
--- a/api/lib/spree/api.rb
+++ b/api/lib/spree/api.rb
@@ -8,5 +8,4 @@ module Spree
end
end
-require 'spree/api/api_dependencies'
require 'spree/api/engine'
diff --git a/api/lib/spree/api/api_dependencies.rb b/api/lib/spree/api/api_dependencies.rb
deleted file mode 100644
index 308ea0a527..0000000000
--- a/api/lib/spree/api/api_dependencies.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-module Spree
- class ApiDependencies
- include Spree::DependenciesHelper
-
- INJECTION_POINTS = [
- :storefront_cart_create_service, :storefront_cart_add_item_service, :storefront_cart_remove_line_item_service,
- :storefront_cart_remove_item_service, :storefront_cart_set_item_quantity_service, :storefront_cart_recalculate_service,
- :storefront_cms_page_serializer, :storefront_cms_page_finder,
- :storefront_cart_update, :storefront_coupon_handler, :storefront_checkout_next_service, :storefront_checkout_advance_service,
- :storefront_checkout_update_service, :storefront_checkout_complete_service, :storefront_checkout_add_store_credit_service,
- :storefront_checkout_remove_store_credit_service, :storefront_checkout_get_shipping_rates_service,
- :storefront_cart_compare_line_items_service, :storefront_cart_serializer, :storefront_credit_card_serializer,
- :storefront_credit_card_finder, :storefront_shipment_serializer, :storefront_payment_method_serializer, :storefront_country_finder,
- :storefront_country_serializer, :storefront_menu_serializer, :storefront_menu_finder, :storefront_current_order_finder,
- :storefront_completed_order_finder, :storefront_order_sorter, :storefront_collection_paginator, :storefront_user_serializer,
- :storefront_products_sorter, :storefront_products_finder, :storefront_product_serializer, :storefront_taxon_serializer,
- :storefront_taxon_finder, :storefront_find_by_variant_finder, :storefront_cart_update_service, :storefront_cart_associate_service,
- :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
- :storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,
- :storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder,
- :storefront_account_create_service, :storefront_account_update_service, :storefront_collection_sorter, :error_handler,
- :storefront_cart_empty_service, :storefront_cart_destroy_service, :storefront_credit_cards_destroy_service, :platform_products_sorter,
- :storefront_cart_change_currency_service, :storefront_payment_serializer,
- :storefront_payment_create_service, :storefront_address_create_service, :storefront_address_update_service,
- :storefront_checkout_select_shipping_method_service,
-
- :platform_admin_user_serializer, :platform_coupon_handler, :platform_order_update_service,
- :platform_order_use_store_credit_service, :platform_order_remove_store_credit_service,
- :platform_order_complete_service, :platform_order_empty_service, :platform_order_destroy_service,
- :platform_order_next_service, :platform_order_advance_service,
- :platform_line_item_create_service, :platform_line_item_update_service, :platform_line_item_destroy_service,
- :platform_order_approve_service, :platform_order_cancel_service,
- :platform_shipment_change_state_service, :platform_shipment_create_service, :platform_shipment_update_service,
- :platform_shipment_add_item_service, :platform_shipment_remove_item_service
- ].freeze
-
- attr_accessor *INJECTION_POINTS
-
- def initialize
- set_storefront_defaults
- set_platform_defaults
- end
-
- private
-
- def set_storefront_defaults
- # cart services
- @storefront_cart_create_service = Spree::Dependencies.cart_create_service
- @storefront_cart_add_item_service = Spree::Dependencies.cart_add_item_service
- @storefront_cart_compare_line_items_service = Spree::Dependencies.cart_compare_line_items_service
- @storefront_cart_update_service = Spree::Dependencies.cart_update_service
- @storefront_cart_remove_line_item_service = Spree::Dependencies.cart_remove_line_item_service
- @storefront_cart_remove_item_service = Spree::Dependencies.cart_remove_item_service
- @storefront_cart_set_item_quantity_service = Spree::Dependencies.cart_set_item_quantity_service
- @storefront_cart_recalculate_service = Spree::Dependencies.cart_recalculate_service
- @storefront_cart_estimate_shipping_rates_service = Spree::Dependencies.cart_estimate_shipping_rates_service
- @storefront_cart_empty_service = Spree::Dependencies.cart_empty_service
- @storefront_cart_destroy_service = Spree::Dependencies.cart_destroy_service
- @storefront_cart_associate_service = Spree::Dependencies.cart_associate_service
- @storefront_cart_change_currency_service = Spree::Dependencies.cart_change_currency_service
-
- # coupon code handler
- @storefront_coupon_handler = Spree::Dependencies.coupon_handler
-
- # checkout services
- @storefront_checkout_next_service = Spree::Dependencies.checkout_next_service
- @storefront_checkout_advance_service = Spree::Dependencies.checkout_advance_service
- @storefront_checkout_update_service = Spree::Dependencies.checkout_update_service
- @storefront_checkout_complete_service = Spree::Dependencies.checkout_complete_service
- @storefront_checkout_add_store_credit_service = Spree::Dependencies.checkout_add_store_credit_service
- @storefront_checkout_remove_store_credit_service = Spree::Dependencies.checkout_remove_store_credit_service
- @storefront_checkout_get_shipping_rates_service = Spree::Dependencies.checkout_get_shipping_rates_service
- @storefront_checkout_select_shipping_method_service = Spree::Dependencies.checkout_select_shipping_method_service
-
- # account services
- @storefront_account_create_service = Spree::Dependencies.account_create_service
- @storefront_account_update_service = Spree::Dependencies.account_update_service
-
- # address services
- @storefront_address_create_service = Spree::Dependencies.address_create_service
- @storefront_address_update_service = Spree::Dependencies.address_update_service
-
- # credit card services
- @storefront_credit_cards_destroy_service = Spree::Dependencies.credit_cards_destroy_service
-
- # payment services
- @storefront_payment_create_service = Spree::Dependencies.payment_create_service
-
- # serializers
- @storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'
- @storefront_cart_serializer = 'Spree::V2::Storefront::CartSerializer'
- @storefront_cms_page_serializer = 'Spree::V2::Storefront::CmsPageSerializer'
- @storefront_credit_card_serializer = 'Spree::V2::Storefront::CreditCardSerializer'
- @storefront_country_serializer = 'Spree::V2::Storefront::CountrySerializer'
- @storefront_menu_serializer = 'Spree::V2::Storefront::MenuSerializer'
- @storefront_user_serializer = 'Spree::V2::Storefront::UserSerializer'
- @storefront_shipment_serializer = 'Spree::V2::Storefront::ShipmentSerializer'
- @storefront_taxon_serializer = 'Spree::V2::Storefront::TaxonSerializer'
- @storefront_payment_method_serializer = 'Spree::V2::Storefront::PaymentMethodSerializer'
- @storefront_payment_serializer = 'Spree::V2::Storefront::PaymentSerializer'
- @storefront_product_serializer = 'Spree::V2::Storefront::ProductSerializer'
- @storefront_estimated_shipment_serializer = 'Spree::V2::Storefront::EstimatedShippingRateSerializer'
- @storefront_store_serializer = 'Spree::V2::Storefront::StoreSerializer'
- @storefront_order_serializer = 'Spree::V2::Storefront::CartSerializer'
-
- # sorters
- @storefront_collection_sorter = Spree::Dependencies.collection_sorter
- @storefront_order_sorter = Spree::Dependencies.collection_sorter
- @storefront_products_sorter = Spree::Dependencies.products_sorter
- @platform_products_sorter = Spree::Dependencies.products_sorter
-
- # paginators
- @storefront_collection_paginator = Spree::Dependencies.collection_paginator
-
- # finders
- @storefront_address_finder = Spree::Dependencies.address_finder
- @storefront_country_finder = Spree::Dependencies.country_finder
- @storefront_cms_page_finder = Spree::Dependencies.cms_page_finder
- @storefront_menu_finder = Spree::Dependencies.menu_finder
- @storefront_current_order_finder = Spree::Dependencies.current_order_finder
- @storefront_completed_order_finder = Spree::Dependencies.completed_order_finder
- @storefront_credit_card_finder = Spree::Dependencies.credit_card_finder
- @storefront_find_by_variant_finder = Spree::Dependencies.line_item_by_variant_finder
- @storefront_products_finder = Spree::Dependencies.products_finder
- @storefront_taxon_finder = Spree::Dependencies.taxon_finder
-
- @error_handler = 'Spree::Api::ErrorHandler'
- end
-
- def set_platform_defaults
- # serializers
- @platform_admin_user_serializer = 'Spree::Api::V2::Platform::UserSerializer'
-
- # coupon code handler
- @platform_coupon_handler = Spree::Dependencies.coupon_handler
-
- # order services
- @platform_order_recalculate_service = Spree::Dependencies.cart_recalculate_service
- @platform_order_update_service = Spree::Dependencies.checkout_update_service
- @platform_order_empty_service = Spree::Dependencies.cart_empty_service
- @platform_order_destroy_service = Spree::Dependencies.cart_destroy_service
- @platform_order_next_service = Spree::Dependencies.checkout_next_service
- @platform_order_advance_service = Spree::Dependencies.checkout_advance_service
- @platform_order_complete_service = Spree::Dependencies.checkout_complete_service
- @platform_order_use_store_credit_service = Spree::Dependencies.checkout_add_store_credit_service
- @platform_order_remove_store_credit_service = Spree::Dependencies.checkout_remove_store_credit_service
- @platform_order_approve_service = Spree::Dependencies.order_approve_service
- @platform_order_cancel_service = Spree::Dependencies.order_cancel_service
-
- # line item services
- @platform_line_item_create_service = Spree::Dependencies.line_item_create_service
- @platform_line_item_update_service = Spree::Dependencies.line_item_update_service
- @platform_line_item_destroy_service = Spree::Dependencies.line_item_destroy_service
-
- # shipment services
- @platform_shipment_create_service = Spree::Dependencies.shipment_create_service
- @platform_shipment_update_service = Spree::Dependencies.shipment_update_service
- @platform_shipment_change_state_service = Spree::Dependencies.shipment_change_state_service
- @platform_shipment_add_item_service = Spree::Dependencies.shipment_add_item_service
- @platform_shipment_remove_item_service = Spree::Dependencies.shipment_remove_item_service
- end
- end
-end
diff --git a/api/lib/spree/api/configuration.rb b/api/lib/spree/api/configuration.rb
new file mode 100644
index 0000000000..54d04ef215
--- /dev/null
+++ b/api/lib/spree/api/configuration.rb
@@ -0,0 +1,12 @@
+module Spree
+ module Api
+ class Configuration < Preferences::Configuration
+ preference :requires_authentication, :boolean, default: true
+ preference :api_v2_serializers_cache_ttl, :integer, default: 3600 # 1 hour in seconds
+ preference :api_v2_collection_cache_ttl, :integer, default: 3600 # 1 hour in seconds
+ preference :api_v2_collection_cache_namespace, :string, default: 'api_v2_collection_cache'
+ preference :api_v2_content_type, :string, default: 'application/vnd.api+json'
+ preference :api_v2_per_page_limit, :integer, default: 500
+ end
+ end
+end
diff --git a/api/lib/spree/api/dependencies.rb b/api/lib/spree/api/dependencies.rb
new file mode 100644
index 0000000000..8fe15edea3
--- /dev/null
+++ b/api/lib/spree/api/dependencies.rb
@@ -0,0 +1,165 @@
+module Spree
+ module Api
+ class ApiDependencies
+ include Spree::DependenciesHelper
+
+ INJECTION_POINTS = [
+ :storefront_cart_create_service, :storefront_cart_add_item_service, :storefront_cart_remove_line_item_service,
+ :storefront_cart_remove_item_service, :storefront_cart_set_item_quantity_service, :storefront_cart_recalculate_service,
+ :storefront_cms_page_serializer, :storefront_cms_page_finder,
+ :storefront_cart_update, :storefront_coupon_handler, :storefront_checkout_next_service, :storefront_checkout_advance_service,
+ :storefront_checkout_update_service, :storefront_checkout_complete_service, :storefront_checkout_add_store_credit_service,
+ :storefront_checkout_remove_store_credit_service, :storefront_checkout_get_shipping_rates_service,
+ :storefront_cart_compare_line_items_service, :storefront_cart_serializer, :storefront_credit_card_serializer,
+ :storefront_credit_card_finder, :storefront_shipment_serializer, :storefront_payment_method_serializer, :storefront_country_finder,
+ :storefront_country_serializer, :storefront_menu_serializer, :storefront_menu_finder, :storefront_current_order_finder,
+ :storefront_completed_order_finder, :storefront_order_sorter, :storefront_collection_paginator, :storefront_user_serializer,
+ :storefront_products_sorter, :storefront_products_finder, :storefront_product_serializer, :storefront_taxon_serializer,
+ :storefront_taxon_finder, :storefront_find_by_variant_finder, :storefront_cart_update_service, :storefront_cart_associate_service,
+ :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
+ :storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,
+ :storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder,
+ :storefront_account_create_service, :storefront_account_update_service, :storefront_collection_sorter, :error_handler,
+ :storefront_cart_empty_service, :storefront_cart_destroy_service, :storefront_credit_cards_destroy_service, :platform_products_sorter,
+ :storefront_cart_change_currency_service, :storefront_payment_serializer,
+ :storefront_payment_create_service, :storefront_address_create_service, :storefront_address_update_service,
+ :storefront_checkout_select_shipping_method_service,
+
+ :platform_admin_user_serializer, :platform_coupon_handler, :platform_order_update_service,
+ :platform_order_use_store_credit_service, :platform_order_remove_store_credit_service,
+ :platform_order_complete_service, :platform_order_empty_service, :platform_order_destroy_service,
+ :platform_order_next_service, :platform_order_advance_service,
+ :platform_line_item_create_service, :platform_line_item_update_service, :platform_line_item_destroy_service,
+ :platform_order_approve_service, :platform_order_cancel_service,
+ :platform_shipment_change_state_service, :platform_shipment_create_service, :platform_shipment_update_service,
+ :platform_shipment_add_item_service, :platform_shipment_remove_item_service
+ ].freeze
+
+ attr_accessor *INJECTION_POINTS
+
+ def initialize
+ set_storefront_defaults
+ set_platform_defaults
+ end
+
+ private
+
+ def set_storefront_defaults
+ # cart services
+ @storefront_cart_create_service = Spree::Dependencies.cart_create_service
+ @storefront_cart_add_item_service = Spree::Dependencies.cart_add_item_service
+ @storefront_cart_compare_line_items_service = Spree::Dependencies.cart_compare_line_items_service
+ @storefront_cart_update_service = Spree::Dependencies.cart_update_service
+ @storefront_cart_remove_line_item_service = Spree::Dependencies.cart_remove_line_item_service
+ @storefront_cart_remove_item_service = Spree::Dependencies.cart_remove_item_service
+ @storefront_cart_set_item_quantity_service = Spree::Dependencies.cart_set_item_quantity_service
+ @storefront_cart_recalculate_service = Spree::Dependencies.cart_recalculate_service
+ @storefront_cart_estimate_shipping_rates_service = Spree::Dependencies.cart_estimate_shipping_rates_service
+ @storefront_cart_empty_service = Spree::Dependencies.cart_empty_service
+ @storefront_cart_destroy_service = Spree::Dependencies.cart_destroy_service
+ @storefront_cart_associate_service = Spree::Dependencies.cart_associate_service
+ @storefront_cart_change_currency_service = Spree::Dependencies.cart_change_currency_service
+
+ # coupon code handler
+ @storefront_coupon_handler = Spree::Dependencies.coupon_handler
+
+ # checkout services
+ @storefront_checkout_next_service = Spree::Dependencies.checkout_next_service
+ @storefront_checkout_advance_service = Spree::Dependencies.checkout_advance_service
+ @storefront_checkout_update_service = Spree::Dependencies.checkout_update_service
+ @storefront_checkout_complete_service = Spree::Dependencies.checkout_complete_service
+ @storefront_checkout_add_store_credit_service = Spree::Dependencies.checkout_add_store_credit_service
+ @storefront_checkout_remove_store_credit_service = Spree::Dependencies.checkout_remove_store_credit_service
+ @storefront_checkout_get_shipping_rates_service = Spree::Dependencies.checkout_get_shipping_rates_service
+ @storefront_checkout_select_shipping_method_service = Spree::Dependencies.checkout_select_shipping_method_service
+
+ # account services
+ @storefront_account_create_service = Spree::Dependencies.account_create_service
+ @storefront_account_update_service = Spree::Dependencies.account_update_service
+
+ # address services
+ @storefront_address_create_service = Spree::Dependencies.address_create_service
+ @storefront_address_update_service = Spree::Dependencies.address_update_service
+
+ # credit card services
+ @storefront_credit_cards_destroy_service = Spree::Dependencies.credit_cards_destroy_service
+
+ # payment services
+ @storefront_payment_create_service = Spree::Dependencies.payment_create_service
+
+ # serializers
+ @storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'
+ @storefront_cart_serializer = 'Spree::V2::Storefront::CartSerializer'
+ @storefront_cms_page_serializer = 'Spree::V2::Storefront::CmsPageSerializer'
+ @storefront_credit_card_serializer = 'Spree::V2::Storefront::CreditCardSerializer'
+ @storefront_country_serializer = 'Spree::V2::Storefront::CountrySerializer'
+ @storefront_menu_serializer = 'Spree::V2::Storefront::MenuSerializer'
+ @storefront_user_serializer = 'Spree::V2::Storefront::UserSerializer'
+ @storefront_shipment_serializer = 'Spree::V2::Storefront::ShipmentSerializer'
+ @storefront_taxon_serializer = 'Spree::V2::Storefront::TaxonSerializer'
+ @storefront_payment_method_serializer = 'Spree::V2::Storefront::PaymentMethodSerializer'
+ @storefront_payment_serializer = 'Spree::V2::Storefront::PaymentSerializer'
+ @storefront_product_serializer = 'Spree::V2::Storefront::ProductSerializer'
+ @storefront_estimated_shipment_serializer = 'Spree::V2::Storefront::EstimatedShippingRateSerializer'
+ @storefront_store_serializer = 'Spree::V2::Storefront::StoreSerializer'
+ @storefront_order_serializer = 'Spree::V2::Storefront::CartSerializer'
+
+ # sorters
+ @storefront_collection_sorter = Spree::Dependencies.collection_sorter
+ @storefront_order_sorter = Spree::Dependencies.collection_sorter
+ @storefront_products_sorter = Spree::Dependencies.products_sorter
+ @platform_products_sorter = Spree::Dependencies.products_sorter
+
+ # paginators
+ @storefront_collection_paginator = Spree::Dependencies.collection_paginator
+
+ # finders
+ @storefront_address_finder = Spree::Dependencies.address_finder
+ @storefront_country_finder = Spree::Dependencies.country_finder
+ @storefront_cms_page_finder = Spree::Dependencies.cms_page_finder
+ @storefront_menu_finder = Spree::Dependencies.menu_finder
+ @storefront_current_order_finder = Spree::Dependencies.current_order_finder
+ @storefront_completed_order_finder = Spree::Dependencies.completed_order_finder
+ @storefront_credit_card_finder = Spree::Dependencies.credit_card_finder
+ @storefront_find_by_variant_finder = Spree::Dependencies.line_item_by_variant_finder
+ @storefront_products_finder = Spree::Dependencies.products_finder
+ @storefront_taxon_finder = Spree::Dependencies.taxon_finder
+
+ @error_handler = 'Spree::Api::ErrorHandler'
+ end
+
+ def set_platform_defaults
+ # serializers
+ @platform_admin_user_serializer = 'Spree::Api::V2::Platform::UserSerializer'
+
+ # coupon code handler
+ @platform_coupon_handler = Spree::Dependencies.coupon_handler
+
+ # order services
+ @platform_order_recalculate_service = Spree::Dependencies.cart_recalculate_service
+ @platform_order_update_service = Spree::Dependencies.checkout_update_service
+ @platform_order_empty_service = Spree::Dependencies.cart_empty_service
+ @platform_order_destroy_service = Spree::Dependencies.cart_destroy_service
+ @platform_order_next_service = Spree::Dependencies.checkout_next_service
+ @platform_order_advance_service = Spree::Dependencies.checkout_advance_service
+ @platform_order_complete_service = Spree::Dependencies.checkout_complete_service
+ @platform_order_use_store_credit_service = Spree::Dependencies.checkout_add_store_credit_service
+ @platform_order_remove_store_credit_service = Spree::Dependencies.checkout_remove_store_credit_service
+ @platform_order_approve_service = Spree::Dependencies.order_approve_service
+ @platform_order_cancel_service = Spree::Dependencies.order_cancel_service
+
+ # line item services
+ @platform_line_item_create_service = Spree::Dependencies.line_item_create_service
+ @platform_line_item_update_service = Spree::Dependencies.line_item_update_service
+ @platform_line_item_destroy_service = Spree::Dependencies.line_item_destroy_service
+
+ # shipment services
+ @platform_shipment_create_service = Spree::Dependencies.shipment_create_service
+ @platform_shipment_update_service = Spree::Dependencies.shipment_update_service
+ @platform_shipment_change_state_service = Spree::Dependencies.shipment_change_state_service
+ @platform_shipment_add_item_service = Spree::Dependencies.shipment_add_item_service
+ @platform_shipment_remove_item_service = Spree::Dependencies.shipment_remove_item_service
+ end
+ end
+ end
+end
diff --git a/api/lib/spree/api/engine.rb b/api/lib/spree/api/engine.rb
index 6e5722fde2..c188b19c18 100644
--- a/api/lib/spree/api/engine.rb
+++ b/api/lib/spree/api/engine.rb
@@ -1,5 +1,8 @@
require 'rails/engine'
+require_relative 'dependencies'
+require_relative 'configuration'
+
module Spree
module Api
class Engine < Rails::Engine
@@ -7,8 +10,8 @@ module Spree
engine_name 'spree_api'
initializer 'spree.api.environment', before: :load_config_initializers do |_app|
- Spree::Api::Config = Spree::ApiConfiguration.new
- Spree::Api::Dependencies = Spree::ApiDependencies.new
+ Spree::Api::Config = Spree::Api::Configuration.new
+ Spree::Api::Dependencies = Spree::Api::ApiDependencies.new
end
initializer 'spree.api.checking_migrations' do
diff --git a/api/spec/models/spree/api_dependencies_spec.rb b/api/spec/models/spree/api_dependencies_spec.rb
index 7718ef36b1..fc375ca3d0 100644
--- a/api/spec/models/spree/api_dependencies_spec.rb
+++ b/api/spec/models/spree/api_dependencies_spec.rb
@@ -9,8 +9,8 @@ end
class MyCustomCreateService
end
-describe Spree::ApiDependencies, type: :model do
- let (:deps) { Spree::ApiDependencies.new }
+describe Spree::Api::ApiDependencies, type: :model do
+ let (:deps) { described_class.new }
it 'returns the default value' do
expect(deps.storefront_cart_serializer).to eq('Spree::V2::Storefront::CartSerializer')
diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
index bdfaae8cf0..b150a882a4 100644
--- a/common_spree_dependencies.rb
+++ b/common_spree_dependencies.rb
@@ -65,6 +65,6 @@ group :test, :development do
end
group :development do
- gem 'github_fast_changelog'
+ # gem 'github_fast_changelog'
gem 'solargraph'
end
diff --git a/core/app/models/spree/app_configuration.rb b/core/app/models/spree/app_configuration.rb
deleted file mode 100644
index 1a496d2b24..0000000000
--- a/core/app/models/spree/app_configuration.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# This is the primary location for defining spree preferences
-#
-# The expectation is that this is created once and stored in
-# the spree environment
-#
-# setters:
-# a.color = :blue
-# a[:color] = :blue
-# a.set :color = :blue
-# a.preferred_color = :blue
-#
-# getters:
-# a.color
-# a[:color]
-# a.get :color
-# a.preferred_color
-#
-require 'spree/core/search/base'
-
-module Spree
- class AppConfiguration < Preferences::Configuration
- # Alphabetized to more easily lookup particular preferences
- preference :address_requires_state, :boolean, default: true # should state/state_name be required
- preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
- preference :admin_path, :string, deprecated: true
- preference :admin_products_per_page, :integer, deprecated: true
- preference :admin_orders_per_page, :integer, deprecated: true
- preference :admin_properties_per_page, :integer, deprecated: true
- preference :admin_promotions_per_page, :integer, deprecated: true
- preference :admin_customer_returns_per_page, :integer, deprecated: true
- preference :admin_users_per_page, :integer, deprecated: true
- preference :admin_show_version, :boolean, deprecated: true
- preference :allow_checkout_on_gateway_error, :boolean, default: false
- preference :allow_guest_checkout, :boolean, default: true
- preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
- preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
- preference :always_put_site_name_in_title, :boolean, deprecated: true
- preference :title_site_name_separator, :string, deprecated: true
- preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
- preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
- preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
- preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
- preference :company, :boolean, default: false # Request company field for billing and shipping addr
- preference :currency, :string, default: 'USD', deprecated: true
- preference :default_country_id, :integer, deprecated: true
- preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
- preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
- preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
- preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
- preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
- preference :logo, :string, deprecated: true
- preference :mailer_logo, :string, deprecated: true
- preference :max_level_in_taxons_menu, :integer, deprecated: true
- preference :products_per_page, :integer, default: 12
- preference :require_master_price, :boolean, default: true
- preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
- preference :return_eligibility_number_of_days, :integer, default: 365
- preference :send_core_emails, :boolean, default: true # Default mail headers settings
- preference :shipping_instructions, :boolean, deprecated: true
- preference :show_only_complete_orders_by_default, :boolean, deprecated: true
- preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
- preference :show_products_without_price, :boolean, default: false
- preference :show_raw_product_description, :boolean, deprecated: true
- preference :tax_using_ship_address, :boolean, default: true
- preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
-
- # Store credits configurations
- preference :non_expiring_credit_types, :array, default: []
- preference :credit_to_new_allocation, :boolean, default: false
-
- # Multi store configurations
- preference :show_store_selector, :boolean, deprecated: true
-
- # searcher_class allows spree extension writers to provide their own Search class
- def searcher_class
- @searcher_class ||= Spree::Core::Search::Base
- end
-
- # Sets the path used for products, taxons and pages.
- preference :storefront_products_path, :string, default: 'products'
- preference :storefront_taxons_path, :string, default: 't'
- preference :storefront_pages_path, :string, default: 'pages'
-
- attr_writer :searcher_class
- end
-end
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 84c3cbf55d..65800ec727 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -105,9 +105,6 @@ require 'spree/permitted_attributes'
require 'spree/service_module'
require 'spree/database_type_utilities'
-require 'spree/core/dependencies_helper'
-require 'spree/core/app_dependencies'
-
require 'spree/core/importer'
require 'spree/core/query_filters'
require 'spree/core/product_duplicator'
@@ -119,3 +116,6 @@ require 'spree/core/controller_helpers/store'
require 'spree/core/controller_helpers/strong_parameters'
require 'spree/core/controller_helpers/locale'
require 'spree/core/controller_helpers/currency'
+
+require 'spree/core/preferences/store'
+require 'spree/core/preferences/scoped_store'
diff --git a/core/lib/spree/core/app_dependencies.rb b/core/lib/spree/core/app_dependencies.rb
deleted file mode 100644
index baeb1be363..0000000000
--- a/core/lib/spree/core/app_dependencies.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-module Spree
- class AppDependencies
- include Spree::DependenciesHelper
-
- INJECTION_POINTS = [
- :ability_class,
- :cart_create_service, :cart_add_item_service, :cart_remove_item_service,
- :cart_remove_line_item_service, :cart_set_item_quantity_service, :cart_recalculate_service,
- :cms_page_finder, :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
- :checkout_complete_service, :checkout_add_store_credit_service, :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
- :coupon_handler, :menu_finder, :country_finder, :current_order_finder, :credit_card_finder,
- :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
- :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
- :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
- :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
- :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service,
- :line_item_create_service, :line_item_update_service, :line_item_destroy_service,
- :order_approve_service, :order_cancel_service, :shipment_change_state_service, :shipment_update_service,
- :shipment_create_service, :shipment_add_item_service, :shipment_remove_item_service,
- :payment_create_service, :address_create_service, :address_update_service,
- :checkout_select_shipping_method_service
- ].freeze
-
- attr_accessor *INJECTION_POINTS
-
- def initialize
- set_default_ability
- set_default_services
- set_default_finders
- end
-
- private
-
- def set_default_ability
- @ability_class = 'Spree::Ability'
- end
-
- def set_default_services
- # cart
- @cart_compare_line_items_service = 'Spree::CompareLineItems'
- @cart_create_service = 'Spree::Cart::Create'
- @cart_add_item_service = 'Spree::Cart::AddItem'
- @cart_update_service = 'Spree::Cart::Update'
- @cart_recalculate_service = 'Spree::Cart::Recalculate'
- @cart_remove_item_service = 'Spree::Cart::RemoveItem'
- @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
- @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
- @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
- @cart_empty_service = 'Spree::Cart::Empty'
- @cart_destroy_service = 'Spree::Cart::Destroy'
- @cart_associate_service = 'Spree::Cart::Associate'
- @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
-
- # checkout
- @checkout_next_service = 'Spree::Checkout::Next'
- @checkout_advance_service = 'Spree::Checkout::Advance'
- @checkout_update_service = 'Spree::Checkout::Update'
- @checkout_complete_service = 'Spree::Checkout::Complete'
- @checkout_add_store_credit_service = 'Spree::Checkout::AddStoreCredit'
- @checkout_remove_store_credit_service = 'Spree::Checkout::RemoveStoreCredit'
- @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
- @checkout_select_shipping_method_service = 'Spree::Checkout::SelectShippingMethod'
-
- # order
- @order_approve_service = 'Spree::Orders::Approve'
- @order_cancel_service = 'Spree::Orders::Cancel'
-
- # shipment
- @shipment_change_state_service = 'Spree::Shipments::ChangeState'
- @shipment_create_service = 'Spree::Shipments::Create'
- @shipment_update_service = 'Spree::Shipments::Update'
- @shipment_add_item_service = 'Spree::Shipments::AddItem'
- @shipment_remove_item_service = 'Spree::Shipments::RemoveItem'
-
- # sorter
- @collection_sorter = 'Spree::BaseSorter'
- @order_sorter = 'Spree::BaseSorter'
- @products_sorter = 'Spree::Products::Sort'
-
- # paginator
- @collection_paginator = 'Spree::Shared::Paginate'
-
- # coupons
- # TODO: we should split this service into 2 separate - Add and Remove
- @coupon_handler = 'Spree::PromotionHandler::Coupon'
-
- # account
- @account_create_service = 'Spree::Account::Create'
- @account_update_service = 'Spree::Account::Update'
-
- # addresses
- @address_create_service = 'Spree::Addresses::Create'
- @address_update_service = 'Spree::Addresses::Update'
-
- # credit cards
- @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
-
- # classifications
- @classification_reposition_service = 'Spree::Classifications::Reposition'
-
- # line items
- @line_item_create_service = 'Spree::LineItems::Create'
- @line_item_update_service = 'Spree::LineItems::Update'
- @line_item_destroy_service = 'Spree::LineItems::Destroy'
-
- @payment_create_service = 'Spree::Payments::Create'
-
- # errors
- @error_handler = 'Spree::ErrorReporter'
- end
-
- def set_default_finders
- @address_finder = 'Spree::Addresses::Find'
- @country_finder = 'Spree::Countries::Find'
- @cms_page_finder = 'Spree::CmsPages::Find'
- @menu_finder = 'Spree::Menus::Find'
- @current_order_finder = 'Spree::Orders::FindCurrent'
- @current_store_finder = 'Spree::Stores::FindCurrent'
- @completed_order_finder = 'Spree::Orders::FindComplete'
- @credit_card_finder = 'Spree::CreditCards::Find'
- @products_finder = 'Spree::Products::Find'
- @taxon_finder = 'Spree::Taxons::Find'
- @line_item_by_variant_finder = 'Spree::LineItems::FindByVariant'
- end
- end
-end
diff --git a/core/lib/spree/core/configuration.rb b/core/lib/spree/core/configuration.rb
new file mode 100644
index 0000000000..e3e76f2ee7
--- /dev/null
+++ b/core/lib/spree/core/configuration.rb
@@ -0,0 +1,89 @@
+# This is the primary location for defining spree preferences
+#
+# The expectation is that this is created once and stored in
+# the spree environment
+#
+# setters:
+# a.color = :blue
+# a[:color] = :blue
+# a.set :color = :blue
+# a.preferred_color = :blue
+#
+# getters:
+# a.color
+# a[:color]
+# a.get :color
+# a.preferred_color
+#
+require 'spree/core/search/base'
+require 'spree/core/preferences/configuration'
+
+module Spree
+ module Core
+ class Configuration < Preferences::Configuration
+ # Alphabetized to more easily lookup particular preferences
+ preference :address_requires_state, :boolean, default: true # should state/state_name be required
+ preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
+ preference :admin_path, :string, deprecated: true
+ preference :admin_products_per_page, :integer, deprecated: true
+ preference :admin_orders_per_page, :integer, deprecated: true
+ preference :admin_properties_per_page, :integer, deprecated: true
+ preference :admin_promotions_per_page, :integer, deprecated: true
+ preference :admin_customer_returns_per_page, :integer, deprecated: true
+ preference :admin_users_per_page, :integer, deprecated: true
+ preference :admin_show_version, :boolean, deprecated: true
+ preference :allow_checkout_on_gateway_error, :boolean, default: false
+ preference :allow_guest_checkout, :boolean, default: true
+ preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
+ preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
+ preference :always_put_site_name_in_title, :boolean, deprecated: true
+ preference :title_site_name_separator, :string, deprecated: true
+ preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
+ preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
+ preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
+ preference :checkout_zone, :string, default: nil, deprecated: true # replace with the name of a zone if you would like to limit the countries
+ preference :company, :boolean, default: false # Request company field for billing and shipping addr
+ preference :currency, :string, default: 'USD', deprecated: true
+ preference :default_country_id, :integer, deprecated: true
+ preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
+ preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
+ preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
+ preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
+ preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
+ preference :logo, :string, deprecated: true
+ preference :mailer_logo, :string, deprecated: true
+ preference :max_level_in_taxons_menu, :integer, deprecated: true
+ preference :products_per_page, :integer, default: 12
+ preference :require_master_price, :boolean, default: true
+ preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
+ preference :return_eligibility_number_of_days, :integer, default: 365
+ preference :send_core_emails, :boolean, default: true # Default mail headers settings
+ preference :shipping_instructions, :boolean, deprecated: true
+ preference :show_only_complete_orders_by_default, :boolean, deprecated: true
+ preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
+ preference :show_products_without_price, :boolean, default: false
+ preference :show_raw_product_description, :boolean, deprecated: true
+ preference :tax_using_ship_address, :boolean, default: true
+ preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
+
+ # Store credits configurations
+ preference :non_expiring_credit_types, :array, default: []
+ preference :credit_to_new_allocation, :boolean, default: false
+
+ # Multi store configurations
+ preference :show_store_selector, :boolean, deprecated: true
+
+ # searcher_class allows spree extension writers to provide their own Search class
+ def searcher_class
+ @searcher_class ||= Spree::Core::Search::Base
+ end
+
+ # Sets the path used for products, taxons and pages.
+ preference :storefront_products_path, :string, default: 'products'
+ preference :storefront_taxons_path, :string, default: 't'
+ preference :storefront_pages_path, :string, default: 'pages'
+
+ attr_writer :searcher_class
+ end
+ end
+end
diff --git a/core/lib/spree/core/dependencies.rb b/core/lib/spree/core/dependencies.rb
new file mode 100644
index 0000000000..d5ac71e56a
--- /dev/null
+++ b/core/lib/spree/core/dependencies.rb
@@ -0,0 +1,130 @@
+require_relative 'dependencies_helper'
+
+module Spree
+ module Core
+ class Dependencies
+ include Spree::DependenciesHelper
+
+ INJECTION_POINTS = [
+ :ability_class,
+ :cart_create_service, :cart_add_item_service, :cart_remove_item_service,
+ :cart_remove_line_item_service, :cart_set_item_quantity_service, :cart_recalculate_service,
+ :cms_page_finder, :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
+ :checkout_complete_service, :checkout_add_store_credit_service, :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
+ :coupon_handler, :menu_finder, :country_finder, :current_order_finder, :credit_card_finder,
+ :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
+ :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
+ :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
+ :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
+ :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service,
+ :line_item_create_service, :line_item_update_service, :line_item_destroy_service,
+ :order_approve_service, :order_cancel_service, :shipment_change_state_service, :shipment_update_service,
+ :shipment_create_service, :shipment_add_item_service, :shipment_remove_item_service,
+ :payment_create_service, :address_create_service, :address_update_service,
+ :checkout_select_shipping_method_service
+ ].freeze
+
+ attr_accessor *INJECTION_POINTS
+
+ def initialize
+ set_default_ability
+ set_default_services
+ set_default_finders
+ end
+
+ private
+
+ def set_default_ability
+ @ability_class = 'Spree::Ability'
+ end
+
+ def set_default_services
+ # cart
+ @cart_compare_line_items_service = 'Spree::CompareLineItems'
+ @cart_create_service = 'Spree::Cart::Create'
+ @cart_add_item_service = 'Spree::Cart::AddItem'
+ @cart_update_service = 'Spree::Cart::Update'
+ @cart_recalculate_service = 'Spree::Cart::Recalculate'
+ @cart_remove_item_service = 'Spree::Cart::RemoveItem'
+ @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
+ @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
+ @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
+ @cart_empty_service = 'Spree::Cart::Empty'
+ @cart_destroy_service = 'Spree::Cart::Destroy'
+ @cart_associate_service = 'Spree::Cart::Associate'
+ @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
+
+ # checkout
+ @checkout_next_service = 'Spree::Checkout::Next'
+ @checkout_advance_service = 'Spree::Checkout::Advance'
+ @checkout_update_service = 'Spree::Checkout::Update'
+ @checkout_complete_service = 'Spree::Checkout::Complete'
+ @checkout_add_store_credit_service = 'Spree::Checkout::AddStoreCredit'
+ @checkout_remove_store_credit_service = 'Spree::Checkout::RemoveStoreCredit'
+ @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
+ @checkout_select_shipping_method_service = 'Spree::Checkout::SelectShippingMethod'
+
+ # order
+ @order_approve_service = 'Spree::Orders::Approve'
+ @order_cancel_service = 'Spree::Orders::Cancel'
+
+ # shipment
+ @shipment_change_state_service = 'Spree::Shipments::ChangeState'
+ @shipment_create_service = 'Spree::Shipments::Create'
+ @shipment_update_service = 'Spree::Shipments::Update'
+ @shipment_add_item_service = 'Spree::Shipments::AddItem'
+ @shipment_remove_item_service = 'Spree::Shipments::RemoveItem'
+
+ # sorter
+ @collection_sorter = 'Spree::BaseSorter'
+ @order_sorter = 'Spree::BaseSorter'
+ @products_sorter = 'Spree::Products::Sort'
+
+ # paginator
+ @collection_paginator = 'Spree::Shared::Paginate'
+
+ # coupons
+ # TODO: we should split this service into 2 separate - Add and Remove
+ @coupon_handler = 'Spree::PromotionHandler::Coupon'
+
+ # account
+ @account_create_service = 'Spree::Account::Create'
+ @account_update_service = 'Spree::Account::Update'
+
+ # addresses
+ @address_create_service = 'Spree::Addresses::Create'
+ @address_update_service = 'Spree::Addresses::Update'
+
+ # credit cards
+ @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
+
+ # classifications
+ @classification_reposition_service = 'Spree::Classifications::Reposition'
+
+ # line items
+ @line_item_create_service = 'Spree::LineItems::Create'
+ @line_item_update_service = 'Spree::LineItems::Update'
+ @line_item_destroy_service = 'Spree::LineItems::Destroy'
+
+ @payment_create_service = 'Spree::Payments::Create'
+
+ # errors
+ @error_handler = 'Spree::ErrorReporter'
+ end
+
+ def set_default_finders
+ @address_finder = 'Spree::Addresses::Find'
+ @country_finder = 'Spree::Countries::Find'
+ @cms_page_finder = 'Spree::CmsPages::Find'
+ @menu_finder = 'Spree::Menus::Find'
+ @current_order_finder = 'Spree::Orders::FindCurrent'
+ @current_store_finder = 'Spree::Stores::FindCurrent'
+ @completed_order_finder = 'Spree::Orders::FindComplete'
+ @credit_card_finder = 'Spree::CreditCards::Find'
+ @products_finder = 'Spree::Products::Find'
+ @taxon_finder = 'Spree::Taxons::Find'
+ @line_item_by_variant_finder = 'Spree::LineItems::FindByVariant'
+ end
+ end
+ end
+end
diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
index e5b3a095db..358669fcbd 100644
--- a/core/lib/spree/core/engine.rb
+++ b/core/lib/spree/core/engine.rb
@@ -1,3 +1,6 @@
+require_relative 'dependencies'
+require_relative 'configuration'
+
module Spree
module Core
class Engine < ::Rails::Engine
@@ -19,7 +22,7 @@ module Spree
end
initializer 'spree.environment', before: :load_config_initializers do |app|
- app.config.spree = Environment.new(SpreeCalculators.new, Spree::AppConfiguration.new, Spree::AppDependencies.new)
+ app.config.spree = Environment.new(SpreeCalculators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
Spree::Config = app.config.spree.preferences
Spree::Dependencies = app.config.spree.dependencies
end
diff --git a/core/app/models/spree/preferences/configuration.rb b/core/lib/spree/core/preferences/configuration.rb
similarity index 96%
rename from core/app/models/spree/preferences/configuration.rb
rename to core/lib/spree/core/preferences/configuration.rb
index 6cb22bf493..3bd90f8167 100644
--- a/core/app/models/spree/preferences/configuration.rb
+++ b/core/lib/spree/core/preferences/configuration.rb
@@ -20,6 +20,9 @@
# a.preferred_color
#
#
+
+require 'spree/core/preferences/preferable'
+
module Spree::Preferences
class Configuration
include Spree::Preferences::Preferable
diff --git a/core/app/models/spree/preferences/preferable.rb b/core/lib/spree/core/preferences/preferable.rb
similarity index 98%
rename from core/app/models/spree/preferences/preferable.rb
rename to core/lib/spree/core/preferences/preferable.rb
index b49c8e6cff..81e147ecde 100644
--- a/core/app/models/spree/preferences/preferable.rb
+++ b/core/lib/spree/core/preferences/preferable.rb
@@ -31,6 +31,9 @@
#
# # Save the changes. All handled by activerecord
# s.save!
+
+require 'spree/core/preferences/preferable_class_methods'
+
module Spree::Preferences::Preferable
extend ActiveSupport::Concern
diff --git a/core/app/models/spree/preferences/preferable_class_methods.rb b/core/lib/spree/core/preferences/preferable_class_methods.rb
similarity index 100%
rename from core/app/models/spree/preferences/preferable_class_methods.rb
rename to core/lib/spree/core/preferences/preferable_class_methods.rb
diff --git a/core/app/models/spree/preferences/scoped_store.rb b/core/lib/spree/core/preferences/scoped_store.rb
similarity index 100%
rename from core/app/models/spree/preferences/scoped_store.rb
rename to core/lib/spree/core/preferences/scoped_store.rb
diff --git a/core/app/models/spree/preferences/store.rb b/core/lib/spree/core/preferences/store.rb
similarity index 100%
rename from core/app/models/spree/preferences/store.rb
rename to core/lib/spree/core/preferences/store.rb
diff --git a/core/spec/models/spree/app_configuration_spec.rb b/core/spec/models/spree/app_configuration_spec.rb
index e2a21f456a..92a689b4ec 100644
--- a/core/spec/models/spree/app_configuration_spec.rb
+++ b/core/spec/models/spree/app_configuration_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Spree::AppConfiguration, type: :model do
+describe Spree::Core::Configuration, type: :model do
let (:prefs) { Rails.application.config.spree.preferences }
it 'uses base searcher class by default' do
diff --git a/core/spec/models/spree/app_dependencies_spec.rb b/core/spec/models/spree/app_dependencies_spec.rb
index 480cfdb49c..115cbf36ea 100644
--- a/core/spec/models/spree/app_dependencies_spec.rb
+++ b/core/spec/models/spree/app_dependencies_spec.rb
@@ -3,8 +3,8 @@ require 'spec_helper'
class MyCustomCreateService
end
-describe Spree::AppDependencies, type: :model do
- let (:deps) { Spree::AppDependencies.new }
+describe Spree::Core::Dependencies, type: :model do
+ let (:deps) { described_class.new }
it 'returns the default value' do
expect(deps.cart_create_service).to eq('Spree::Cart::Create')