solidus_core 3.4.2 → 4.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -16,160 +16,160 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.x
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -697,7 +697,6 @@ files:
 - app/models/spree/wallet_payment_source.rb
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
-- app/subscribers/spree/mailer_subscriber.rb
 - app/subscribers/spree/order_mailer_subscriber.rb
 - app/views/layouts/spree/base_mailer.html.erb
 - app/views/spree/carton_mailer/shipped_email.html.erb
@@ -717,6 +716,7 @@ files:
 - app/views/spree/shared/_error_messages.html.erb
 - app/views/spree/test_mailer/test_email.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
+- bin/rails
 - config/i18n-tasks.yml
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
@@ -765,22 +765,27 @@ files:
 - db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb
 - db/migrate/20210122110141_add_name_to_spree_addresses.rb
 - db/migrate/20210312061050_change_column_null_on_prices.rb
+- db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb
 - db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb
 - db/migrate/20220805202442_add_level_to_spree_tax_rates.rb
 - db/migrate/20221123152807_add_shipping_category_to_spree_variants.rb
+- db/migrate/20230321161854_change_column_null_option_values_option_type_id.rb
+- db/migrate/20230322085416_remove_match_policy_from_spree_promotion.rb
+- db/migrate/20230325132905_remove_unused_columns_from_promotion_rules.rb
+- db/migrate/20230325161633_drop_unused_promo_action_line_items.rb
+- db/migrate/20230425103509_remove_taxon_position.rb
+- db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb
 - db/seeds.rb
 - lib/generators/solidus/install/app_templates/authentication/custom.rb
 - lib/generators/solidus/install/app_templates/authentication/devise.rb
 - lib/generators/solidus/install/app_templates/authentication/existing.rb
 - lib/generators/solidus/install/app_templates/authentication/none.rb
-- lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb
-- lib/generators/solidus/install/app_templates/frontend/classic.rb
 - lib/generators/solidus/install/app_templates/frontend/none.rb
 - lib/generators/solidus/install/app_templates/frontend/starter.rb
-- lib/generators/solidus/install/app_templates/payment_method/bolt.rb
 - lib/generators/solidus/install/app_templates/payment_method/braintree.rb
 - lib/generators/solidus/install/app_templates/payment_method/none.rb
 - lib/generators/solidus/install/app_templates/payment_method/paypal.rb
+- lib/generators/solidus/install/app_templates/payment_method/stripe.rb
 - lib/generators/solidus/install/install_generator.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
 - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js
@@ -808,7 +813,6 @@ files:
 - lib/spree/core/class_constantizer.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
-- lib/spree/core/controller_helpers/current_host.rb
 - lib/spree/core/controller_helpers/order.rb
 - lib/spree/core/controller_helpers/payment_parameters.rb
 - lib/spree/core/controller_helpers/pricing.rb
@@ -844,11 +848,6 @@ files:
 - lib/spree/core/versioned_value.rb
 - lib/spree/deprecation.rb
 - lib/spree/encryptor.rb
-- lib/spree/event.rb
-- lib/spree/event/adapters/active_support_notifications.rb
-- lib/spree/event/configuration.rb
-- lib/spree/event/subscriber.rb
-- lib/spree/event/subscriber_registry.rb
 - lib/spree/i18n.rb
 - lib/spree/localized_number.rb
 - lib/spree/mailer_previews/carton_preview.rb
@@ -886,9 +885,6 @@ files:
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
-- lib/spree/promotion/match_policies.rb
-- lib/spree/rails_compatibility.rb
-- lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
 - lib/spree/testing_support/blacklist_urls.rb
@@ -899,17 +895,13 @@ files:
 - lib/spree/testing_support/controller_requests.rb
 - lib/spree/testing_support/dummy_app.rb
 - lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js
-- lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js
 - lib/spree/testing_support/dummy_app/assets/stylesheets/spree/backend/all.css
-- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css
 - lib/spree/testing_support/dummy_app/database.yml
 - lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb
 - lib/spree/testing_support/dummy_app/migrations.rb
 - lib/spree/testing_support/dummy_app/rake_tasks.rb
 - lib/spree/testing_support/dummy_app/routes.rb
-- lib/spree/testing_support/dummy_app/views/layouts/application.html.erb
 - lib/spree/testing_support/extension_rake.rb
-- lib/spree/testing_support/factories.rb
 - lib/spree/testing_support/factories/address_factory.rb
 - lib/spree/testing_support/factories/adjustment_factory.rb
 - lib/spree/testing_support/factories/adjustment_reason_factory.rb
@@ -988,9 +980,7 @@ files:
 - lib/spree_core.rb
 - lib/tasks/colorado_delivery_fee.rake
 - lib/tasks/payment_method.rake
-- lib/tasks/solidus/check_orders_with_invalid_email.rake
 - lib/tasks/solidus/delete_prices_with_nil_amount.rake
-- lib/tasks/solidus/split_promotions_with_any_match_policy.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
@@ -1017,7 +1007,7 @@ post_install_message: |
   Please, don't forget to look at the CHANGELOG to see what has changed and
   whether you need to perform other tasks.
 
-  https://github.com/solidusio/solidus/blob/master/CHANGELOG.md
+  https://github.com/solidusio/solidus/blob/main/CHANGELOG.md
 
   Please report any issues at:
   - https://github.com/solidusio/solidus/issues
@@ -1030,15 +1020,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []

data/app/subscribers/spree/mailer_subscriber.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spree/event/subscriber'
-
-module Spree
-  # Legacy subscriber
-  #
-  # This subscriber module is used by the legacy pub/sub system (see
-  # {Spree::Event}).
-  module MailerSubscriber
-    include Spree::Event::Subscriber
-
-    event_action :order_finalized
-    event_action :send_reimbursement_email, event_name: :reimbursement_reimbursed
-
-    def order_finalized(event)
-      order = event.payload[:order]
-      unless order.confirmation_delivered?
-        Spree::Config.order_mailer_class.confirm_email(order).deliver_later
-        order.update_column(:confirmation_delivered, true)
-      end
-    end
-
-    def send_reimbursement_email(event)
-      reimbursement = event.payload[:reimbursement]
-      Spree::Config.reimbursement_mailer_class.reimbursement_email(reimbursement.id).deliver_later
-    end
-  end
-end

data/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb

@@ -1,54 +0,0 @@
-# # This will unpack the solidus gem into its components without calling `bundle install`.
-#
-# # Nothing to do if the `solidus` gem is not there.
-solidus = Bundler.locked_gems.dependencies['solidus'] or return
-
-# Write and remove into and from a Gemfile
-#
-# This custom injector fixes support for path, git and custom sources,
-# which is missing in bundler's upstream injector for a dependency fetched
-# with `Bundler.locked_gems.dependencies`.
-bundler_injector = Class.new(Bundler::Injector) do
-  def build_gem_lines(conservative_versioning)
-    @deps.map do |d|
-      name = d.name.dump
-      is_local = d.source.instance_of?(Bundler::Source::Path)
-      is_git = d.source.instance_of?(Bundler::Source::Git)
-
-      requirement = if is_local
-                      ", path: \"#{d.source.path}\""
-                    elsif is_git
-                      ", git: \"#{d.git}\"".then { |g| d.ref ? g + ", ref: \"#{d.ref}\"" : g }
-                    elsif conservative_versioning
-                      ", \"#{conservative_version(@definition.specs[d.name][0])}\""
-                    else
-                      ", #{d.requirement.as_list.map(&:dump).join(", ")}"
-                    end
-
-      source = ", source: \"#{d.source.remotes.join(",")}\"" unless is_local || is_git || d.source.nil?
-
-      %(gem #{name}#{requirement}#{source})
-    end.join("\n")
-  end
-end
-
-to_dependency = ->(component) do
-  Bundler::Dependency.new(
-    component,
-    solidus.requirement,
-    "source" => solidus.source,
-    "git" => solidus.source.try(:uri),
-    "ref" => solidus.source.try(:ref),
-  )
-end
-
-bundler_injector.inject(%w[
-  solidus_core
-  solidus_backend
-  solidus_api
-  solidus_sample
-].map(&to_dependency))
-
-bundler_injector.remove(%w[
-  solidus
-])

data/lib/generators/solidus/install/app_templates/frontend/classic.rb

@@ -1,16 +0,0 @@
-solidus = Bundler.locked_gems.dependencies['solidus']
-
-if Bundler.locked_gems.dependencies['solidus_frontend']
-  say_status :skipping, "solidus_frontend is already in the bundle", :blue
-else
-  # `solidus_frontend` is not sourced from rubygems if the solidus gem was not.
-  github_solidus_frontend = '--github solidusio/solidus_frontend' unless solidus.nil? || solidus.source.is_a?(Bundler::Source::Rubygems)
-
-  bundle_command("add solidus_frontend #{github_solidus_frontend}")
-end
-
-# Disable solidus_bolt installation from solidus_frontend as it can be
-# explicitly selected directly from the solidus installer.
-with_env('SKIP_SOLIDUS_BOLT' => 'true') do
-  generate 'solidus_frontend:install'
-end

data/lib/generators/solidus/install/app_templates/payment_method/bolt.rb

@@ -1,13 +0,0 @@
-unless Bundler.locked_gems.dependencies['solidus_frontend']
-  say_status :warning, "Support for frontends other than `solidus_frontend` by `solidus_bolt` is still in progress.", :yellow
-end
-
-unless Bundler.locked_gems.dependencies['solidus_auth_devise']
-  say_status :warning, "Running solidus_bolt without solidus_auth_devise is not supported.", :yellow
-end
-
-unless Bundler.locked_gems.dependencies['solidus_bolt']
-  bundle_command 'add solidus_bolt'
-end
-
-generate "solidus_bolt:install --auto-run-migrations=#{options[:migrate]}"

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Core
-    module ControllerHelpers
-      module CurrentHost
-        extend ActiveSupport::Concern
-
-        included do
-          Spree::Deprecation.warn <<~MSG
-            'Spree::Core::ControllerHelpers::CurrentHost' is deprecated.
-            Please, include 'ActiveStorage::SetCurrent' instead.
-          MSG
-          include ActiveStorage::SetCurrent
-        end
-      end
-    end
-  end
-end

data/lib/spree/event/adapters/active_support_notifications.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Event
-    module Adapters
-      module ActiveSupportNotifications
-        class InvalidEventNameType < StandardError; end
-
-        extend self
-
-        def fire(event_name, opts)
-          ActiveSupport::Notifications.instrument event_name, opts do
-            yield opts if block_given?
-          end
-        end
-
-        def subscribe(event_name)
-          ActiveSupport::Notifications.subscribe event_name do |*args|
-            event = ActiveSupport::Notifications::Event.new(*args)
-            yield event
-          end
-        end
-
-        def unsubscribe(subscriber_or_name)
-          ActiveSupport::Notifications.unsubscribe(subscriber_or_name)
-        end
-
-        def listeners_for(names)
-          names.each_with_object({}) do |name, memo|
-            listeners = ActiveSupport::Notifications.notifier.listeners_for(name)
-            memo[name] = listeners if listeners.present?
-          end
-        end
-
-        # Normalizes the event name according to this specific adapter rules.
-        #  When the event name is a string or a symbol, if the suffix is missing, then
-        #  it is added automatically.
-        #  When the event name is a regexp, due to the huge variability of regexps, adding
-        #  or not the suffix is developer's responsibility (if you don't, you will subscribe
-        #  to all internal rails events as well).
-        #  When the event type is not supported, an error is raised.
-        #
-        # @param [String, Symbol, Regexp] event_name the event name, with or without the
-        #  suffix (Spree::Config.events.suffix defaults to `.spree`).
-        def normalize_name(event_name)
-          case event_name
-          when Regexp
-            event_name
-          when String, Symbol
-            name = event_name.to_s
-            name.end_with?(suffix) ? name : [name, suffix].join
-          else
-            raise InvalidEventNameType, "Invalid event name type: #{event_name.class}"
-          end
-        end
-
-        # The suffix used for namespacing event names, defaults to
-        # `.spree`
-        #
-        # @see Spree::Event::Configuration#suffix
-        def suffix
-          Spree::Config.events.suffix
-        end
-      end
-    end
-  end
-end

data/lib/spree/event/configuration.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Event
-    class Configuration
-      def subscriber_registry
-        @subscriber_registry ||= Spree::Event::SubscriberRegistry.new
-      end
-
-      attr_writer :adapter, :suffix, :autoload_subscribers
-
-      def autoload_subscribers
-        @autoload_subscribers.nil? ? true : !!@autoload_subscribers
-      end
-
-      def adapter
-        @adapter ||= Spree::Event::Adapters::ActiveSupportNotifications
-      end
-
-      def suffix
-        @suffix ||= '.spree'
-      end
-    end
-  end
-end

data/lib/spree/event/subscriber.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Event
-    # This module simplifies adding and removing subscriptions to {Spree::Event} events.
-    # Here's a complete example:
-    #   module EmailSender
-    #     include Spree::Event::Subscriber
-    #
-    #     event_action :order_finalized
-    #     event_action :confirm_reimbursement, event_name: :reimbursement_reimbursed
-    #
-    #     def order_finalized(event)
-    #       Mailer.send_email(event.payload[:order])
-    #     end
-    #
-    #     def confirm_reimbursement(event)
-    #       Mailer.send_email(event.payload[:reimbursement])
-    #     end
-    #   end
-    #
-    #  # Optional, required only when the subscriber needs to be loaded manually.
-    #  #
-    #  # If Spree::Config.events.autoload_subscribers is set to `true` and the module
-    #  # file matches the pattern `app/subscribers/**/*_subscriber.rb` then it will
-    #  # be loaded automatically at boot and this line can be removed:
-    #  EmailSender.activate
-    module Subscriber
-      def self.included(base)
-        base.extend base
-
-        base.mattr_accessor :event_actions
-        base.event_actions = {}
-
-        Spree::Event.subscriber_registry.register(base)
-      end
-
-      # Declares a method name in the including module that can be subscribed/unsubscribed
-      # to an event.
-      #
-      # @param method_name [String, Symbol] the method that will be called when the subscribed event is fired
-      # @param event_name [String, Symbol] the name of the event to be subscribed
-      #
-      # @example Declares 'send_email' as an event action that can subscribe the event 'order_finalized'
-      #   module EmailSender
-      #     event_action :send_email, event_name: :order_finalized
-      #
-      #     def send_email(event)
-      #       Mailer.send_email(event.payload[:order])
-      #     end
-      #   end
-      #
-      # @example Same as above, but the method name is same as the event name:
-      #   module EmailSender
-      #     event_action :order_completed
-      #
-      #     def order_completed(event)
-      #       Mailer.send_email(event.payload[:order])
-      #     end
-      #   end
-      def event_action(method_name, event_name: nil)
-        event_actions[method_name] = (event_name || method_name).to_s
-      end
-
-      # Activates all declared event actions to their events. Only actions that are activated
-      # will be called when their event fires.
-      #
-      # @example activate all event actions for module 'EmailSender'
-      #    EmailSender.activate
-      def activate
-        Spree::Event.subscriber_registry.activate_subscriber(self)
-      end
-
-      # Deactivates all declared event actions (or a single specific one) from their events.
-      # This means that when an event fires then none of its unsubscribed event actions will
-      # be called.
-      # @example deactivate all event actions for module 'EmailSender'
-      #    EmailSender.deactivate
-      # @example deactivate only order_finalized for module 'EmailSender'
-      #    EmailSender.deactivate(:order_finalized)
-      def deactivate(event_action_name = nil)
-        Spree::Event.subscriber_registry.deactivate_subscriber(self, event_action_name)
-      end
-    end
-  end
-end