spree_api 3.7.0.rc2 → 3.7.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27ba29a8ab5de5c7606f6707d735c73063ee4525961d8e22906b9145af89a9de
-  data.tar.gz: 4cc4d78e86ac737ce57d57c27a72f9759038edd6196b9315debdd9dda0cdc31f
+  metadata.gz: bb5034c1887c750d3b1437db3d0a922dc85a2b918362398e5fd09d23ad53cad0
+  data.tar.gz: 8bc92a25c619d9569861bdf0c2bb95a95fbfc06ad1776eb47c80d734c01e4a47
 SHA512:
-  metadata.gz: 1fb141c57d7361926931e1a812273bbbee9f632fa2a8ff0755229b1abd0dfedcd36f504676516410f136190de522415c0f8e2497ad93936a4d774a67fa0c1fff
-  data.tar.gz: c8f51c67395b4b68133b856e9844b216cbfed071d0de7a4ae0a7a4053e4ac0053bfd5ba30fc95e46edf1532a3be220e951ae06c90f4b8700c574e2bdaca4b703
+  metadata.gz: deed5581a6699910b7ef95e4f3674f1c090a1a0a2f54e47f0f2789b9962a9dd596d7c94416222ccc871a99756037601b4587f0bab673e33cb60323f38c4f47ae
+  data.tar.gz: ee2ae411b29c449168adf4d8ebf9226500fd8414638ac4c9e29daa921483f408de143e0cbbddc85a46e88aa14a99beab8071f30b7b4ed1d847a420d16a9942d2

data/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb

@@ -26,7 +26,7 @@ module Spree
           end
 
           def find_spree_current_order
-            Spree::Orders::FindCurrent.new.execute(
+            Spree::Api::Dependencies.storefront_current_order_finder.constantize.new.execute(
               store: spree_current_store,
               user: spree_current_user,
               token: order_token,
@@ -35,7 +35,7 @@ module Spree
           end
 
           def serialize_order(order)
-            dependencies[:cart_serializer].new(order.reload, include: resource_includes, fields: sparse_fields).serializable_hash
+            resource_serializer.new(order.reload, include: resource_includes, fields: sparse_fields).serializable_hash
           end
 
           def serialized_current_order

data/app/controllers/spree/api/base_controller.rb

@@ -107,7 +107,7 @@ module Spree
       end
 
       def current_ability
-        Spree::Ability.new(current_api_user)
+        Spree::Dependencies.ability_class.constantize.new(current_api_user)
       end
 
       def invalid_resource!(resource)

data/app/controllers/spree/api/v1/line_items_controller.rb

@@ -11,10 +11,10 @@ module Spree
         def create
           variant = Spree::Variant.find(params[:line_item][:variant_id])
 
-          @line_item = Spree::Cart::AddItem.call(order: order,
-                                                 variant: variant,
-                                                 quantity: params[:line_item][:quantity],
-                                                 options: line_item_params[:options]).value
+          @line_item = Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
+                                                                                  variant: variant,
+                                                                                  quantity: params[:line_item][:quantity],
+                                                                                  options: line_item_params[:options]).value
           if @line_item.errors.empty?
             respond_with(@line_item, status: 201, default_template: :show)
           else
@@ -25,7 +25,7 @@ module Spree
         def update
           @line_item = find_line_item
 
-          if Spree::Cart::Update.call(order: @order, params: line_items_attributes).success?
+          if Spree::Dependencies.cart_update_service.constantize.call(order: @order, params: line_items_attributes).success?
             @line_item.reload
             respond_with(@line_item, default_template: :show)
           else
@@ -35,7 +35,7 @@ module Spree
 
         def destroy
           @line_item = find_line_item
-          Spree::Cart::RemoveLineItem.new.call(order: @order, line_item: @line_item)
+          Spree::Dependencies.cart_remove_line_item_service.constantize.call(order: @order, line_item: @line_item)
 
           respond_with(@line_item, status: 204)
         end

data/app/controllers/spree/api/v1/shipments_controller.rb

@@ -25,10 +25,10 @@ module Spree
           quantity = params[:quantity].to_i
           @shipment = @order.shipments.create(stock_location_id: params.fetch(:stock_location_id))
 
-          @line_item = Spree::Cart::AddItem.call(order: @order,
-                                                 variant: variant,
-                                                 quantity: quantity,
-                                                 options: { shipment: @shipment }).value
+          @line_item = Spree::Dependencies.cart_add_item_service.constantize.call(order: @order,
+                                                                                  variant: variant,
+                                                                                  quantity: quantity,
+                                                                                  options: { shipment: @shipment }).value
 
           respond_with(@shipment.reload, default_template: :show)
         end
@@ -59,10 +59,10 @@ module Spree
         def add
           quantity = params[:quantity].to_i
 
-          Spree::Cart::AddItem.call(order: @shipment.order,
-                                    variant: variant,
-                                    quantity: quantity,
-                                    options: { shipment: @shipment })
+          Spree::Dependencies.cart_add_item_service.constantize.call(order: @shipment.order,
+                                                                     variant: variant,
+                                                                     quantity: quantity,
+                                                                     options: { shipment: @shipment })
 
           respond_with(@shipment, default_template: :show)
         end
@@ -74,7 +74,10 @@ module Spree
                        @shipment.inventory_units_for(variant).sum(:quantity)
                      end
 
-          Spree::Cart::RemoveItem.call(order: @shipment.order, variant: variant, quantity: quantity, options: { shipment: @shipment })
+          Spree::Dependencies.cart_remove_item_service.constantize.call(order: @shipment.order,
+                                                                        variant: variant,
+                                                                        quantity: quantity,
+                                                                        options: { shipment: @shipment })
 
           if @shipment.inventory_units.any?
             @shipment.reload

data/app/controllers/spree/api/v2/base_controller.rb

@@ -9,6 +9,10 @@ module Spree
 
         private
 
+        def collection_paginator
+          Spree::Api::Dependencies.storefront_collection_paginator.constantize
+        end
+
         def render_serialized_payload(status = 200)
           render json: yield, status: status
         rescue ArgumentError => exception
@@ -41,7 +45,7 @@ module Spree
 
         # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Ability.new(spree_current_user)
+          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(spree_current_user)
         end
 
         def request_includes

data/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb

@@ -17,19 +17,23 @@ module Spree
             private
 
             def resource
-              dependencies[:resource_finder].new.execute(scope: scope, params: params)
+              resource_finder.new.execute(scope: scope, params: params)
             end
 
-            def dependencies
-              {
-                resource_finder: Spree::CreditCards::Find,
-                collection_serializer: Spree::V2::Storefront::CreditCardSerializer,
-                resource_serializer: Spree::V2::Storefront::CreditCardSerializer
-              }
+            def collection_serializer
+              Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
+            end
+
+            def resource_serializer
+              Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
+            end
+
+            def resource_finder
+              Spree::Api::Dependencies.storefront_credit_card_finder.constantize
             end
 
             def serialize_collection(collection)
-              dependencies[:collection_serializer].new(
+              collection_serializer.new(
                 collection,
                 include: resource_includes,
                 fields: sparse_fields
@@ -37,7 +41,7 @@ module Spree
             end
 
             def serialize_resource(resource)
-              dependencies[:resource_serializer].new(
+              resource_serializer.new(
                 resource,
                 include: resource_includes,
                 fields: sparse_fields

data/app/controllers/spree/api/v2/storefront/account/orders_controller.rb

@@ -20,48 +20,61 @@ module Spree
             private
 
             def paginated_collection
-              dependencies[:collection_paginator].new(sorted_collection, params).call
+              collection_paginator.new(sorted_collection, params).call
             end
 
             def sorted_collection
-              dependencies[:collection_sorter].new(collection, params).call
+              collection_sorter.new(collection, params).call
             end
 
             def collection
-              dependencies[:collection_finder].new(user: spree_current_user).execute
+              collection_finder.new(user: spree_current_user).execute
             end
 
             def resource
-              resource = dependencies[:resource_finder].new(user: spree_current_user, number: params[:id]).execute.take
+              resource = resource_finder.new(user: spree_current_user, number: params[:id]).execute.take
               raise ActiveRecord::RecordNotFound if resource.nil?
 
               resource
             end
 
             def serialize_collection(collection)
-              dependencies[:collection_serializer].new(
+              collection_serializer.new(
                 collection,
                 collection_options(collection)
               ).serializable_hash
             end
 
             def serialize_resource(resource)
-              dependencies[:resource_serializer].new(
+              resource_serializer.new(
                 resource,
                 include: resource_includes,
                 sparse_fields: sparse_fields
               ).serializable_hash
             end
 
-            def dependencies
-              {
-                collection_sorter: Spree::Orders::Sort,
-                resource_finder: Spree::Orders::FindComplete,
-                resource_serializer: Spree::V2::Storefront::CartSerializer,
-                collection_serializer: Spree::V2::Storefront::CartSerializer,
-                collection_finder: Spree::Orders::FindComplete,
-                collection_paginator: Spree::Shared::Paginate
-              }
+            def collection_serializer
+              Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            end
+
+            def resource_serializer
+              Spree::Api::Dependencies.storefront_cart_serializer.constantize
+            end
+
+            def collection_finder
+              Spree::Api::Dependencies.storefront_completed_order_finder.constantize
+            end
+
+            def resource_finder
+              Spree::Api::Dependencies.storefront_completed_order_finder.constantize
+            end
+
+            def collection_sorter
+              Spree::Api::Dependencies.storefront_order_sorter.constantize
+            end
+
+            def collection_paginator
+              Spree::Api::Dependencies.storefront_collection_paginator.constantize
             end
 
             def collection_options(collection)

data/app/controllers/spree/api/v2/storefront/account_controller.rb

@@ -16,15 +16,15 @@ module Spree
           end
 
           def serialize_resource(resource)
-            dependencies[:resource_serializer].new(
+            resource_serializer.new(
               resource,
               include: resource_includes,
               fields: sparse_fields
             ).serializable_hash
           end
 
-          def dependencies
-            { resource_serializer: Spree::V2::Storefront::UserSerializer }
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_user_serializer.constantize
           end
         end
       end

data/app/controllers/spree/api/v2/storefront/cart_controller.rb

@@ -16,7 +16,7 @@ module Spree
             }
 
             order   = spree_current_order if spree_current_order.present?
-            order ||= dependencies[:create_cart].call(order_params).value
+            order ||= create_service.call(order_params).value
 
             render_serialized_payload(201) { serialize_order(order) }
           end
@@ -27,7 +27,7 @@ module Spree
             spree_authorize! :update, spree_current_order, order_token
             spree_authorize! :show, variant
 
-            result = dependencies[:add_item_to_cart].call(
+            result = add_item_service.call(
               order: spree_current_order,
               variant: variant,
               quantity: params[:quantity],
@@ -40,7 +40,7 @@ module Spree
           def remove_line_item
             spree_authorize! :update, spree_current_order, order_token
 
-            dependencies[:remove_item_from_cart].call(
+            remove_line_item_service.call(
               order: spree_current_order,
               line_item: line_item
             )
@@ -51,6 +51,8 @@ module Spree
           def empty
             spree_authorize! :update, spree_current_order, order_token
 
+            # TODO: we should extract this logic into service and let
+            # developers overwrite it
             spree_current_order.empty!
 
             render_serialized_payload { serialized_current_order }
@@ -61,7 +63,7 @@ module Spree
 
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:set_item_quantity].call(order: spree_current_order, line_item: line_item, quantity: params[:quantity])
+            result = set_item_quantity_service.call(order: spree_current_order, line_item: line_item, quantity: params[:quantity])
 
             render_order(result)
           end
@@ -76,7 +78,7 @@ module Spree
             spree_authorize! :update, spree_current_order, order_token
 
             spree_current_order.coupon_code = params[:coupon_code]
-            result = dependencies[:coupon_handler].new(spree_current_order).apply
+            result = coupon_handler.new(spree_current_order).apply
 
             if result.error.blank?
               render_serialized_payload { serialized_current_order }
@@ -88,7 +90,7 @@ module Spree
           def remove_coupon_code
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:coupon_handler].new(spree_current_order).remove(params[:coupon_code])
+            result = coupon_handler.new(spree_current_order).remove(params[:coupon_code])
 
             if result.error.blank?
               render_serialized_payload { serialized_current_order }
@@ -99,15 +101,28 @@ module Spree
 
           private
 
-          def dependencies
-            {
-              create_cart: Spree::Cart::Create,
-              add_item_to_cart: Spree::Cart::AddItem,
-              remove_item_from_cart: Spree::Cart::RemoveLineItem,
-              cart_serializer: Spree::V2::Storefront::CartSerializer,
-              set_item_quantity: Spree::Cart::SetQuantity,
-              coupon_handler: Spree::PromotionHandler::Coupon
-            }
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+          end
+
+          def create_service
+            Spree::Api::Dependencies.storefront_cart_create_service.constantize
+          end
+
+          def add_item_service
+            Spree::Api::Dependencies.storefront_cart_add_item_service.constantize
+          end
+
+          def set_item_quantity_service
+            Spree::Api::Dependencies.storefront_cart_set_item_quantity_service.constantize
+          end
+
+          def remove_line_item_service
+            Spree::Api::Dependencies.storefront_cart_remove_line_item_service.constantize
+          end
+
+          def coupon_handler
+            Spree::Api::Dependencies.storefront_coupon_handler.constantize
           end
 
           def line_item

data/app/controllers/spree/api/v2/storefront/checkout_controller.rb

@@ -9,7 +9,7 @@ module Spree
           def next
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:next_state_handler].call(order: spree_current_order)
+            result = next_service.call(order: spree_current_order)
 
             render_order(result)
           end
@@ -17,7 +17,7 @@ module Spree
           def advance
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:advance_handler].call(order: spree_current_order)
+            result = advance_service.call(order: spree_current_order)
 
             render_order(result)
           end
@@ -25,7 +25,7 @@ module Spree
           def complete
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:completer].call(order: spree_current_order)
+            result = complete_service.call(order: spree_current_order)
 
             render_order(result)
           end
@@ -33,10 +33,11 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:updater].call(
+            result = update_service.call(
               order: spree_current_order,
               params: params,
-              permitted_attributes: dependencies[:permitted_attributes],
+              # defined in https://github.com/spree/spree/blob/master/core/lib/spree/core/controller_helpers/strong_parameters.rb#L19
+              permitted_attributes: permitted_checkout_attributes,
               request_env: request.headers.env
             )
 
@@ -46,7 +47,7 @@ module Spree
           def add_store_credit
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:add_store_credit_handler].call(
+            result = add_store_credit_service.call(
               order: spree_current_order,
               amount: params[:amount].try(:to_f)
             )
@@ -57,12 +58,12 @@ module Spree
           def remove_store_credit
             spree_authorize! :update, spree_current_order, order_token
 
-            result = dependencies[:remove_store_credit_handler].call(order: spree_current_order)
+            result = remove_store_credit_service.call(order: spree_current_order)
             render_order(result)
           end
 
           def shipping_rates
-            result = dependencies[:shipping_rates_getter].call(order: spree_current_order)
+            result = shipping_rates_service.call(order: spree_current_order)
 
             render_serialized_payload { serialize_shipping_rates(result.value) }
           end
@@ -73,29 +74,52 @@ module Spree
 
           private
 
-          def dependencies
-            {
-              next_state_handler: Spree::Checkout::Next,
-              advance_handler: Spree::Checkout::Advance,
-              add_store_credit_handler: Spree::Checkout::AddStoreCredit,
-              remove_store_credit_handler: Spree::Checkout::RemoveStoreCredit,
-              completer: Spree::Checkout::Complete,
-              updater: Spree::Checkout::Update,
-              cart_serializer: Spree::V2::Storefront::CartSerializer,
-              payment_methods_serializer: Spree::V2::Storefront::PaymentMethodSerializer,
-              shipping_rates_getter: Spree::Checkout::GetShippingRates,
-              shipping_rates_serializer: Spree::V2::Storefront::ShipmentSerializer,
-              # defined in https://github.com/spree/spree/blob/master/core/lib/spree/core/controller_helpers/strong_parameters.rb#L19
-              permitted_attributes: permitted_checkout_attributes
-            }
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_cart_serializer.constantize
+          end
+
+          def next_service
+            Spree::Api::Dependencies.storefront_checkout_next_service.constantize
+          end
+
+          def advance_service
+            Spree::Api::Dependencies.storefront_checkout_advance_service.constantize
+          end
+
+          def add_store_credit_service
+            Spree::Api::Dependencies.storefront_checkout_add_store_credit_service.constantize
+          end
+
+          def remove_store_credit_service
+            Spree::Api::Dependencies.storefront_checkout_remove_store_credit_service.constantize
+          end
+
+          def complete_service
+            Spree::Api::Dependencies.storefront_checkout_complete_service.constantize
+          end
+
+          def update_service
+            Spree::Api::Dependencies.storefront_checkout_update_service.constantize
+          end
+
+          def payment_methods_serializer
+            Spree::Api::Dependencies.storefront_payment_method_serializer.constantize
+          end
+
+          def shipping_rates_service
+            Spree::Api::Dependencies.storefront_checkout_get_shipping_rates_service.constantize
+          end
+
+          def shipping_rates_serializer
+            Spree::Api::Dependencies.storefront_shipment_serializer.constantize
           end
 
           def serialize_payment_methods(payment_methods)
-            dependencies[:payment_methods_serializer].new(payment_methods).serializable_hash
+            payment_methods_serializer.new(payment_methods).serializable_hash
           end
 
           def serialize_shipping_rates(shipments)
-            dependencies[:shipping_rates_serializer].new(
+            shipping_rates_serializer.new(
               shipments,
               include: [:shipping_rates],
               params: { show_rates: true }

data/app/controllers/spree/api/v2/storefront/countries_controller.rb

@@ -16,11 +16,11 @@ module Spree
           private
 
           def serialize_collection(collection)
-            dependencies[:collection_serializer].new(collection).serializable_hash
+            collection_serializer.new(collection).serializable_hash
           end
 
           def serialize_resource(resource)
-            dependencies[:resource_serializer].new(
+            resource_serializer.new(
               resource,
               include: resource_includes,
               fields: sparse_fields,
@@ -29,7 +29,7 @@ module Spree
           end
 
           def collection
-            dependencies[:collection_finder].new(scope, params).call
+            collection_finder.new(scope, params).call
           end
 
           def resource
@@ -39,12 +39,16 @@ module Spree
               scope.find_by(iso3: params[:iso]&.upcase)
           end
 
-          def dependencies
-            {
-              collection_serializer: Spree::V2::Storefront::CountrySerializer,
-              resource_serializer: Spree::V2::Storefront::CountrySerializer,
-              collection_finder: Spree::Countries::Find
-            }
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_country_serializer.constantize
+          end
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_country_serializer.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_country_finder.constantize
           end
 
           def scope

data/app/controllers/spree/api/v2/storefront/products_controller.rb

@@ -16,14 +16,14 @@ module Spree
           private
 
           def serialize_collection(collection)
-            dependencies[:collection_serializer].new(
+            collection_serializer.new(
               collection,
               collection_options(collection)
             ).serializable_hash
           end
 
           def serialize_resource(resource)
-            dependencies[:resource_serializer].new(
+            resource_serializer.new(
               resource,
               include: resource_includes,
               fields: sparse_fields
@@ -31,29 +31,35 @@ module Spree
           end
 
           def paginated_collection
-            dependencies[:collection_paginator].new(sorted_collection, params).call
+            collection_paginator.new(sorted_collection, params).call
           end
 
           def sorted_collection
-            dependencies[:collection_sorter].new(collection, params, current_currency).call
+            collection_sorter.new(collection, params, current_currency).call
           end
 
           def collection
-            dependencies[:collection_finder].new(scope: scope, params: params, current_currency: current_currency).execute
+            collection_finder.new(scope: scope, params: params, current_currency: current_currency).execute
           end
 
           def resource
             scope.find_by(slug: params[:id]) || scope.find(params[:id])
           end
 
-          def dependencies
-            {
-              collection_sorter: Spree::Products::Sort,
-              collection_finder: Spree::Products::Find,
-              collection_paginator: Spree::Shared::Paginate,
-              collection_serializer: Spree::V2::Storefront::ProductSerializer,
-              resource_serializer: Spree::V2::Storefront::ProductSerializer
-            }
+          def collection_sorter
+            Spree::Api::Dependencies.storefront_products_sorter.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_products_finder.constantize
+          end
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_product_serializer.constantize
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_product_serializer.constantize
           end
 
           def collection_options(collection)

data/app/controllers/spree/api/v2/storefront/taxons_controller.rb

@@ -16,27 +16,30 @@ module Spree
           private
 
           def serialize_collection(collection)
-            dependencies[:collection_serializer].new(
+            collection_serializer.new(
               collection,
               collection_options(collection)
             ).serializable_hash
           end
 
           def serialize_resource(resource)
-            dependencies[:resource_serializer].new(
+            resource_serializer.new(
               resource,
               include: resource_includes,
               fields: sparse_fields
             ).serializable_hash
           end
 
-          def dependencies
-            {
-              collection_finder: Spree::Taxons::Find,
-              collection_paginator: Spree::Shared::Paginate,
-              collection_serializer: Spree::V2::Storefront::TaxonSerializer,
-              resource_serializer: Spree::V2::Storefront::TaxonSerializer
-            }
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_taxon_serializer.constantize
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_taxon_serializer.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_taxon_finder.constantize
           end
 
           def collection_options(collection)
@@ -49,11 +52,11 @@ module Spree
           end
 
           def paginated_collection
-            dependencies[:collection_paginator].new(collection, params).call
+            collection_paginator.new(collection, params).call
           end
 
           def collection
-            dependencies[:collection_finder].new(scope: scope, params: params).execute
+            collection_finder.new(scope: scope, params: params).execute
           end
 
           def resource

data/app/models/spree/api_dependencies.rb

@@ -0,0 +1,77 @@
+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_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_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
+    ].freeze
+
+    attr_accessor *INJECTION_POINTS
+
+    def initialize
+      set_storefront_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
+
+      # 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
+
+      # serializers
+      @storefront_cart_serializer = 'Spree::V2::Storefront::CartSerializer'
+      @storefront_credit_card_serializer = 'Spree::V2::Storefront::CreditCardSerializer'
+      @storefront_country_serializer = 'Spree::V2::Storefront::CountrySerializer'
+      @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_product_serializer = 'Spree::V2::Storefront::ProductSerializer'
+
+      # sorters
+      @storefront_order_sorter = Spree::Dependencies.order_sorter
+      @storefront_products_sorter = Spree::Dependencies.products_sorter
+
+      # paginators
+      @storefront_collection_paginator = Spree::Dependencies.collection_paginator
+
+      # finders
+      @storefront_country_finder = Spree::Dependencies.country_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
+    end
+  end
+end

data/lib/spree/api/engine.rb

@@ -37,6 +37,7 @@ module Spree
 
       initializer 'spree.api.environment', before: :load_config_initializers do |_app|
         Spree::Api::Config = Spree::ApiConfiguration.new
+        Spree::Api::Dependencies = Spree::ApiDependencies.new
       end
 
       initializer 'spree.api.checking_migrations' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.7.0.rc2
+  version: 3.7.0.rc3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0.rc2
+        version: 3.7.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0.rc2
+        version: 3.7.0.rc3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - app/models/doorkeeper/access_token_decorator.rb
 - app/models/doorkeeper/application_decorator.rb
 - app/models/spree/api_configuration.rb
+- app/models/spree/api_dependencies.rb
 - app/serializers/spree/v2/storefront/address_serializer.rb
 - app/serializers/spree/v2/storefront/base_serializer.rb
 - app/serializers/spree/v2/storefront/cart_serializer.rb
@@ -323,8 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Spree's API