solidus_core 3.2.5 → 3.3.0

data/solidus_core.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.2', '< 7.1.x']
+    s.add_dependency rails_dep, ['>= 6.0', '< 7.1.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -96,7 +96,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.x
@@ -482,6 +482,7 @@ files:
 - app/models/spree/calculator.rb
 - app/models/spree/calculator/default_tax.rb
 - app/models/spree/calculator/distributed_amount.rb
+- app/models/spree/calculator/flat_fee.rb
 - app/models/spree/calculator/flat_percent_item_total.rb
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
@@ -552,6 +553,7 @@ files:
 - app/models/spree/promotion/actions/create_item_adjustments.rb
 - app/models/spree/promotion/actions/create_quantity_adjustments.rb
 - app/models/spree/promotion/actions/free_shipping.rb
+- app/models/spree/promotion/order_adjustments_recalculator.rb
 - app/models/spree/promotion/rules/first_order.rb
 - app/models/spree/promotion/rules/first_repeat_purchase_since.rb
 - app/models/spree/promotion/rules/item_total.rb
@@ -654,6 +656,7 @@ files:
 - app/models/spree/store_credit.rb
 - app/models/spree/store_credit_category.rb
 - app/models/spree/store_credit_event.rb
+- app/models/spree/store_credit_prioritizer.rb
 - app/models/spree/store_credit_reason.rb
 - app/models/spree/store_credit_type.rb
 - app/models/spree/store_payment_method.rb
@@ -763,14 +766,21 @@ files:
 - db/migrate/20210122110141_add_name_to_spree_addresses.rb
 - db/migrate/20210312061050_change_column_null_on_prices.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/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/none.rb
 - lib/generators/solidus/install/app_templates/payment_method/paypal.rb
 - lib/generators/solidus/install/install_generator.rb
-- lib/generators/solidus/install/install_generator/bundler_context.rb
-- lib/generators/solidus/install/install_generator/install_frontend.rb
-- lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
 - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/backend/all.css
@@ -973,6 +983,7 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - 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
@@ -1016,7 +1027,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/generators/solidus/install/install_generator/bundler_context.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-module Solidus
-  class InstallGenerator < Rails::Generators::AppBase
-    # Bundler context during the install process.
-    #
-    # This class gives access to information about the bundler context in which
-    # the install generator is run. I.e., which solidus components are present
-    # in the user's Gemfile. It also allows modifying the Gemfile to add or
-    # remove gems.
-    #
-    # @api private
-    class BundlerContext
-      # 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 `Bundled.locked_gems.dependencies`.
-      #
-      # @api private
-      class InjectorWithPathSupport < Bundler::Injector
-        private 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}\"".yield_self { |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
-
-      attr_reader :dependencies, :injector
-
-      def self.bundle_cleanly(&block)
-        Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&block) : Bundler.with_clean_env(&block)
-      end
-
-      def initialize
-        @dependencies = uncached_dependencies
-        @injector = InjectorWithPathSupport
-      end
-
-      def solidus_in_gemfile?
-        !solidus_dependency.nil?
-      end
-
-      def component_in_gemfile?(name)
-        !@dependencies["solidus_#{name}"].nil?
-      end
-
-      def break_down_components(components)
-        raise <<~MSG  unless solidus_in_gemfile?
-          solidus meta gem needs to be present in the Gemfile to build the component dependency
-        MSG
-
-        @injector.inject(
-          components.map { |component| dependency_for_component(component) }
-        )
-      end
-
-      def remove(*args, **kwargs, &block)
-        @injector.remove(*args, **kwargs, &block)
-      end
-
-      private
-
-      def dependency_for_component(component)
-        Bundler::Dependency.new(
-          "solidus_#{component}",
-          solidus_dependency.requirement,
-          {
-            "source" => solidus_dependency.source,
-            "git" => solidus_dependency.source.try(:uri),
-            "ref" => solidus_dependency.source.try(:ref)
-          }
-        )
-      end
-
-      def solidus_dependency
-        @dependencies['solidus']
-      end
-
-      # We want to get the locked gems from `Bundler.definition.locked_gems`
-      # instead of `Bundler.locked_gems` so that the locked gems won't be
-      # memoized. See
-      # https://rubydoc.info/gems/bundler/2.3.22/Bundler.locked_gems.
-      def uncached_dependencies
-        Bundler.definition.locked_gems.dependencies
-      end
-    end
-  end
-end

data/lib/generators/solidus/install/install_generator/install_frontend.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Solidus
-  class InstallGenerator < Rails::Generators::AppBase
-    class InstallFrontend
-      attr_reader :bundler_context,
-                  :generator_context
-
-      def initialize(bundler_context:, generator_context:)
-        @bundler_context = bundler_context
-        @generator_context = generator_context
-      end
-
-      def call(frontend)
-        case frontend
-        when 'solidus_frontend'
-          install_solidus_frontend
-        when 'solidus_starter_frontend'
-          install_solidus_starter_frontend
-        else
-          install_custom_frontend
-        end
-      end
-
-      private
-
-      def install_solidus_frontend
-        unless @bundler_context.component_in_gemfile?(:frontend)
-          # `Rails::Generator::AppBase#bundle_command` is protected so have to `send` it.
-          # See https://api.rubyonrails.org/v3.2.16/classes/Rails/Generators/AppBase.html#method-i-run_bundle
-          @generator_context.send :bundle_command, 'add solidus_frontend'
-        end
-
-        # Solidus bolt will be handled in the installer as a payment method.
-        begin
-          skip_solidus_bolt = ENV['SKIP_SOLIDUS_BOLT']
-          ENV['SKIP_SOLIDUS_BOLT'] = 'true'
-          @generator_context.generate("solidus_frontend:install #{@generator_context.options[:auto_accept] ? '--auto-accept' : ''}")
-        ensure
-          ENV['SKIP_SOLIDUS_BOLT'] = skip_solidus_bolt
-        end
-      end
-
-      def install_solidus_starter_frontend
-        remove_solidus_frontend
-        @generator_context.apply "https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/v3.2/template.rb"
-      end
-
-      def install_custom_frontend
-        remove_solidus_frontend
-        @generator_context.apply ENV['FRONTEND'] or abort("Frontend installation failed.")
-      end
-
-      def remove_solidus_frontend
-        return unless @bundler_context.component_in_gemfile?(:frontend)
-
-        @bundler_context.remove(['solidus_frontend'])
-      end
-    end
-  end
-end

data/lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Solidus
-  class InstallGenerator < Rails::Generators::AppBase
-    # Helper for extracting solidus_frontend from solidus meta-gem
-    #
-    # We're recommending users use newer solidus_starter_frontend. However,
-    # we're still shipping solidus_frontend as part of the solidus meta-gem. The
-    # reason is that we don't want users updating previous versions to see its
-    # storefront gone suddenly.
-    #
-    # In future solidus releases, solidus_frontend won't be a component anymore.
-    # However, until that happens:
-    #
-    # - For users of the new frontend, we need to prevent pulling
-    # solidus_frontend.
-    # - For users of the legacy frontend, we need to prevent Bundler from
-    # resolving it from the mono-repo while it's still there.
-    #
-    # This class is a needed companion during the deprecation
-    # path. It'll modify the user's Gemfile, breaking the solidus gem down into
-    # its components but solidus_frontend.
-    class SupportSolidusFrontendExtraction
-      attr_reader :bundler_context
-
-      def initialize(bundler_context:)
-        @bundler_context = bundler_context
-      end
-
-      def call
-        return unless needs_to_break_down_solidus_meta_gem?
-
-        break_down_solidus_meta_gem
-      end
-
-      private
-
-      def break_down_solidus_meta_gem
-        @bundler_context.break_down_components(%w[core backend api sample])
-        @bundler_context.remove(['solidus'])
-      end
-
-      def needs_to_break_down_solidus_meta_gem?
-        @bundler_context.solidus_in_gemfile?
-      end
-    end
-  end
-end