spree_core 4.2.0.beta → 4.2.0.rc5

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

@@ -52,10 +52,15 @@ module Spree
         end
 
         def set_current_order
-          if try_spree_current_user && current_order
-            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
-              current_order.merge!(order, try_spree_current_user)
-            end
+          return unless try_spree_current_user && current_order
+
+          orders_scope = try_spree_current_user.orders.
+                         incomplete.
+                         where.not(id: current_order.id).
+                         where(store_id: current_store.id)
+
+          orders_scope.each do |order|
+            current_order.merge!(order, try_spree_current_user)
           end
         end
 

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

@@ -5,30 +5,18 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :supported_currencies
-          helper_method :current_currency
           helper_method :current_store
           helper_method :current_price_options
         end
 
-        def current_currency
-          if defined?(session) && session.key?(:currency) && supported_currencies.map(&:iso_code).include?(session[:currency])
-            session[:currency]
-          elsif params[:currency].present? && supported_currencies.map(&:iso_code).include?(params[:currency])
-            params[:currency]
-          else
-            current_store.default_currency
-          end
-        end
-
-        def supported_currencies
-          current_store.supported_currencies_list
-        end
-
         def current_store
           @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
         end
 
+        def store_locale
+          current_store.default_locale
+        end
+
         # Return a Hash of things that influence the prices displayed in your shop.
         #
         # By default, the only thing that influences prices that is the current order's +tax_zone+

data/lib/spree/core/importer/order.rb

@@ -38,7 +38,7 @@ module Spree
             end
           end
           order.reload
-        rescue Exception => e
+        rescue StandardError => e
           order.destroy if order&.persisted?
           raise e.message
         end
@@ -80,7 +80,7 @@ module Spree
 
             adjustments = s.delete(:adjustments_attributes)
             create_adjustments_from_params(adjustments, order, shipment)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import shipments: #{e.message} #{s}"
           end
         end
@@ -115,7 +115,7 @@ module Spree
               line_item.save!
             end
             create_adjustments_from_params(adjustments, order, line_item)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import line items: #{e.message} #{line_item}"
           end
         end
@@ -132,7 +132,7 @@ module Spree
             )
             adjustment.save!
             adjustment.close!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import adjustments: #{e.message} #{a}"
           end
         end
@@ -150,7 +150,7 @@ module Spree
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
             payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import payments: #{e.message} #{p}"
           end
         end
@@ -167,7 +167,7 @@ module Spree
             gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
             imported: true
           )
-        rescue Exception => e
+        rescue StandardError => e
           raise "Order import source payments: #{e.message} #{source_hash}"
         end
 
@@ -179,7 +179,7 @@ module Spree
           hash
         rescue ActiveRecord::RecordNotFound => e
           raise "Ensure order import variant: Variant w/SKU #{sku} not found."
-        rescue Exception => e
+        rescue StandardError => e
           raise "Ensure order import variant: #{e.message} #{hash}"
         end
 
@@ -200,7 +200,7 @@ module Spree
 
             address.delete(:country)
             address[:country_id] = Spree::Country.where(search).first!.id
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address country: #{e.message} #{search}"
           end
         end
@@ -224,7 +224,7 @@ module Spree
             else
               address[:state_name] = search[:name] || search[:abbr]
             end
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address state: #{e.message} #{search}"
           end
         end

data/lib/spree/core/product_filters.rb

@@ -68,9 +68,9 @@ module Spree
       def self.price_filter
         v = Spree::Price.arel_table
         conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
-                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
-                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
-                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].between(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].between(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].between(18..20)],
                  [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name: Spree.t(:price_range),

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.2.0.beta'
+    '4.2.0.rc5'
   end
 end

data/lib/spree/i18n.rb

@@ -1,35 +1,21 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
-require 'spree/i18n/base'
+require 'action_view'
 
 module Spree
-  extend ActionView::Helpers::TranslationHelper
-  extend ActionView::Helpers::TagHelper
+  class TranslationHelperWrapper
+    include ActionView::Helpers::TranslationHelper
+  end
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
-    def translate(*args)
-      @virtual_path = virtual_path
+    def translate(key, options = {})
+      options[:scope] = [*options[:scope]].unshift(:spree).uniq
 
-      options = args.extract_options!
-      options[:scope] = [*options[:scope]].unshift(:spree)
-      args << options
-      super(*args)
+      TranslationHelperWrapper.new.translate(key, **options)
     end
 
     alias t translate
-
-    def context
-      Spree::ViewContext.context
-    end
-
-    def virtual_path
-      if context
-        path = context.instance_variable_get('@virtual_path')
-
-        path&.gsub(/spree/, '')
-      end
-    end
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -33,7 +33,7 @@ module Spree
       :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_iso, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
-      :user_id, :deleted_at,
+      :user_id, :deleted_at, :label,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
     ]
@@ -99,9 +99,9 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords, :logo,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :facebook, :twitter, :instagram,
-                          :description, :address, :contact_email, :contact_phone,
+                          :description, :address, :contact_phone,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email]
+                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/service_module.rb

@@ -47,7 +47,11 @@ module Spree
       def call(input = nil)
         input ||= {}
         @_passed_input = Result.new(true, input)
-        result = super
+        result = if input.is_a?(Hash)
+                   super(**input)
+                 else
+                   super(input)
+                 end
         @_passed_input = result if result.is_a? Result
         enforce_data_format
         @_passed_input
@@ -71,7 +75,7 @@ module Spree
         end
 
         begin
-          @_passed_input = callable.call(@_passed_input.value)
+          @_passed_input = callable.call(**@_passed_input.value)
         rescue ArgumentError => e
           if e.message.include? 'missing'
             raise IncompatibleParamsPassed, "You didn't pass #{e.message} to callable '#{callable.name}'"

data/lib/spree/testing_support/capybara_config.rb

@@ -23,4 +23,4 @@ else
   end
 end
 Capybara.default_max_wait_time = 45
-Capybara.server = :webrick
+Capybara.server = :puma

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -1,4 +1,21 @@
 FactoryBot.define do
+  trait :with_item_total_rule do
+    transient do
+      item_total_threshold_amount { 10 }
+    end
+
+    after(:create) do |promotion, evaluator|
+      rule = Spree::Promotion::Rules::ItemTotal.create!(
+        preferred_operator_min: 'gte',
+        preferred_operator_max: 'lte',
+        preferred_amount_min: evaluator.item_total_threshold_amount,
+        preferred_amount_max: evaluator.item_total_threshold_amount + 100
+      )
+      promotion.rules << rule
+      promotion.save!
+    end
+  end
+
   factory :promotion, class: Spree::Promotion do
     name { 'Promo' }
 
@@ -13,7 +30,16 @@ FactoryBot.define do
         Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
       end
     end
+
+    trait :with_one_use_per_user_rule do
+      after(:create) do |promotion|
+        rule = Spree::Promotion::Rules::OneUsePerUser.create!
+        promotion.rules << rule
+      end
+    end
+
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
+    factory :promotion_with_one_use_per_user_rule, traits: [:with_line_item_adjustment, :with_one_use_per_user_rule]
 
     trait :with_order_adjustment do
       transient do
@@ -28,24 +54,8 @@ FactoryBot.define do
         promotion.save!
       end
     end
-    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
 
-    trait :with_item_total_rule do
-      transient do
-        item_total_threshold_amount { 10 }
-      end
-
-      after(:create) do |promotion, evaluator|
-        rule = Spree::Promotion::Rules::ItemTotal.create!(
-          preferred_operator_min: 'gte',
-          preferred_operator_max: 'lte',
-          preferred_amount_min: evaluator.item_total_threshold_amount,
-          preferred_amount_max: evaluator.item_total_threshold_amount + 100
-        )
-        promotion.rules << rule
-        promotion.save!
-      end
-    end
+    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
     factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
 
@@ -57,5 +67,7 @@ FactoryBot.define do
       action.promotion = promotion
       action.save
     end
+
+    factory :free_shipping_promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
 end

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -8,15 +8,13 @@ FactoryBot.define do
 
     after(:create) do |shipment, _evalulator|
       shipment.add_shipping_method(create(:shipping_method), true)
-
-      shipment.order.line_items.each do |line_item|
-        line_item.quantity.times do
-          shipment.inventory_units.create(
-            order_id: shipment.order_id,
-            variant_id: line_item.variant_id,
-            line_item_id: line_item.id
-          )
-        end
+      shipment.order.line_items.map do |line_item|
+        shipment.inventory_units.create(
+          order_id: shipment.order_id,
+          variant_id: line_item.variant_id,
+          line_item_id: line_item.id,
+          quantity: line_item.quantity
+        )
       end
     end
   end

data/lib/spree/testing_support/factories/stock_location_factory.rb

@@ -20,8 +20,8 @@ FactoryBot.define do
         product_1 = create(:product)
         product_2 = create(:product)
 
-        stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
-        stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)
+        stock_location.stock_items.where(variant_id: product_1.master_id).first.adjust_count_on_hand(10)
+        stock_location.stock_items.where(variant_id: product_2.master_id).first.adjust_count_on_hand(20)
       end
     end
   end

data/lib/spree/testing_support/factories/zone_factory.rb

@@ -1,24 +1,27 @@
 FactoryBot.define do
-  factory :global_zone, class: Spree::Zone do
-    name        { 'GlobalZone' }
-    description { generate(:random_string) }
-    zone_members do |proxy|
-      zone = proxy.instance_eval { @instance }
-      Spree::Country.all.map do |c|
-        Spree::ZoneMember.create(zoneable: c, zone: zone)
-      end
-    end
-  end
-
   factory :zone, class: Spree::Zone do
     name        { generate(:random_string) }
     description { generate(:random_string) }
 
     factory :zone_with_country do
+      kind { :country }
+
       zone_members do |proxy|
         zone = proxy.instance_eval { @instance }
-        country = create(:country)
-        [Spree::ZoneMember.create(zoneable: country, zone: zone)]
+
+        [Spree::ZoneMember.create(zoneable: create(:country), zone: zone)]
+      end
+
+      factory :global_zone, class: Spree::Zone do
+        sequence(:name) { |n| "GlobalZone_#{n}" }
+
+        zone_members do |proxy|
+          zone = proxy.instance_eval { @instance }
+
+          Spree::Country.all.map do |country|
+            Spree::ZoneMember.where(zoneable: country, zone: zone).first_or_create
+          end
+        end
       end
     end
   end

data/lib/spree/testing_support/i18n.rb

@@ -84,7 +84,7 @@ RSpec.configure do |config|
       end
 
       Spree.check_unused_translations
-      if false && Spree.unused_translation_messages.any?
+      if Spree.unused_translation_messages.any?
         puts "\nThere are unused translations within Spree:"
         puts Spree.unused_translation_messages.sort
         exit(1)

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,11 +1,16 @@
 class OrderWalkthrough
   def self.up_to(state)
-    # A default store must exist to provide store settings
-    store = Spree::Store.default || FactoryBot.create(:store, default: true)
+    store = if Spree::Store.exists?
+              # Ensure the default store is used
+              Spree::Store.default || FactoryBot.create(:store, default: true)
+            else
+              # Create a default store
+              FactoryBot.create(:store, default: true)
+            end
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
-      FactoryBot.create(:check_payment_method)
+      FactoryBot.create(:check_payment_method, stores: [store])
     end
 
     # Need to create a valid zone too...

data/lib/spree/testing_support/rspec_retry_config.rb

@@ -0,0 +1,10 @@
+require 'rspec/retry'
+
+RSpec.configure do |config|
+  config.verbose_retry = true
+  config.display_try_failure_messages = true
+
+  config.around :each, type: :feature do |ex|
+    ex.run_with_retry retry: ENV.fetch('RSPEC_RETRY_RETRY_COUNT', 3).to_i
+  end
+end

data/spree_core.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemerchant', '~> 1.67'
   s.add_dependency 'acts_as_list', '~> 0.8'
-  s.add_dependency 'awesome_nested_set', '>= 3.1.4', '< 3.3.0'
+  s.add_dependency 'awesome_nested_set', '>= 3.3.1', '< 4.0'
   s.add_dependency 'carmen', '>= 1.0', '< 1.2'
-  s.add_dependency 'cancancan', '~> 3.0'
+  s.add_dependency 'cancancan', '~> 3.2'
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.5.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
@@ -39,17 +39,19 @@ Gem::Specification.new do |s|
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 6.0.0'
-  s.add_dependency 'ransack', '~> 2.3.0'
+  s.add_dependency 'rails', '>= 6.0', '< 6.2'
+  s.add_dependency 'ransack', '>= 2.3', '< 2.5'
   s.add_dependency 'responders'
+  s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
   s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
   s.add_dependency 'image_processing', '~> 1.2'
+  s.add_dependency 'active_storage_validations', '~> 0.9'
 
   s.add_development_dependency 'email_spec', '~> 2.2'
 end