solidus_core 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544b2bfea9af16a2ae309c6eb5b4d2038b60cf592b461b9019d66933324cbab8
-  data.tar.gz: 36312a6f1b0b979c06e68125199834650b0f5fea1ee65af092136527b4121978
+  metadata.gz: b7a2c88277ebda2afcdfced8c30f64602d6cc9bbb1839f47eab674e1e58ebd7f
+  data.tar.gz: 76b1cea1f67d9eff240ab277ceb2df51085e111224ead5c3343596e2dca0c15e
 SHA512:
-  metadata.gz: 4c5bbfc5dacae815c6ce863d2c807d2a4e49c448912f3c8e9f5e8901b5aa1b1c2e8d3bdeeea3ea3e76d116b66e6aa6e9eba307471023f44ed61806eaa3b662c6
-  data.tar.gz: 816d06788b22c4fe4b02780e0d640ba8f56a0186371ddbcf2e40cac9695a4f697e3a131cbc6d893321e42c741f27d63c48e7ce604958da5ed37957db451a5bfc
+  metadata.gz: fa93973896e2ad61b824e82f12a263594936a986db1c0bd4eb6689813e19d8cb1009d31d33201ca00ab6e524ad7cb31fc93f469932da842abc442470a8577c2e
+  data.tar.gz: 4d74fa5a9f2bbe435d22c247581762a97856c982e999f22d0886afb22bd624299a3ae77ed171b5ed42e9fafe1fab98e695d46c706e92d97763b803f0ec232a36

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/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/install_generator/install_frontend.rb

@@ -11,42 +11,48 @@ module Solidus
         @generator_context = generator_context
       end
 
-      def call(frontend, installer_adds_auth:)
+      def call(frontend)
         case frontend
         when 'solidus_frontend'
           install_solidus_frontend
         when 'solidus_starter_frontend'
-          install_solidus_starter_frontend(installer_adds_auth)
+          install_solidus_starter_frontend
         end
       end
 
       private
 
-      def install_solidus_frontend
-        unless @bundler_context.component_in_gemfile?(:frontend)
-          BundlerContext.bundle_cleanly do
-            `bundle add solidus_frontend`
-            `bundle install`
-          end
-        end
+      def bundle_command(command)
+        @generator_context.say_status :run, "bundle #{command}"
+        bundle_path = Gem.bin_path("bundler", "bundle")
 
-        @generator_context.generate("solidus_frontend:install #{@generator_context.options[:auto_accept] ? '--auto-accept' : ''}")
+        BundlerContext.bundle_cleanly do
+          system(
+            Gem.ruby,
+            bundle_path,
+            *command.shellsplit,
+          )
+        end
       end
 
-      def install_solidus_starter_frontend(installer_adds_auth)
-        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(:frontend)
+      def install_solidus_frontend
+        unless @bundler_context.component_in_gemfile?(:frontend)
+          bundle_command 'add solidus_frontend'
+        end
 
-        # TODO: Move installation of solidus_auth_devise to the
-        # solidus_starter_frontend template
-        unless auth_present?(installer_adds_auth)
-          BundlerContext.bundle_cleanly { `bundle add solidus_auth_devise` }
-          @generator_context.generate('solidus:auth:install --auto-run-migrations')
+        # 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
-        `LOCATION="https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/main/template.rb" bin/rails app:template`
       end
 
-      def auth_present?(installer_adds_auth)
-        installer_adds_auth || @bundler_context.component_in_gemfile?(:auth_devise)
+      def install_solidus_starter_frontend
+        @bundler_context.remove(['solidus_frontend']) if @bundler_context.component_in_gemfile?(:frontend)
+        @generator_context.apply "https://raw.githubusercontent.com/solidusio/solidus_starter_frontend/v3.2/template.rb"
       end
     end
   end

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

@@ -19,6 +19,12 @@ module Solidus
       'none'
     ].freeze
 
+    PAYMENT_METHODS = {
+      'paypal' => 'solidus_paypal_commerce_platform',
+      'bolt' => 'solidus_bolt',
+      'none' => nil,
+    }
+
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations must be run)'
@@ -28,13 +34,18 @@ module Solidus
     class_option :admin_email, type: :string
     class_option :admin_password, type: :string
     class_option :lib_name, type: :string, default: 'spree'
-    class_option :with_authentication, type: :boolean, default: true
+    class_option :with_authentication, type: :boolean, default: nil
     class_option :enforce_available_locales, type: :boolean, default: nil
     class_option :frontend,
                  type: :string,
                  enum: FRONTENDS,
                  default: nil,
                  desc: "Indicates which frontend to install."
+    class_option :payment_method,
+                 type: :string,
+                 enum: PAYMENT_METHODS.keys,
+                 default: nil,
+                 desc: "Indicates which payment method to install."
 
     def self.source_paths
       paths = superclass.source_paths
@@ -118,7 +129,8 @@ module Solidus
     end
 
     def install_auth_plugin
-      if options[:with_authentication] && (options[:auto_accept] || !no?("
+      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.
 
@@ -127,11 +139,32 @@ module Solidus
 
         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
+      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("
+  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
       append_file "db/seeds.rb", <<-RUBY.strip_heredoc
 
@@ -150,19 +183,6 @@ module Solidus
       rake 'db:create'
     end
 
-    def run_bundle_install_if_needed_by_plugins
-      @plugins_to_be_installed.each do |plugin_name|
-        gem plugin_name
-      end
-
-      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
-      run "spring stop" if defined?(Spring)
-
-      @plugin_generators_to_run.each do |plugin_generator_name|
-        generate "#{plugin_generator_name} --skip_migrations=true"
-      end
-    end
-
     def install_frontend
       return if options[:frontend] == 'none'
 
@@ -174,9 +194,22 @@ module Solidus
 
       say_status :installing, frontend
 
-      InstallFrontend.
-        new(bundler_context: bundler_context, generator_context: self).
-        call(frontend, installer_adds_auth: @plugins_to_be_installed.include?('solidus_auth_devise'))
+      InstallFrontend
+        .new(bundler_context: bundler_context, generator_context: self)
+        .call(frontend)
+    end
+
+    def run_bundle_install_if_needed_by_plugins
+      @plugins_to_be_installed.each do |plugin_name|
+        gem plugin_name
+      end
+
+      BundlerContext.bundle_cleanly { run "bundle install" } if @plugins_to_be_installed.any?
+      run "spring stop" if defined?(Spring)
+
+      @plugin_generators_to_run.each do |plugin_generator_name|
+        generate "#{plugin_generator_name} --skip_migrations=true"
+      end
     end
 
     def run_migrations

data/lib/spree/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1020,7 +1020,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.21
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.