solidus_core 2.11.17 → 3.0.0.rc2

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

@@ -21,12 +21,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_orders do
-      after(:create) do |user, _|
-        create(:order, user: user)
-      end
-    end
-
     factory :admin_user do
       after(:create) do |user, _|
         admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')

data/lib/spree/testing_support/order_walkthrough.rb

@@ -82,6 +82,3 @@ module Spree
     end
   end
 end
-
-# @private
-OrderWalkthrough = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OrderWalkthrough', 'Spree::TestingSupport::OrderWalkthrough')

data/lib/spree/testing_support/preferences.rb

@@ -1,33 +1,8 @@
 # frozen_string_literal: true
 
-require 'spree/deprecation'
-
 module Spree
   module TestingSupport
     module Preferences
-      # Resets all preferences to default values, you can
-      # pass a block to override the defaults with a block
-      #
-      # reset_spree_preferences do |config|
-      #   config.track_inventory_levels = false
-      # end
-      #
-      # @deprecated
-      def reset_spree_preferences(&config_block)
-        Spree::Config.instance_variables.
-          reject { |iv| iv == :@events_configuration }.
-          each { |iv| Spree::Config.remove_instance_variable(iv) }
-        Spree::Config.preference_store = Spree::Config.default_preferences
-
-        if defined?(Railties)
-          Rails.application.config.spree = Spree::Config.environment
-        end
-
-        configure_spree_preferences(&config_block) if block_given?
-      end
-
-      deprecate :reset_spree_preferences, deprecator: Spree::Deprecation
-
       def configure_spree_preferences
         yield(Spree::Config) if block_given?
       end

data/lib/spree/testing_support.rb

@@ -25,7 +25,7 @@ module Spree
       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::Deprecation
+      deprecator: Spree::Deprecator
     )
   end
 end

data/lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake

@@ -3,29 +3,34 @@
 namespace :solidus do
   namespace :migrations do
     namespace :migrate_default_billing_addresses_to_address_book do
-      task :up, [:batch_size] => [:environment] do |_t, args|
-        batch_size = args[:batch_size] || 100_000
-        print "Migrating default billing addresses to address book in batches of #{batch_size} ... "
+      task up: :environment do
+        print "Migrating default billing addresses to address book ... "
         if Spree::UserAddress.where(default_billing: true).any?
-          Spree.user_class.joins(:bill_address).in_batches(of: batch_size).each do |batch|
-            batch.update_all(bill_address_id: nil) # rubocop:disable Rails/SkipsModelValidations
-          end
+          Spree::LegacyUser.joins(:bill_address).update_all(bill_address_id: nil) # rubocop:disable Rails/SkipsModelValidations
         end
-        Spree::UserAddress.joins(
-          <<~SQL
+        adapter_type = Spree::Base.connection.adapter_name.downcase.to_sym
+        if adapter_type == :mysql2
+          sql = <<~SQL
+            UPDATE spree_user_addresses
             JOIN spree_users ON spree_user_addresses.user_id = spree_users.id
-                             AND spree_user_addresses.address_id = spree_users.bill_address_id
+              AND spree_user_addresses.address_id = spree_users.bill_address_id
+            SET spree_user_addresses.default_billing = true
+          SQL
+        else
+          sql = <<~SQL
+            UPDATE spree_user_addresses
+            SET default_billing = true
+            FROM spree_users
+            WHERE spree_user_addresses.address_id = spree_users.bill_address_id
+              AND spree_user_addresses.user_id = spree_users.id;
           SQL
-        ).in_batches(of: batch_size).each do |batch|
-          batch.update_all(default_billing: true) # rubocop:disable Rails/SkipsModelValidations
         end
-
+        Spree::Base.connection.execute sql
         puts "Success"
       end
 
-      task :down, [:batch_size] => [:environment] do |_t, args|
-        batch_size = args[:batch_size] || 100_000
-        Spree::UserAddress.in_batches(of: batch_size).update_all(default_billing: false) # rubocop:disable Rails/SkipsModelValidations
+      task down: :environment do
+        Spree::UserAddress.update_all(default_billing: false) # rubocop:disable Rails/SkipsModelValidations
         puts "Rolled back default billing address migration to address book"
       end
     end

data/solidus_core.gemspec

@@ -39,31 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'kt-paperclip', ['>= 4.4.0', '< 7']
-  s.add_dependency 'paranoia', '~> 2.4'
-  s.add_dependency 'psych', ['>= 3.1.0', '< 5.0']
+  s.add_dependency 'kt-paperclip', '~> 6.3'
   s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
-
-  s.post_install_message = <<-MSG
--------------------------------------------------------------
-                Thank you for using Solidus
--------------------------------------------------------------
-If this is a fresh install, don't forget to run the Solidus
-installer with the following command:
-
-$ bin/rails g solidus:install
-
-If you are updating Solidus from an older version, please run
-the following commands to complete the update:
-
-$ bin/rails railties:install:migrations
-$ bin/rails db:migrate
-$ bin/rails solidus:upgrade:two_point_eleven
-
-Please report any issues at:
-- https://github.com/solidusio/solidus/issues
-- http://slack.solidus.io/
--------------------------------------------------------------
-MSG
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.17
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -332,58 +332,18 @@ dependencies:
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: kt-paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -441,7 +401,6 @@ files:
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/promotion_code_batch_mailer.rb
 - app/mailers/spree/reimbursement_mailer.rb
-- app/mailers/spree/test_mailer.rb
 - app/models/concerns/spree/active_storage_adapter.rb
 - app/models/concerns/spree/active_storage_adapter/attachment.rb
 - app/models/concerns/spree/active_storage_adapter/normalization.rb
@@ -456,7 +415,6 @@ files:
 - app/models/concerns/spree/user_address_book.rb
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_methods.rb
-- app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
@@ -473,10 +431,7 @@ files:
 - app/models/spree/calculator/flat_percent_item_total.rb
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
-- app/models/spree/calculator/free_shipping.rb
 - app/models/spree/calculator/percent_on_line_item.rb
-- app/models/spree/calculator/percent_per_item.rb
-- app/models/spree/calculator/price_sack.rb
 - app/models/spree/calculator/returns/default_refund_amount.rb
 - app/models/spree/calculator/shipping/flat_percent_item_total.rb
 - app/models/spree/calculator/shipping/flat_rate.rb
@@ -495,9 +450,6 @@ files:
 - app/models/spree/fulfilment_changer.rb
 - app/models/spree/gallery/product_gallery.rb
 - app/models/spree/gallery/variant_gallery.rb
-- app/models/spree/gateway.rb
-- app/models/spree/gateway/bogus.rb
-- app/models/spree/gateway/bogus_simple.rb
 - app/models/spree/image.rb
 - app/models/spree/image/active_storage_attachment.rb
 - app/models/spree/image/paperclip_attachment.rb
@@ -510,11 +462,9 @@ files:
 - app/models/spree/option_value.rb
 - app/models/spree/option_values_variant.rb
 - app/models/spree/order.rb
-- app/models/spree/order/checkout.rb
 - app/models/spree/order/number_generator.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order_cancellations.rb
-- app/models/spree/order_capturing.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_merger.rb
@@ -568,7 +518,6 @@ files:
 - app/models/spree/promotion_code_batch.rb
 - app/models/spree/promotion_handler/cart.rb
 - app/models/spree/promotion_handler/coupon.rb
-- app/models/spree/promotion_handler/free_shipping.rb
 - app/models/spree/promotion_handler/page.rb
 - app/models/spree/promotion_handler/shipping.rb
 - app/models/spree/promotion_rule.rb
@@ -772,10 +721,9 @@ files:
 - lib/generators/spree/dummy/templates/rails/database.yml
 - lib/generators/spree/dummy/templates/rails/routes.rb
 - lib/generators/spree/dummy/templates/rails/script/rails
+- lib/generators/spree/dummy/templates/rails/storage.yml
 - lib/generators/spree/dummy/templates/rails/test.rb
-- lib/generators/spree/install/install_generator.rb
 - lib/solidus/migrations/promotions_with_code_handlers.rb
-- lib/solidus/migrations/rename_gateways.rb
 - lib/solidus_core.rb
 - lib/spree/app_configuration.rb
 - lib/spree/config.rb
@@ -791,7 +739,6 @@ files:
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
-- lib/spree/core/current_store.rb
 - lib/spree/core/engine.rb
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
@@ -833,7 +780,6 @@ files:
 - lib/spree/migration_helpers.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
-- lib/spree/paranoia_deprecations.rb
 - lib/spree/permission_sets.rb
 - lib/spree/permission_sets/base.rb
 - lib/spree/permission_sets/configuration_display.rb
@@ -855,18 +801,15 @@ files:
 - lib/spree/permission_sets/user_management.rb
 - lib/spree/permitted_attributes.rb
 - lib/spree/preferences/configuration.rb
-- lib/spree/preferences/persistable.rb
 - lib/spree/preferences/preferable.rb
 - lib/spree/preferences/preferable_class_methods.rb
 - lib/spree/preferences/scoped_store.rb
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
-- lib/spree/promo/environment.rb
 - lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
-- lib/spree/testing_support/bar_ability.rb
 - lib/spree/testing_support/blacklist_urls.rb
 - lib/spree/testing_support/caching.rb
 - lib/spree/testing_support/capybara_ext.rb
@@ -945,7 +888,6 @@ files:
 - lib/spree/testing_support/factories/zone_factory.rb
 - lib/spree/testing_support/factory_bot.rb
 - lib/spree/testing_support/fixtures/blank.jpg
-- lib/spree/testing_support/fixtures/file.txt
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/job_helpers.rb
 - lib/spree/testing_support/order_walkthrough.rb
@@ -959,16 +901,8 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - lib/spree_core.rb
-- lib/tasks/core.rake
-- lib/tasks/email.rake
-- lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
 - lib/tasks/migrations/migrate_address_names.rake
 - lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
-- lib/tasks/migrations/migrate_shipping_rate_taxes.rake
-- lib/tasks/migrations/migrate_user_addresses.rake
-- lib/tasks/migrations/rename_gateways.rake
-- lib/tasks/order_capturing.rake
-- lib/tasks/solidus/check_orders_with_invalid_email.rake
 - lib/tasks/upgrade.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
@@ -978,26 +912,7 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: |
-  -------------------------------------------------------------
-                  Thank you for using Solidus
-  -------------------------------------------------------------
-  If this is a fresh install, don't forget to run the Solidus
-  installer with the following command:
-
-  $ bin/rails g solidus:install
-
-  If you are updating Solidus from an older version, please run
-  the following commands to complete the update:
-
-  $ bin/rails railties:install:migrations
-  $ bin/rails db:migrate
-  $ bin/rails solidus:upgrade:two_point_eleven
-
-  Please report any issues at:
-  - https://github.com/solidusio/solidus/issues
-  - http://slack.solidus.io/
-  -------------------------------------------------------------
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1012,8 +927,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []

data/app/mailers/spree/test_mailer.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class TestMailer < BaseMailer
-    def test_email(email)
-      Spree::Deprecation.warn("Spree::TestMailer has been deprecated and will be removed with Solidus 3.0")
-
-      store = Spree::Store.default
-      subject = "#{store.name} #{t('.subject')}"
-      mail(to: email, from: from_address(store), subject: subject)
-    end
-  end
-end

data/app/models/concerns/spree/user_payment_source.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module UserPaymentSource
-    extend ActiveSupport::Concern
-
-    def default_credit_card
-      Spree::Deprecation.warn(
-        "user.default_credit_card is deprecated. Please use user.wallet.default_wallet_payment_source instead.",
-        caller
-      )
-      default = wallet.default_wallet_payment_source
-      if default && default.payment_source.is_a?(Spree::CreditCard)
-        default.payment_source
-      end
-    end
-
-    def payment_sources
-      Spree::Deprecation.warn(
-        "user.payment_sources is deprecated. Please use user.wallet.wallet_payment_sources instead.",
-        caller
-      )
-      credit_cards.with_payment_profile
-    end
-  end
-end

data/app/models/spree/calculator/free_shipping.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'spree/calculator'
-
-module Spree
-  # @deprecated This calculator will be removed in future versions of Spree.
-  #   The only case where it was used was for Free Shipping Promotions.  There is
-  #   now a Promotion Action which deals with these types of promotions instead.
-  class Calculator::FreeShipping < Calculator
-    def compute(object)
-      Spree::Deprecation.warn('This method is deprecated, because it is no longer used')
-      if object.is_a?(Array)
-        return if object.empty?
-        order = object.first.order
-      else
-        order = object
-      end
-
-      order.ship_total
-    end
-  end
-end

data/app/models/spree/calculator/percent_per_item.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'spree/calculator'
-
-module Spree
-  # A calculator for promotions that calculates a percent-off discount
-  # for all matching products in an order. This should not be used as a
-  # shipping calculator since it would be the same thing as a flat percent
-  # off the entire order.
-  #
-  #
-  # TODO Should be deprecated now that we have adjustments at the line item level in spree core
-
-  class Calculator::PercentPerItem < Calculator
-    preference :percent, :decimal, default: 0
-
-    def compute(object = nil)
-      Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
-
-      return 0 if object.nil?
-      object.line_items.sum { |line_item|
-        value_for_line_item(line_item)
-      }
-    end
-
-    private
-
-    # Returns all products that match this calculator, but only if the calculator
-    # is attached to a promotion. If attached to a ShippingMethod, nil is returned.
-    # Copied from per_item.rb
-    def matching_products
-      if compute_on_promotion?
-        calculable.promotion.rules.flat_map do |rule|
-          rule.respond_to?(:products) ? rule.products : []
-        end
-      end
-    end
-
-    def value_for_line_item(line_item)
-      if compute_on_promotion?
-        return 0 unless matching_products.blank? || matching_products.include?(line_item.product)
-      end
-      ((line_item.price * line_item.quantity) * preferred_percent) / 100
-    end
-
-    # Determines wether or not the calculable object is a promotion
-    def compute_on_promotion?
-      @compute_on_promotion ||= calculable.respond_to?(:promotion)
-    end
-  end
-end

data/app/models/spree/calculator/price_sack.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'spree/calculator'
-
-module Spree
-  class Calculator::PriceSack < Calculator
-    preference :minimal_amount, :decimal, default: 0
-    preference :normal_amount, :decimal, default: 0
-    preference :discount_amount, :decimal, default: 0
-    preference :currency, :string, default: ->{ Spree::Config[:currency] }
-
-    # as object we always get line items, as calculable we have Coupon, ShippingMethod
-    def compute(object)
-      Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
-      if object.is_a?(Array)
-        base = object.sum { |element| element.respond_to?(:amount) ? element.amount : BigDecimal(element.to_s) }
-      else
-        base = object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
-      end
-
-      if base < preferred_minimal_amount
-        preferred_normal_amount
-      else
-        preferred_discount_amount
-      end
-    end
-  end
-end

data/app/models/spree/gateway/bogus.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  # @deprecated Use Spree::PaymentMethod::BogusCreditCard instead
-  class Gateway::Bogus < PaymentMethod::BogusCreditCard
-    def initialize(*args)
-      Spree::Deprecation.warn \
-        'Spree::Gateway::Bogus is deprecated. ' \
-        'Please use Spree::PaymentMethod::BogusCreditCard instead'
-      super
-    end
-  end
-end

data/app/models/spree/gateway/bogus_simple.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  # @deprecated Use Spree::PaymentMethod::SimpleBogusCreditCard instead
-  class Gateway::BogusSimple < Spree::PaymentMethod::SimpleBogusCreditCard
-    def initialize(*args)
-      Spree::Deprecation.warn \
-        'Spree::Gateway::BogusSimple is deprecated. ' \
-        'Please use Spree::PaymentMethod::SimpleBogusCreditCard instead'
-      super
-    end
-  end
-end

data/app/models/spree/gateway.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  # @deprecated Use Spree::PaymentMethod::CreditCard or Spree::PaymentMethod instead
-  class Gateway < PaymentMethod::CreditCard
-    def initialize(*args)
-      Spree::Deprecation.warn \
-        "Using Spree::Gateway as parent class of payment methods is deprecated. " \
-        "Please use Spree::PaymentMethod::CreditCard for credit card based payment methods " \
-        "or Spree::PaymentMethod for non credit card payment methods instead."
-      super
-    end
-  end
-end