solidus_core 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc968f634c0e31f7ad3d1928133d5d682df2669617eaca7abdc87379228d7e30
-  data.tar.gz: a2e38014e3d24fe363651e7e27f5b8fa21b93105f1269e67adee3e20ec1665fa
+  metadata.gz: 1ca291cd7b979dea71a53e089ec1f5582fd29606135be6802668e6a249655295
+  data.tar.gz: 35c97c39d287f13bd2330fef96e59eefa5d82869e49563a32706b827087a936a
 SHA512:
-  metadata.gz: 8fbc377c572b99bb42d055b1479f2be9c5bca450019f70bef38adf76a3bfd69057c90824150036c7ed1330d9052f3916f09a48a252b85f31c0719f33f5d52c43
-  data.tar.gz: c57b6889ddf53bcf23fc1ed0012a9759ef72a031a72e1c8a8a838abfb8594b8f401bb17a973d17c37347aae44f37411181ab9a663e884659ebeb6122c06481c4
+  metadata.gz: dcd03d7fe00dade48a32ff5862579eed61115afe17e225e0378ea83fb1af3c502467dbef833619159742b2b7cef998e53d47cde357d6e2b57beb73daa80708f2
+  data.tar.gz: cea864acea70b4d18b208481ffa8d0587ce5bc721f2de5d83c653b2125e7dbf1e9da81ef0cb211180d48df93a53daaf813e5d8d7ecd9181c5c0f9de2efd239ba

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

@@ -16,10 +16,12 @@ module Spree
 
     # Returns `#prices` prioritized for being considered as default price
     #
+    # @deprecated
     # @return [ActiveRecord::Relation<Spree::Price>]
     def currently_valid_prices
       prices.currently_valid
     end
+    deprecate :currently_valid_prices, deprecator: Spree::Deprecation
 
     # Returns {#default_price} or builds it from {Spree::Variant.default_price_attributes}
     #
@@ -33,7 +35,7 @@ module Spree
     # Select from {#prices} the one to be considered as the default
     #
     # This method works with the in-memory association, so non-persisted prices
-    # are taken into account. Discarded prices are also considered.
+    # are taken into account.
     #
     # A price is a candidate to be considered as the default when it meets
     # {Spree::Variant.default_price_attributes} criteria. When more than one candidate is
@@ -44,37 +46,11 @@ module Spree
     # @return [Spree::Price, nil]
     # @see Spree::Variant.default_price_attributes
     def default_price
-      prioritized_default(
-        prices_meeting_criteria_to_be_default(
-          (prices + prices.with_discarded).uniq
-        )
-      )
+      price_selector.price_for_options(Spree::Config.default_pricing_options)
     end
 
     def has_default_price?
       default_price.present? && !default_price.discarded?
     end
-
-    private
-
-    def prices_meeting_criteria_to_be_default(prices)
-      criteria = self.class.default_price_attributes.transform_keys(&:to_s)
-      prices.select do |price|
-        contender = price.attributes.slice(*criteria.keys)
-        criteria == contender
-      end
-    end
-
-    def prioritized_default(prices)
-      prices.min do |prev, succ|
-        contender_one, contender_two = [succ, prev].map do |item|
-          [
-            item.updated_at || Time.zone.now,
-            item.id || Float::INFINITY
-          ]
-        end
-        contender_one <=> contender_two
-      end
-    end
   end
 end

data/app/models/spree/tax_rate.rb

@@ -113,7 +113,8 @@ module Spree
     def amount_for_adjustment_label
       ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,
-        locale: I18n.locale
+        locale: I18n.locale,
+        precision: nil
       )
     end
 

data/app/models/spree/variant/price_selector.rb

@@ -39,12 +39,29 @@ module Spree
       # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
       # @return [Spree::Price, nil] The most specific price for this set of pricing options.
       def price_for_options(price_options)
-        variant.currently_valid_prices.detect do |price|
+        sorted_prices_for(variant).detect do |price|
           (price.country_iso == price_options.desired_attributes[:country_iso] ||
            price.country_iso.nil?
           ) && price.currency == price_options.desired_attributes[:currency]
         end
       end
+
+      private
+
+      # Returns `#prices` prioritized for being considered as default price
+      #
+      # @return [Array<Spree::Price>]
+      def sorted_prices_for(variant)
+        variant.prices.select do |price|
+          variant.discarded? || price.kept?
+        end.sort_by do |price|
+          [
+            price.country_iso.nil? ? 0 : 1,
+            price.updated_at || Time.zone.now,
+            price.id || Float::INFINITY,
+          ]
+        end.reverse
+      end
     end
   end
 end

data/app/models/spree/variant.rb

@@ -23,7 +23,6 @@ module Spree
     after_discard do
       stock_items.discard_all
       images.destroy_all
-      prices.discard_all
     end
 
     attr_writer :rebuild_vat_prices
@@ -52,6 +51,7 @@ module Spree
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
     has_many :prices,
+      -> { with_discarded },
       class_name: 'Spree::Price',
       dependent: :destroy,
       inverse_of: :variant,

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

@@ -0,0 +1,11 @@
+plugin_name = PAYMENT_METHODS.fetch(@selected_payment_method)
+plugin_generator_name = "#{plugin_name}:install"
+
+if bundler_context.dependencies[plugin_name]
+  say_status :skipping, "#{plugin_name} is already in the gemfile"
+else
+  gem plugin_name
+  run_bundle
+  run "spring stop" if defined?(Spring)
+  generate "#{plugin_generator_name} --skip_migrations=true"
+end

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

@@ -0,0 +1 @@
+# noop

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

@@ -0,0 +1,11 @@
+plugin_name = PAYMENT_METHODS.fetch(@selected_payment_method)
+plugin_generator_name = "#{plugin_name}:install"
+
+if bundler_context.dependencies[plugin_name]
+  say_status :skipping, "#{plugin_name} is already in the gemfile"
+else
+  gem plugin_name, @selected_frontend == 'solidus_frontend' ? '< 1' : '>= 1.a'
+  run_bundle
+  run "spring stop" if defined?(Spring)
+  generate "#{plugin_generator_name} --skip_migrations=true"
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Solidus
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < Rails::Generators::AppBase
     # Bundler context during the install process.
     #
     # This class gives access to information about the bundler context in which
@@ -49,7 +49,7 @@ module Solidus
       end
 
       def initialize
-        @dependencies = Bundler.locked_gems.dependencies
+        @dependencies = uncached_dependencies
         @injector = InjectorWithPathSupport
       end
 
@@ -92,6 +92,14 @@ module Solidus
       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,7 +1,7 @@
 # frozen_string_literal: true
 
 module Solidus
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < Rails::Generators::AppBase
     class InstallFrontend
       attr_reader :bundler_context,
                   :generator_context
@@ -17,27 +17,18 @@ module Solidus
           install_solidus_frontend
         when 'solidus_starter_frontend'
           install_solidus_starter_frontend
+        else
+          install_custom_frontend
         end
       end
 
       private
 
-      def bundle_command(command)
-        @generator_context.say_status :run, "bundle #{command}"
-        bundle_path = Gem.bin_path("bundler", "bundle")
-
-        BundlerContext.bundle_cleanly do
-          system(
-            Gem.ruby,
-            bundle_path,
-            *command.shellsplit,
-          )
-        end
-      end
-
       def install_solidus_frontend
         unless @bundler_context.component_in_gemfile?(:frontend)
-          bundle_command 'add solidus_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.
@@ -51,9 +42,20 @@ module Solidus
       end
 
       def install_solidus_starter_frontend
-        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(: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,7 +1,7 @@
 # frozen_string_literal: true
 
 module Solidus
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < Rails::Generators::AppBase
     # Helper for extracting solidus_frontend from solidus meta-gem
     #
     # We're recommending users use newer solidus_starter_frontend. However,

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
+require 'rails/generators/app_base'
 require 'rails/version'
 require_relative 'install_generator/bundler_context'
 require_relative 'install_generator/support_solidus_frontend_extraction'
@@ -8,7 +9,9 @@ require_relative 'install_generator/install_frontend'
 
 module Solidus
   # @private
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < Rails::Generators::AppBase
+    argument :app_path, type: :string, default: Rails.root
+
     CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
 
     LEGACY_FRONTEND = 'solidus_frontend'
@@ -123,14 +126,9 @@ module Solidus
       end
     end
 
-    def plugin_install_preparation
-      @plugins_to_be_installed = []
-      @plugin_generators_to_run = []
-    end
-
-    def install_auth_plugin
-      with_authentication = options[:with_authentication]
-      with_authentication.nil? and with_authentication = (options[:auto_accept] || !no?("
+    def select_auth_plugin
+      @with_authentication = options[:with_authentication]
+      @with_authentication.nil? and @with_authentication = (options[:auto_accept] || !no?("
         Solidus has a default authentication extension that uses Devise.
         You can find more info at https://github.com/solidusio/solidus_auth_devise.
 
@@ -138,31 +136,19 @@ module Solidus
         solidus_starter_frontend as your storefront in a later step.
 
         Would you like to install it? (Y/n)"))
-
-      if with_authentication
-        @plugins_to_be_installed << 'solidus_auth_devise'
-        @plugin_generators_to_run << 'solidus:auth:install'
-      end
     end
 
-    def install_payment_method
+    def select_payment_method
       say_status :warning, set_color(
         "Selecting a payment along with `solidus_starter_frontend` might require manual integration.",
         :yellow
       ), :yellow
 
-      name = options[:payment_method]
-      name ||= PAYMENT_METHODS.keys.first if options[:auto_accept]
-      name ||= ask("
+      @selected_payment_method = options[:payment_method]
+      @selected_payment_method ||= PAYMENT_METHODS.keys.first if options[:auto_accept]
+      @selected_payment_method ||= ask("
   You can select a payment method to be included in the installation process.
   Please select a payment method name:", limited_to: PAYMENT_METHODS.keys, default: PAYMENT_METHODS.keys.first)
-
-      gem_name = PAYMENT_METHODS.fetch(name)
-
-      if gem_name
-        @plugins_to_be_installed << gem_name
-        @plugin_generators_to_run << "#{gem_name}:install"
-      end
     end
 
     def include_seed_data
@@ -184,32 +170,35 @@ module Solidus
     end
 
     def install_frontend
-      return if options[:frontend] == 'none'
-
-      bundler_context = BundlerContext.new
+      @selected_frontend = detect_frontend_to_install
 
-      frontend = detect_frontend_to_install(bundler_context)
+      if @selected_frontend == 'none'
+        support_solidus_frontend_extraction
+      else
+        support_solidus_frontend_extraction unless @selected_frontend == LEGACY_FRONTEND
 
-      support_solidus_frontend_extraction(bundler_context) unless frontend == LEGACY_FRONTEND
+        say_status :installing, @selected_frontend
 
-      say_status :installing, frontend
+        InstallFrontend
+          .new(bundler_context: bundler_context, generator_context: self)
+          .call(@selected_frontend)
 
-      InstallFrontend
-        .new(bundler_context: bundler_context, generator_context: self)
-        .call(frontend)
+        # The DEFAULT_FRONTEND installation makes changes to the
+        # bundle without updating the bundler context. As such, we need to
+        # reset the bundler context to get the latest dependencies from the
+        # context.
+        reset_bundler_context if @selected_frontend == DEFAULT_FRONTEND
+      end
     end
 
-    def run_bundle_install_if_needed_by_plugins
-      @plugins_to_be_installed.each do |plugin_name|
-        gem plugin_name
-      end
+    def install_authentication_plugin
+      return unless @with_authentication
 
-      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
-      run "spring stop" if defined?(Spring)
+      install_plugin(plugin_name: 'solidus_auth_devise', plugin_generator_name: 'solidus:auth:install')
+    end
 
-      @plugin_generators_to_run.each do |plugin_generator_name|
-        generate "#{plugin_generator_name} --skip_migrations=true"
-      end
+    def install_payment_method
+      apply_template_for :payment_method, @selected_payment_method
     end
 
     def run_migrations
@@ -280,7 +269,21 @@ module Solidus
 
     private
 
-    def detect_frontend_to_install(bundler_context)
+    def apply_template_for(topic, selected)
+      template_path = Dir["#{__dir__}/app_templates/#{topic}/*.rb"].find do |path|
+        File.basename(path, '.rb') == selected
+      end
+
+      unless template_path
+        say_status :warning, "Unknown #{topic}: #{selected.inspect}, attempting to run it with `rails app:template`"
+        template_path = selected
+      end
+
+      say_status :installing, "[#{topic}] #{selected}", :blue
+      apply template_path
+    end
+
+    def detect_frontend_to_install
       ENV['FRONTEND'] ||
         options[:frontend] ||
         (bundler_context.component_in_gemfile?(:frontend) && LEGACY_FRONTEND) ||
@@ -294,12 +297,32 @@ module Solidus
         MSG
     end
 
-    def support_solidus_frontend_extraction(bundler_context)
+    def support_solidus_frontend_extraction
       say_status "break down", "solidus"
 
       SupportSolidusFrontendExtraction.
         new(bundler_context: bundler_context).
         call
     end
+
+    def install_plugin(plugin_name:, plugin_generator_name:)
+      if bundler_context.dependencies[plugin_name]
+        say_status :skipping, "#{plugin_name} is already in the gemfile"
+        return
+      end
+
+      gem plugin_name
+      run_bundle
+      run "spring stop" if defined?(Spring)
+      generate "#{plugin_generator_name} --skip_migrations=true"
+    end
+
+    def bundler_context
+      @bundler_context ||= BundlerContext.new
+    end
+
+    def reset_bundler_context
+      @bundler_context = nil
+    end
   end
 end

data/lib/spree/core/version.rb

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

data/lib/spree/core.rb

@@ -14,7 +14,6 @@ require 'awesome_nested_set'
 require 'cancan'
 require 'friendly_id'
 require 'kaminari/activerecord'
-require 'mail'
 require 'monetize'
 require 'paperclip'
 require 'ransack'

data/lib/spree/preferences/preferable.rb

@@ -10,6 +10,9 @@ module Spree
     #
     # A class including Preferable must implement #preferences which should return
     # an object responding to .fetch(key), []=(key, val), and .delete(key).
+    # If #preferences is initialized with `default_preferences` and one of the
+    # preferences is another preference, it will cause a stack level too deep error.
+    # To avoid it do not memoize #preferences.
     #
     # It may also define a `#context_for_default` method. It should return an
     # array with the arguments to be provided to a proc used as the `default:`
@@ -111,6 +114,8 @@ module Spree
       end
 
       # @return [Hash{Symbol => Object}] Default for all preferences defined on this class
+      # This may raise an infinite loop error if any of the defaults are
+      # dependent on other preferences defaults.
       def default_preferences
         Hash[
           defined_preferences.map do |preference|

data/lib/spree/preferences/preferable_class_methods.rb

@@ -75,7 +75,7 @@ module Spree::Preferences
       # is a pending preference before going to default
       define_method preference_getter_method(name) do
         value = preferences.fetch(name) do
-          default.call(*context_for_default)
+          instance_exec(*context_for_default, &default)
         end
         value = preference_encryptor.decrypt(value) if preference_encryptor.present?
         value
@@ -92,7 +92,7 @@ module Spree::Preferences
       end
 
       define_method preference_default_getter_method(name) do
-        default.call(*context_for_default)
+        instance_exec(*context_for_default, &default)
       end
 
       define_method preference_type_getter_method(name) do

data/lib/spree/testing_support/common_rake.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-unless defined?(Solidus::InstallGenerator)
-  require 'generators/solidus/install/install_generator'
-end
-
 require 'generators/spree/dummy/dummy_generator'
 
 class CommonRakeTasks
@@ -17,8 +13,31 @@ class CommonRakeTasks
 
         force_rails_environment_to_test
 
-        Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--quiet"]
-        Solidus::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--with-authentication=false", "--payment-method=none", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
+        Spree::DummyGenerator.start [
+          "--lib-name=#{ENV['LIB_NAME']}",
+          "--quiet",
+        ]
+
+        # While the dummy app is generated the current directory
+        # within ruby is changed to that of the dummy app.
+        sh({
+          'SKIP_SOLIDUS_BOLT' => '1',
+          'FRONTEND' => 'solidus_frontend',
+        }, [
+          'bin/rails',
+          'generate',
+          'solidus:install',
+          Dir.pwd, # use the current dir as Rails.root
+          "--lib-name=#{ENV['LIB_NAME']}",
+          "--auto-accept",
+          "--with-authentication=false",
+          "--payment-method=none",
+          "--migrate=false",
+          "--seed=false",
+          "--sample=false",
+          "--user-class=#{args[:user_class]}",
+          "--quiet",
+        ].shelljoin)
 
         puts "Setting up dummy database..."
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -764,6 +764,9 @@ files:
 - db/migrate/20210312061050_change_column_null_on_prices.rb
 - db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb
 - db/seeds.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
@@ -1020,7 +1023,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.