solidus_core 2.11.10 → 3.0.2

data/lib/spree/permitted_attributes.rb

@@ -39,8 +39,7 @@ module Spree
     mattr_reader(*ATTRIBUTES)
 
     @@address_attributes = [
-      :id, :name, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_id, :state_id,
+      :id, :name, :address1, :address2, :city, :country_id, :state_id,
       :zipcode, :phone, :state_name, :country_iso, :alternative_phone, :company,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
@@ -52,7 +51,13 @@ module Spree
       :month, :year, :expiry, :first_name, :last_name, :name
     ]
 
-    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :amount, :reception_status_event, :acceptance_status, :exchange_variant_id, :resellable]]
+    @@customer_return_attributes = [
+      :stock_location_id, return_items_attributes: [
+        :id, :inventory_unit_id, :return_authorization_id, :returned, :amount,
+        :reception_status_event, :acceptance_status, :exchange_variant_id,
+        :resellable, :return_reason_id
+      ]
+    ]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -90,7 +95,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id, :wallet_payment_source_id, address_attributes: address_attributes
+      :wallet_payment_source_id, address_attributes: address_attributes
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -143,61 +148,11 @@ module Spree
     ]
 
     @@checkout_payment_attributes = [
-      :coupon_code,
       payments_attributes: payment_attributes + [
         source_attributes: source_attributes
       ]
     ]
 
     @@checkout_confirm_attributes = []
-
-    def self.checkout_attributes
-      Spree::Deprecation.warn <<-WARN.squish, caller
-        checkout_attributes is deprecated, please use the permitted
-        attributes set for the specific step that needs to be updated.
-
-        E.g. permitted_checkout_address_attributes
-      WARN
-
-      CheckoutAdditionalAttributes.new(
-        checkout_address_attributes +
-        checkout_delivery_attributes +
-        checkout_payment_attributes +
-        checkout_confirm_attributes
-      )
-    end
-  end
-
-  class CheckoutAdditionalAttributes < Array
-    def <<(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :<<)
-    end
-
-    def push(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :push)
-    end
-    alias append push
-
-    def prepend(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :prepend)
-    end
-    alias unshift prepend
-
-    private
-
-    def inject_attributes_to_all_steps(attributes, method_name)
-      attributes.each do |attribute|
-        PermittedAttributes.checkout_address_attributes.send(method_name, attribute)
-        PermittedAttributes.checkout_delivery_attributes.send(method_name, attribute)
-        PermittedAttributes.checkout_payment_attributes.send(method_name, attribute)
-        PermittedAttributes.checkout_confirm_attributes.send(method_name, attribute)
-      end
-    end
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -35,18 +35,6 @@ module Spree
         find("td:nth-of-type(#{num})").text
       end
 
-      def fill_in_quantity(table_column, selector, quantity)
-        Spree::Deprecation.warn <<-WARN.strip_heredoc
-          fill_in_quantity is deprecated. Instead use:
-            within(#{table_column.inspect}) do
-              fill_in #{selector.inspect}, with: #{quantity.inspect}
-            end
-        WARN
-        within(table_column) do
-          fill_in selector, with: quantity
-        end
-      end
-
       def select2_search(value, options)
         options = {
           search: value, # by default search for the value
@@ -122,21 +110,6 @@ module Spree
         # find the original.
         find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
       end
-
-      def wait_for_ajax
-        Spree::Deprecation.warn <<-WARN.squish, caller
-          wait_for_ajax has been deprecated.
-          Please refer to the capybara documentation on how to properly wait for asyncronous behavior:
-          https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends
-        WARN
-
-        counter = 0
-        while page.evaluate_script("typeof($) === 'undefined' || $.active > 0")
-          counter += 1
-          sleep(0.1)
-          raise "AJAX request took longer than 5 seconds." if counter >= 50
-        end
-      end
     end
   end
 end
@@ -156,9 +129,6 @@ RSpec::Matchers.define :have_meta do |name, expected|
   end
 end
 
-# @private
-CapybaraExt = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CapybaraExt', 'Spree::TestingSupport::CapybaraExt')
-
 RSpec.configure do |c|
   c.include Spree::TestingSupport::CapybaraExt
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -2,23 +2,12 @@
 
 module Spree
   module TestingSupport
-    # A module providing convenience methods to test Solidus controllers
-    # in Rails controller/functional tests. Possibly from inside an
-    # application with a mounted Solidus engine.
-    #
     # *There is generaly no need* to use this module. Instead, in
     # a functional/controller test against a Spree controller, just
     # use standard Rails functionality by including:
     #
     #   routes { Spree::Core::Engine.routes }
     #
-    # And then use standard Rails test `get`, `post` etc methods.
-    #
-    # But some legacy code uses this ControllerRequests helper. It must
-    # be included only in tests against Spree controllers, it will interfere
-    # with tests against local app or other engine controllers, resulting
-    # in ActionController::UrlGenerationError.
-    #
     # To use this module, inside your spec_helper.rb, include this module inside
     # the RSpec.configure block by:
     #
@@ -26,83 +15,12 @@ module Spree
     #   RSpec.configure do |c|
     #     c.include Spree::TestingSupport::ControllerRequests, spree_controller: true
     #   end
-    #
-    # Then, in your controller tests against spree controllers, you can access
-    # tag to use this module, and access spree routes like this:
-    #
-    #   require 'spec_helper'
-    #
-    #   describe Spree::ProductsController, :spree_controller do
-    #     it "can see all the products" do
-    #       spree_get :index
-    #     end
-    #   end
-    #
-    # Use spree_get, spree_post, spree_put or spree_delete to make requests to
-    # the Spree engine, and use regular get, post, put or delete to make
-    # requests to your application.
     module ControllerRequests
       extend ActiveSupport::Concern
 
       included do
         routes { Spree::Core::Engine.routes }
       end
-
-      def spree_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "GET")
-      end
-      deprecate spree_get: :get, deprecator: Spree::Deprecation
-
-      # Executes a request simulating POST HTTP method and set/volley the response
-      def spree_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "POST")
-      end
-      deprecate spree_post: :post, deprecator: Spree::Deprecation
-
-      # Executes a request simulating PUT HTTP method and set/volley the response
-      def spree_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "PUT")
-      end
-      deprecate spree_put: :put, deprecator: Spree::Deprecation
-
-      # Executes a request simulating DELETE HTTP method and set/volley the response
-      def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "DELETE")
-      end
-      deprecate spree_delete: :delete, deprecator: Spree::Deprecation
-
-      def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :get)
-      end
-      deprecate spree_xhr_get: :get, deprecator: Spree::Deprecation
-
-      def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :post)
-      end
-      deprecate spree_xhr_post: :post, deprecator: Spree::Deprecation
-
-      def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :put)
-      end
-      deprecate spree_xhr_put: :put, deprecator: Spree::Deprecation
-
-      def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :delete)
-      end
-      deprecate spree_xhr_delete: :delete, deprecator: Spree::Deprecation
-
-      private
-
-      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
-        parameters ||= {}
-        process(action, method, parameters, session, flash)
-      end
-
-      def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
-        parameters ||= {}
-        parameters.reverse_merge!(format: :json)
-        xml_http_request(method, action, parameters, session, flash)
-      end
     end
   end
 end

data/lib/spree/testing_support/dummy_app/migrations.rb

@@ -27,9 +27,6 @@ module DummyApp
         ActiveRecord::Base.remove_connection
 
         sh 'rake db:reset VERBOSE=false'
-        if ENV['ENABLE_ACTIVE_STORAGE']
-          sh 'rake active_storage:install db:migrate VERBOSE=false'
-        end
 
         # We have a brand new database, so we must re-establish our connection
         ActiveRecord::Base.establish_connection

data/lib/spree/testing_support/dummy_app.rb

@@ -7,6 +7,7 @@ require 'rails'
 require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
+require 'active_storage/engine'
 
 Rails.env = 'test'
 
@@ -45,6 +46,7 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
+    config.has_many_inverse = true
     config.eager_load = false
     config.cache_classes = true
     config.cache_store = :memory_store
@@ -67,7 +69,7 @@ module DummyApp
 
     config.storage_path = Rails.root.join('tmp', 'storage')
 
-    if ENV['ENABLE_ACTIVE_STORAGE']
+    unless ENV['DISABLE_ACTIVE_STORAGE']
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
@@ -116,20 +118,11 @@ end
 
 Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
-  config.use_legacy_address_state_validator = false
   config.mails_from = "store@example.com"
-  config.raise_with_invalid_currency = false
-  config.redirect_back_on_unauthorized = true
-  config.run_order_validations_on_order_updater = true
-  config.use_combined_first_and_last_name_in_address = true
-  config.use_legacy_order_state_machine = false
-  config.use_custom_cancancan_actions = false
-  config.consider_actionless_promotion_active = false
-  config.use_legacy_store_credit_reimbursement_category_name = false
-
-  if ENV['ENABLE_ACTIVE_STORAGE']
-    config.image_attachment_module = 'Spree::Image::ActiveStorageAttachment'
-    config.taxon_attachment_module = 'Spree::Taxon::ActiveStorageAttachment'
+
+  if ENV['DISABLE_ACTIVE_STORAGE']
+    config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
+    config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end
 end
 

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

@@ -30,7 +30,6 @@ FactoryBot.define do
       after(:build) do |order, evaluator|
         order.line_items << build(
           :line_item,
-          order: order,
           price: evaluator.line_items_price
         )
       end

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

@@ -18,7 +18,6 @@ FactoryBot.define do
 
     amount { 100.00 }
     transaction_id { generate(:refund_transaction_id) }
-    perform_after_create { false }
     payment do
       association(:payment, state: 'completed', amount: payment_amount)
     end

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/tasks/upgrade.rake

@@ -2,12 +2,14 @@
 
 namespace :solidus do
   namespace :upgrade do
-    desc "Upgrade Solidus to version 2.11"
-    task two_point_eleven: [
-        'solidus:migrations:migrate_default_billing_addresses_to_address_book:up',
-        'solidus:migrations:migrate_address_names:up'
+    task three_point_zero: [
+        'railties:install:migrations',
+        'db:migrate'
       ] do
-      puts "Your Solidus install is ready for Solidus 2.11"
+      puts "Your Solidus install is ready for Solidus 3.0"
     end
   end
+
+  desc "Upgrade to the current Solidus version"
+  task upgrade: 'upgrade:three_point_zero'
 end

data/solidus_core.gemspec

@@ -39,8 +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 'paperclip', '>= 4.2'
-  s.add_dependency 'paranoia', '~> 2.4'
+  s.add_dependency 'kt-paperclip', '~> 6.3'
   s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
 
@@ -56,9 +55,7 @@ $ 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
+$ bin/rails solidus:upgrade
 
 Please report any issues at:
 - https://github.com/solidusio/solidus/issues

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.10
+  version: 3.0.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -331,33 +331,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: paranoia
+  name: kt-paperclip
   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'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -415,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
@@ -430,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
@@ -447,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
@@ -469,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
@@ -484,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
@@ -542,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
@@ -746,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
@@ -765,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
@@ -807,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
@@ -836,11 +808,9 @@ files:
 - 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
@@ -933,15 +903,6 @@ 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/upgrade.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
@@ -963,9 +924,7 @@ post_install_message: |
   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
+  $ bin/rails solidus:upgrade
 
   Please report any issues at:
   - https://github.com/solidusio/solidus/issues
@@ -985,7 +944,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.