spree_core 3.7.0.rc2 → 3.7.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7124c86a59c0fdd43a117c2765d9d7253de04054cef1c787934ce48abf06c9c
-  data.tar.gz: 3c00c9709cd38461a3aeeff347a2377482766c54501d3a91bf8cc429d043a52c
+  metadata.gz: 4d67e4411295bf73afd62309af2b92174e0cbf53d5fde6cb708556176ca7e061
+  data.tar.gz: 779f22575add68337aa6e33ecff55452776c125a3f587d4cf481743d294ab9a5
 SHA512:
-  metadata.gz: 33c2354b25887911fef568f618c9d0316cfbda57bb0839ab2b3172e7a8f72ba798b8fce7bc7e2354ca2c913444647b2b44c885cd60a605196279ada234fd3242
-  data.tar.gz: d62478a37f518d87cf21a7caec39d9a12314c1532bfa7cba161a5c1945077588ddec70ff741ba77445bd9c7290021853809accc423abf0f4c606ce9b1904607c
+  metadata.gz: 47b6cf3807d3cf870548cb82aae5ceaf7d9befe5e41a784ff63cb319126c5aa4c58a250a12b2de2666f65b3d7b850e9a996173cb1160d36caa483372c35d2bbd
+  data.tar.gz: 513adfbb880c88d13db7aaf1b60bb1d624195c030e6205279fea2f82b4cc2d6fd7303189d8c826927c27584052eda38321753b032b9c31d6e021bcd16cfb5dc9

data/app/finders/spree/line_items/find_by_variant.rb

@@ -5,7 +5,7 @@ module Spree
         order.line_items.detect do |line_item|
           next unless line_item.variant_id == variant.id
 
-          CompareLineItems.new.call(order: order, line_item: line_item, options: options).value
+          Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: order, line_item: line_item, options: options).value
         end
       end
     end

data/app/helpers/spree/base_helper.rb

@@ -1,12 +1,12 @@
 module Spree
   module BaseHelper
     def available_countries
-      checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
+      checkout_zone = Spree::Zone.find_by(name: Spree::Config[:checkout_zone])
 
       countries = if checkout_zone && checkout_zone.kind == 'country'
                     checkout_zone.country_list
                   else
-                    Country.all
+                    Spree::Country.all
                   end
 
       countries.collect do |country|

data/app/models/spree/app_dependencies.rb

@@ -0,0 +1,73 @@
+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,
+      :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, :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
+    ].freeze
+
+    attr_accessor *INJECTION_POINTS
+
+    def initialize
+      set_default_abitily
+      set_default_services
+      set_default_finders
+    end
+
+    private
+
+    def set_default_abitily
+      @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'
+
+      # 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'
+
+      # sorter
+      @order_sorter = 'Spree::Orders::Sort'
+      @products_sorter = 'Spree::Products::Sort'
+
+      # paginator
+      @collection_paginator = 'Spree::Shared::Paginate'
+
+      # coupons
+      # TODO: we should split this service into 2 seperate - Add and Remove
+      @coupon_handler = 'Spree::PromotionHandler::Coupon'
+    end
+
+    def set_default_finders
+      @country_finder = 'Spree::Countries::Find'
+      @current_order_finder = 'Spree::Orders::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

data/app/models/spree/order.rb

@@ -335,7 +335,7 @@ module Spree
       EOS
       return true unless options
 
-      CompareLineItems.new.call(order: self, line_item: line_item, options: options).value
+      Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: self, line_item: line_item, options: options).value
     end
 
     # Creates new tax charges if there are any applicable rates. If prices already

data/app/models/spree/order_contents.rb

@@ -8,20 +8,29 @@ module Spree
 
     def add(variant, quantity = 1, options = {})
       ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        OrderContents#add method is deprecated and will be removed in Spree 4.0. Please use Spree::Cart::AddItem service
+        OrderContents#add method is deprecated and will be removed in Spree 4.0.
+        Please use Spree::Dependencies.cart_add_item_service
         to add items to cart.
       EOS
 
-      Spree::Cart::AddItem.call(order: order, variant: variant, quantity: quantity, options: options).value
+      Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
+                                                                 variant: variant,
+                                                                 quantity: quantity,
+                                                                 options: options).value
     end
 
     def remove(variant, quantity = 1, options = {})
       ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        OrderContents#remove method is deprecated and will be removed in Spree 4.0. Please use Spree::Cart::RemoveItem
+        OrderContents#remove method is deprecated and will be removed in Spree 4.0.
+        Please use Spree::Dependencies.cart_remove_item_service
         service to remove item from cart.
       EOS
 
-      Spree::Cart::RemoveItem.call(order: order, variant: variant, quantity: quantity, options: options).value
+      # change this dependencies to Spree::Cart::RemoveItem
+      Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
+                                                                    variant: variant,
+                                                                    quantity: quantity,
+                                                                    options: options).value
     end
 
     def remove_line_item(line_item, options = {})
@@ -34,11 +43,12 @@ module Spree
 
     def update_cart(params)
       ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        OrderContents#update_cart method is deprecated and will be removed in Spree 4.0. Please use Spree::Cart::Update
+        OrderContents#update_cart method is deprecated and will be removed in Spree 4.0.
+        Spree::Dependencies.cart_update_service
         service to update cart.
       EOS
 
-      Spree::Cart::Update.call(order: order, params: params).value
+      Spree::Dependencies.cart_update_service.constantize.call(order: order, params: params).value
     end
   end
 end

data/app/models/spree/order_merger.rb

@@ -29,7 +29,9 @@ module Spree
     def find_matching_line_item(other_order_line_item)
       order.line_items.detect do |my_li|
         my_li.variant == other_order_line_item.variant &&
-          CompareLineItems.new.call(order: order, line_item: my_li, options: other_order_line_item.serializable_hash).value
+          Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: order,
+                                                                                   line_item: my_li,
+                                                                                   options: other_order_line_item.serializable_hash).value
       end
     end
 

data/app/models/spree/promotion/actions/create_line_items.rb

@@ -42,10 +42,12 @@ module Spree
           action_taken = false
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
-            if current_quantity < item.quantity && item_available?(item)
-              line_item = Spree::Cart::AddItem.call(order: order, variant: item.variant, quantity: item.quantity - current_quantity).value
-              action_taken = true if line_item.try(:valid?)
-            end
+            next unless current_quantity < item.quantity && item_available?(item)
+
+            line_item = Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
+                                                                                   variant: item.variant,
+                                                                                   quantity: item.quantity - current_quantity).value
+            action_taken = true if line_item.try(:valid?)
           end
           action_taken
         end
@@ -63,7 +65,9 @@ module Spree
             line_item = order.find_line_item_by_variant(item.variant)
             next unless line_item.present?
 
-            Spree::Cart::RemoveItem.call(order: order, variant: item.variant, quantity: (item.quantity || 1))
+            Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
+                                                                          variant: item.variant,
+                                                                          quantity: (item.quantity || 1))
             action_taken = true
           end
 

data/app/models/spree/promotion_handler/coupon.rb

@@ -76,7 +76,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          order.contents.remove(item.variant, item.quantity)
+          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/app/services/spree/cart/add_item.rb

@@ -6,7 +6,7 @@ module Spree
       def call(order:, variant:, quantity: nil, options: {})
         ApplicationRecord.transaction do
           run :add_to_line_item
-          run Spree::Cart::Recalculate
+          run Spree::Dependencies.cart_recalculate_service.constantize
         end
       end
 
@@ -16,7 +16,7 @@ module Spree
         options ||= {}
         quantity ||= 1
 
-        line_item = Spree::LineItems::FindByVariant.new.execute(order: order, variant: variant, options: options)
+        line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
 
         line_item_created = line_item.nil?
         if line_item.nil?

data/app/services/spree/cart/create.rb

@@ -10,7 +10,7 @@ module Spree
           user: user,
           store: store,
           currency: currency,
-          token: GenerateToken.new.call(Spree::Order)
+          token: Spree::GenerateToken.new.call(Spree::Order)
         }
 
         order = Spree::Order.create!(default_params.merge(order_params))

data/app/services/spree/cart/remove_item.rb

@@ -9,7 +9,9 @@ module Spree
 
         ActiveRecord::Base.transaction do
           line_item = remove_from_line_item(order: order, variant: variant, quantity: quantity, options: options)
-          Spree::Cart::Recalculate.new.call(line_item: line_item, order: order, options: options)
+          Spree::Dependencies.cart_recalculate_service.constantize.call(line_item: line_item,
+                                                                        order: order,
+                                                                        options: options)
           success(line_item)
         end
       end
@@ -17,7 +19,7 @@ module Spree
       private
 
       def remove_from_line_item(order:, variant:, quantity:, options:)
-        line_item = Spree::LineItems::FindByVariant.new.execute(order: order, variant: variant, options: options)
+        line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
 
         raise ActiveRecord::RecordNotFound if line_item.nil?
 

data/app/services/spree/cart/remove_line_item.rb

@@ -7,7 +7,9 @@ module Spree
         options ||= {}
         ActiveRecord::Base.transaction do
           line_item.destroy!
-          Spree::Cart::Recalculate.new.call(order: order, line_item: line_item, options: options)
+          Spree::Dependencies.cart_recalculate_service.constantize.new.call(order: order,
+                                                                            line_item: line_item,
+                                                                            options: options)
         end
         success(line_item)
       end

data/app/services/spree/cart/set_quantity.rb

@@ -6,7 +6,7 @@ module Spree
       def call(order:, line_item:, quantity: nil)
         ActiveRecord::Base.transaction do
           run :change_item_quantity
-          run Spree::Cart::Recalculate
+          run Spree::Dependencies.cart_recalculate_service.constantize
         end
       end
 

data/app/services/spree/checkout/advance.rb

@@ -4,7 +4,7 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:)
-        Spree::Checkout::Next.call(order: order) until cannot_make_transition?(order)
+        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until cannot_make_transition?(order)
         success(order)
       end
 

data/app/services/spree/checkout/complete.rb

@@ -4,7 +4,7 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:)
-        Spree::Checkout::Next.call(order: order) until cannot_make_transition?(order)
+        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until cannot_make_transition?(order)
 
         if order.reload.complete?
           success(order)

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -15,4 +15,16 @@ Spree.config do |config|
   # config.track_inventory_levels = false
 end
 
-Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>
+# Configure Spree Dependencies
+#
+# Note: If a dependency is set here it will NOT be stored within the cache & database upon initialization.
+#       Just removing an entry from this initializer will make the dependency value go away.
+#
+Spree.dependencies do |dependencies|
+  # Example:
+  # Uncomment to change the default Service handling adding Items to Cart
+  # dependencies.cart_add_item_service = 'MyNewAwesomeService'
+end
+
+
+Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/spree/core/controller_helpers/auth.rb

@@ -16,7 +16,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(try_spree_current_user)
+          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user)
         end
 
         def redirect_back_or_default(default)

data/lib/spree/core/engine.rb

@@ -1,7 +1,14 @@
 module Spree
   module Core
     class Engine < ::Rails::Engine
-      Environment = Struct.new(:calculators, :preferences, :payment_methods, :adjusters, :stock_splitters, :promotions, :line_item_comparison_hooks)
+      Environment = Struct.new(:calculators,
+                               :preferences,
+                               :dependencies,
+                               :payment_methods,
+                               :adjusters,
+                               :stock_splitters,
+                               :promotions,
+                               :line_item_comparison_hooks)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       isolate_namespace Spree
@@ -12,8 +19,9 @@ module Spree
       end
 
       initializer 'spree.environment', before: :load_config_initializers do |app|
-        app.config.spree = Environment.new(SpreeCalculators.new, Spree::AppConfiguration.new)
+        app.config.spree = Environment.new(SpreeCalculators.new, Spree::AppConfiguration.new, Spree::AppDependencies.new)
         Spree::Config = app.config.spree.preferences
+        Spree::Dependencies = app.config.spree.dependencies
       end
 
       initializer 'spree.register.calculators' do |app|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.7.0.rc2'
+    '3.7.0.rc3'
   end
 end

data/lib/spree/core.rb

@@ -59,6 +59,20 @@ module Spree
     yield(Spree::Config)
   end
 
+  # Used to set dependencies for Spree.
+  #
+  # Example:
+  #
+  #   Spree.dependencies do |dependency|
+  #     dependency.cart_add_item_service = MyCustomAddToCart
+  #   end
+  #
+  # This method is defined within the core gem on purpose.
+  # Some people may only wish to use the Core part of Spree.
+  def self.dependencies
+    yield(Spree::Dependencies)
+  end
+
   module Core
     autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'
@@ -79,6 +93,7 @@ require 'spree/localized_number'
 require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'
+require 'spree/dependencies_helper'
 
 require 'spree/core/importer'
 require 'spree/core/query_filters'

data/lib/spree/dependencies_helper.rb

@@ -0,0 +1,11 @@
+module Spree
+  module DependenciesHelper
+    def current_values
+      values = []
+      self.class::INJECTION_POINTS.each do |injection_point|
+        values << { injection_point.to_s => instance_variable_get("@#{injection_point}") }
+      end
+      values
+    end
+  end
+end

data/lib/spree/testing_support/capybara_ext.rb

@@ -135,7 +135,9 @@ module CapybaraExt
   def spree_accept_alert
     yield
   rescue Selenium::WebDriver::Error::UnhandledAlertError
-    page.driver.browser.switch_to.alert.accept
+    Selenium::WebDriver::Wait.new(timeout: 5)
+      .until { page.driver.browser.switch_to.alert }
+      .accept
   end
 
   def disable_html5_validation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.7.0.rc2
+  version: 3.7.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 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: activemerchant
@@ -419,6 +419,7 @@ files:
 - app/models/spree/adjustable/promotion_accumulator.rb
 - app/models/spree/adjustment.rb
 - app/models/spree/app_configuration.rb
+- app/models/spree/app_dependencies.rb
 - app/models/spree/asset.rb
 - app/models/spree/asset/support/active_storage.rb
 - app/models/spree/base.rb
@@ -958,6 +959,7 @@ files:
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_generator.rb
 - lib/spree/core/version.rb
+- lib/spree/dependencies_helper.rb
 - lib/spree/i18n.rb
 - lib/spree/i18n/base.rb
 - lib/spree/i18n/initializer.rb
@@ -1066,8 +1068,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.