solidus_core 2.11.4 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2f2034c2f239923f522b08eeb9e6da4925058e86026d70d69cccf42ea975b9
-  data.tar.gz: c0f56fb7091eace3ef9a91a34846035a2f0bdffd248ad5ca9ae204a7d8faae68
+  metadata.gz: 5e525e5e27176da6331f5bce6a0075f2c06f2da77f9d8aad9d78a861a121219c
+  data.tar.gz: f828d4522d8c58822fc71daa609b7411102dbdcf55e7abb4f582102c23ddbfbd
 SHA512:
-  metadata.gz: a2e41a38b785af3e8da52ac03b86c9b1179cd2a92ec59a32c77ae6d54398115c99679ad8024b6f2988d95ddf515a9df2e0b118a687a239c2afb0920c17493b5f
-  data.tar.gz: d023f2e92ee65585e76103d5a8921f3525965480984fc9f0f48e7f69c76d5671d98bdc4d388112ee52c8b3f1f68a1ae51a215be903ef66ee1d5958c1a2c64009
+  metadata.gz: ca14ba69f5a7347fd1bc88d8d209e4ffbe2d4a9419fd257f036391d55581250569ac66683a6b5c27a1342f4b5f8120b0483ba16538f8107ded796bda44551c6d
+  data.tar.gz: f36de4fb9dc7addc88b586277f111b854dbbcfba3d586d52a62c2c4aaddc19e6bf536b74151a461df11566d3609df6fbc60889e70b9bbded67dc6ae740ae64dc

data/app/models/spree/address.rb

@@ -92,6 +92,12 @@ module Spree
       if base['lastname'].presence || base['last_name'].presence
         base['lastname'] = name_from_attributes.last_name
       end
+
+      virtual_name = name_from_attributes.value
+      if base['name'].blank? && virtual_name.present?
+        base['name'] = virtual_name
+      end
+
       excluded_attributes = DB_ONLY_ATTRS + %w(first_name last_name)
 
       base.except(*excluded_attributes)
@@ -120,7 +126,11 @@ module Spree
     # @return [Boolean] true if the two addresses have the same address fields
     def ==(other_address)
       return false unless other_address && other_address.respond_to?(:value_attributes)
-      value_attributes == other_address.value_attributes
+      if Spree::Config.use_combined_first_and_last_name_in_address
+        value_attributes.except(*LEGACY_NAME_ATTRS) == other_address.value_attributes.except(*LEGACY_NAME_ATTRS)
+      else
+        value_attributes == other_address.value_attributes
+      end
     end
 
     # @deprecated Do not use this. Use Address.== instead.
@@ -193,17 +203,30 @@ module Spree
       country && country.iso
     end
 
+    before_save :set_name_from_firstname_and_lastname
+
+    def set_name_from_firstname_and_lastname
+      name_from_firstname_and_lastname = Spree::Address::Name.from_attributes(attributes.except(:name, 'name'))
+
+      if read_attribute(:name).blank? && name_from_firstname_and_lastname.present?
+        write_attribute(:name, name_from_firstname_and_lastname)
+      end
+    end
+
     # @return [String] the full name on this address
     def name
-      Spree::Address::Name.new(
-        read_attribute(:firstname),
-        read_attribute(:lastname)
-      ).value
+      self[:name] || begin
+        Spree::Address::Name.new(
+          read_attribute(:firstname),
+          read_attribute(:lastname)
+        ).value
+      end
     end
 
     def name=(value)
       return if value.nil?
 
+      write_attribute(:name, value)
       name_from_value = Spree::Address::Name.new(value)
       write_attribute(:firstname, name_from_value.first_name)
       write_attribute(:lastname, name_from_value.last_name)

data/app/models/spree/order_merger.rb

@@ -128,7 +128,7 @@ module Spree
     # @param [Spree::LineItem] line_item The line item which could not be saved
     # @return [void]
     def handle_error(line_item)
-      order.errors[:base] << line_item.errors.full_messages
+      order.errors.add(:base, line_item.errors.full_messages)
     end
 
     # Save the order totals after merge

data/app/models/spree/payment.rb

@@ -168,9 +168,16 @@ module Spree
 
     def validate_source
       if source && !source.valid?
-        source.errors.each do |field, error|
-          field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-          errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error}")
+        if Gem::Requirement.new(">= 6.1").satisfied_by?(Rails.gem_version)
+          source.errors.each do |error|
+            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{error.attribute}")
+            errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error.message}")
+          end
+        else
+          source.errors.each do |field, error|
+            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
+            errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error}")
+          end
         end
       end
       if errors.any?

data/app/models/spree/product.rb

@@ -366,8 +366,14 @@ module Spree
     # If the master is invalid, the Product object will be assigned its errors
     def validate_master
       unless master.valid?
-        master.errors.each do |att, error|
-          errors.add(att, error)
+        if Gem::Requirement.new(">= 6.1").satisfied_by?(Rails.gem_version)
+          master.errors.each do |error|
+            errors.add(error.attribute, error.message)
+          end
+        else
+          master.errors.each do |att, error|
+            errors.add(att, error)
+          end
         end
       end
     end

data/app/models/spree/shipping_method.rb

@@ -119,7 +119,7 @@ module Spree
 
     def at_least_one_shipping_category
       if shipping_categories.empty?
-        errors[:base] << "You need to select at least one shipping category"
+        errors.add(:base, "You need to select at least one shipping category")
       end
     end
   end

data/app/models/spree/stock/availability_validator.rb

@@ -11,10 +11,10 @@ module Spree
           display_name = variant.name.to_s
           display_name += %{ (#{variant.options_text})} unless variant.options_text.blank?
 
-          line_item.errors[:quantity] << I18n.t(
+          line_item.errors.add(:quantity, I18n.t(
             'spree.selected_quantity_not_available',
             item: display_name.inspect
-          )
+          ))
           false
         end
       end

data/app/models/spree/stock/inventory_validator.rb

@@ -5,10 +5,10 @@ module Spree
     class InventoryValidator < ActiveModel::Validator
       def validate(line_item)
         if line_item.inventory_units.count != line_item.quantity
-          line_item.errors[:inventory] << I18n.t(
+          line_item.errors.add(:inventory, I18n.t(
             'spree.inventory_not_available',
             item: line_item.variant.name
-          )
+          ))
         end
       end
     end

data/app/models/spree/taxon/active_storage_attachment.rb

@@ -9,11 +9,10 @@ module Spree::Taxon::ActiveStorageAttachment
                    styles: { mini: '32x32>', normal: '128x128>' },
                    default_style: :mini
     validate :icon_is_an_image
-
-
   end
 
   def attachment_partial_name
+    Spree::Deprecation.warn("calling #attachment_partial_name on Spree::Taxon is deprecated without replacement.")
     'paperclip'
   end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -20,6 +20,7 @@ module Spree::Taxon::PaperclipAttachment
   end
 
   def attachment_partial_name
+    Spree::Deprecation.warn("calling #attachment_partial_name on Spree::Taxon is deprecated without replacement.")
     'paperclip'
   end
 

data/db/migrate/20210122110141_add_name_to_spree_addresses.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddNameToSpreeAddresses < ActiveRecord::Migration[5.2]
+  def up
+    add_column :spree_addresses, :name, :string
+    add_index :spree_addresses, :name
+  end
+
+  def down
+    remove_index :spree_addresses, :name
+    remove_column :spree_addresses, :name
+  end
+end

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -20,6 +20,9 @@ Dummy::Application.configure do
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
 
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection = false
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.

data/lib/spree/core.rb

@@ -95,7 +95,3 @@ require 'spree/user_class_handle'
 require 'spree/preferences/store'
 require 'spree/preferences/static_model_preferences'
 require 'spree/preferences/scoped_store'
-
-if Rails.gem_version >= Gem::Version.new('6.1.0.alpha')
-  require 'spree/awesome_nested_set_override'
-end

data/lib/spree/core/engine.rb

@@ -90,15 +90,14 @@ module Spree
             using the external validation class.
           DEPRECATION
         end
-      end
 
-      # Load in mailer previews for apps to use in development.
-      # We need to make sure we call `Preview.all` before requiring our
-      # previews, otherwise any previews the app attempts to add need to be
-      # manually required.
-      if Rails.env.development?
-        initializer "spree.mailer_previews" do
+        # Load in mailer previews for apps to use in development.
+        # We need to make sure we call `Preview.all` before requiring our
+        # previews, otherwise any previews the app attempts to add need to be
+        # manually required.
+        if Rails.env.development? || Rails.env.test?
           ActionMailer::Preview.all
+
           Dir[root.join("lib/spree/mailer_previews/**/*_preview.rb")].each do |file|
             require_dependency file
           end

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.11.4"
+  VERSION = "2.11.5"
 
   def self.solidus_version
     VERSION

data/lib/spree/testing_support.rb

@@ -1,40 +1,31 @@
 # frozen_string_literal: true
 
+require 'spree/testing_support/factory_bot'
+
 module Spree
   module TestingSupport
-    SEQUENCES = ["#{::Spree::Core::Engine.root}/lib/spree/testing_support/sequences.rb"]
-    FACTORIES = Dir["#{::Spree::Core::Engine.root}/lib/spree/testing_support/factories/**/*_factory.rb"]
-
-    def self.factory_bot_paths
-      @paths ||= (SEQUENCES + FACTORIES).sort.map { |path| path.sub(/.rb\z/, '') }
-    end
+    autoload :FactoryBot, "spree/testing_support/factory_bot"
 
-    def self.deprecate_cherry_picking_factory_bot_files
-      # All good if the factory is being loaded by FactoryBot.
-      return if caller.find { |line| line.include? "/factory_bot/find_definitions.rb" }
+    autoload :SEQUENCES, "spree/testing_support/factory_bot"
+    autoload :FACTORIES, "spree/testing_support/factory_bot"
 
-      Spree::Deprecation.warn(
-        "Please do not cherry-pick factories, this is not well supported by FactoryBot. " \
-        'Use `require "spree/testing_support/factories"` instead.', caller(2)
-      )
+    def factory_bot_paths
+      Spree::TestingSupport::FactoryBot.definition_file_paths
     end
 
-    def self.load_all_factories
-      require 'factory_bot'
-      require 'factory_bot/version'
-
-      requirement = Gem::Requirement.new("~> 4.8")
-      version = Gem::Version.new(FactoryBot::VERSION)
-
-      unless requirement.satisfied_by? version
-        Spree::Deprecation.warn(
-          "Please be aware that the supported version of FactoryBot is #{requirement}, " \
-          "using version #{version} could lead to factory loading issues.", caller(2)
-        )
-      end
+    def check_factory_bot_version
+      Spree::TestingSupport::FactoryBot.check_version
+    end
 
-      FactoryBot.definition_file_paths.concat(factory_bot_paths).uniq!
-      FactoryBot.reload
+    def load_all_factories
+      Spree::TestingSupport::FactoryBot.add_paths_and_load!
     end
+
+    deprecate(
+      factory_bot_paths: "Spree::TestingSupport::FactoryBot.definition_file_paths",
+      check_factory_bot_version: "Spree::TestingSupport::FactoryBot.check_version",
+      load_all_factories: "Spree::TestingSupport::FactoryBot.add_paths_and_load!",
+      deprecator: Spree::Deprecator
+    )
   end
 end

data/lib/spree/testing_support/dummy_app.rb

@@ -16,6 +16,7 @@ RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
 end
 
 # @private
@@ -51,8 +52,8 @@ module DummyApp
     config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
     config.whiny_nils = true
     config.consider_all_requests_local = true
-    config.action_controller.allow_forgery_protection = true
-    config.action_controller.default_protect_from_forgery = true
+    config.action_controller.allow_forgery_protection = false
+    config.action_controller.default_protect_from_forgery = false
     config.action_controller.perform_caching = false
     config.action_dispatch.show_exceptions = false
     config.active_support.deprecation = :stderr
@@ -61,6 +62,7 @@ module DummyApp
     config.secret_key_base = 'SECRET_TOKEN'
 
     config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    config.action_mailer.preview_path = File.expand_path('dummy_app/mailer_previews', __dir__)
     config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
 
     config.storage_path = Rails.root.join('tmp', 'storage')

data/lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class TestMailerPreview < ActionMailer::Preview
+end

data/lib/spree/testing_support/factories.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
+require 'spree/testing_support/factory_bot'
 
-Spree::TestingSupport.load_all_factories
+Spree::Deprecation.warn(
+  "Please do not try to load factories directly. " \
+  'Use factory_bot_rails and rely on the default configuration instead.', caller(1)
+)
+
+Spree::TestingSupport::FactoryBot.check_version
+Spree::TestingSupport::FactoryBot::PATHS.each { |path| require path }

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

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
 
+  require 'spree/testing_support/factories/state_factory'
+  require 'spree/testing_support/factories/country_factory'
+end
 FactoryBot.define do
   factory :address, class: 'Spree::Address' do
     transient do

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

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
+
+  require 'spree/testing_support/factories/line_item_factory'
+  require 'spree/testing_support/factories/order_factory'
+  require 'spree/testing_support/factories/tax_category_factory'
+  require 'spree/testing_support/factories/tax_rate_factory'
+  require 'spree/testing_support/factories/zone_factory'
+end
 
 FactoryBot.define do
   factory :adjustment, class: 'Spree::Adjustment' do

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
+end
 
 FactoryBot.define do
   factory :adjustment_reason, class: 'Spree::AdjustmentReason' do

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
+end
 
 FactoryBot.define do
   factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
+
+  require 'spree/testing_support/factories/shipment_factory'
+  require 'spree/testing_support/factories/inventory_unit_factory'
+end
 
 FactoryBot.define do
   factory :carton, class: 'Spree::Carton' do

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support'
-Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
+require 'spree/testing_support/factory_bot'
+Spree::TestingSupport::FactoryBot.when_cherry_picked do
+  Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
+end
 
 require 'carmen'