solidus_core 3.2.5 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ca291cd7b979dea71a53e089ec1f5582fd29606135be6802668e6a249655295
-  data.tar.gz: 35c97c39d287f13bd2330fef96e59eefa5d82869e49563a32706b827087a936a
+  metadata.gz: d2b38eb2401bb7f4cc38c7eadab97621ec03a74aab1083aaa838e7ac02a753f8
+  data.tar.gz: b6d75fd4b66ded6bbc9edbba1b89ecfdc112310e8aa430e4402bc6d82a4d82ef
 SHA512:
-  metadata.gz: dcd03d7fe00dade48a32ff5862579eed61115afe17e225e0378ea83fb1af3c502467dbef833619159742b2b7cef998e53d47cde357d6e2b57beb73daa80708f2
-  data.tar.gz: cea864acea70b4d18b208481ffa8d0587ce5bc721f2de5d83c653b2125e7dbf1e9da81ef0cb211180d48df93a53daaf813e5d8d7ecd9181c5c0f9de2efd239ba
+  metadata.gz: b383febf1f4b46763aca57b0cc491a66f9e5cd407579d302f9fdbf9421d9a61f9a6f0ab89c570c5a61bc444ab17a18e8b86ab3fe088a4ce4354cb3b0c22b1208
+  data.tar.gz: 351d24867375e4b103d49ab1fa084acea266af23a883f0d83005e574ef5d6fa51d07d39f9a6fe507298ddb403d2db6982ed204651649e21c0f7c3ab76db81b0b

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

@@ -32,6 +32,12 @@ module Spree
         prices.build(self.class.default_price_attributes)
     end
 
+    # @deprecated Use {#default_price_or_build} instead.
+    def find_or_build_default_price
+      default_price_or_build
+    end
+    deprecate find_or_build_default_price: :default_price_or_build, deprecator: Spree::Deprecation
+
     # Select from {#prices} the one to be considered as the default
     #
     # This method works with the in-memory association, so non-persisted prices

data/app/models/spree/product.rb

@@ -83,6 +83,7 @@ module Spree
       :height,
       :price,
       :sku,
+      :track_inventory,
       :weight,
       :width,
     ]

data/app/models/spree/tax_rate.rb

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

data/config/locales/en.yml

@@ -751,6 +751,10 @@ en:
       not_saved:
         one: '1 error prohibited this %{resource} from being saved:'
         other: "%{count} errors prohibited this %{resource} from being saved:"
+  number:
+    percentage:
+      format:
+        precision: 1
   spree:
     abbreviation: Abbreviation
     accept: Accept

data/lib/generators/solidus/update/update_generator.rb

@@ -8,7 +8,7 @@ module Solidus
   class UpdateGenerator < ::Rails::Generators::Base
     FROM = Spree.previous_solidus_minor_version
 
-    desc 'Generates a new initializer to preview the new defaults for current Solidus version'
+    desc 'Generates a new initializer to preview the new defaults for current Solidus version and copy new migrations'
 
     source_root File.expand_path('templates', __dir__)
 
@@ -37,10 +37,15 @@ module Solidus
                  default: 'config/initializers/',
                  hide: true
 
+    class_option :install_migrations,
+                 type: :boolean,
+                 default: true,
+                 hide: true
+
     def create_new_defaults_initializer
       previous_version_prompt = options[:previous_version_prompt]
       return if previous_version_prompt && !yes?(<<~MSG, :red)
-        The update process is only supported if you are coming from version #{FROM}. If this is not the case, please, skip it and update your application to use Solidus #{FROM} before retrying.
+        The default preferences update process is only supported if you are coming from version #{FROM}. If this is not the case, please, skip it and update your application to use Solidus #{FROM} before retrying.
         If you are confident you want to upgrade from a previous version, you must rerun the generator with the "--from={OLD_VERSION}" argument.
         Are you sure you want to continue? (y/N)
       MSG
@@ -57,6 +62,13 @@ module Solidus
                File.join(options[:initializer_directory], "#{options[:initializer_basename]}.rb")
     end
 
+    def install_migrations
+      return unless options[:install_migrations]
+
+      say_status :copying, "migrations"
+      rake 'spree:install:migrations'
+    end
+
     def print_message
       say <<~MSG
 

data/lib/spree/bus.rb

@@ -9,12 +9,12 @@ module Spree
   # It has some modifications to support internal usage of the legacy event
   # system {see Spree::AppConfiguration#use_legacy_events}.
   Bus = Omnes::Bus.new
-  Bus.define_singleton_method(:publish) do |*args, **kwargs, &block|
+  def Bus.publish(event, **kwargs)
     if Spree::Config.use_legacy_events
-      Spree::Event.fire(*args, **kwargs, &block)
+      Spree::Event.fire(event, **kwargs)
     else
       # Override caller_location to point to the actual event publisher
-      super(*args, **kwargs, caller_location: caller_locations(1)[0], &block)
+      super(event, **kwargs, caller_location: caller_locations(1)[0])
     end
   end
 end

data/lib/spree/core/engine.rb

@@ -87,6 +87,7 @@ module Spree
 
       config.after_initialize do
         Spree::Config.check_load_defaults_called('Spree::Config')
+        Spree::Config.static_model_preferences.validate!
       end
 
       config.after_initialize do

data/lib/spree/core/product_duplicator.rb

@@ -45,7 +45,7 @@ module Spree
         new_master.sku = "COPY OF #{master.sku}"
         new_master.deleted_at = nil
         new_master.images = master.images.map { |image| duplicate_image image } if @include_images
-        new_master.price = master.price
+        new_master.prices = master.prices.map(&:dup)
       end
     end
 

data/lib/spree/core/version.rb

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

data/lib/spree/preferences/static_model_preferences.rb

@@ -7,13 +7,8 @@ module Spree
         attr_reader :preferences
 
         def initialize(klass, hash)
-          hash = hash.symbolize_keys
-          hash.keys.each do |key|
-            if !klass.defined_preferences.include?(key)
-              raise "Preference #{key.inspect} is not defined on #{klass}"
-            end
-          end
-          @preferences = hash
+          @klass = klass
+          @preferences = hash.symbolize_keys
         end
 
         def fetch(key, &block)
@@ -27,6 +22,8 @@ module Spree
         def to_hash
           @preferences.deep_dup
         end
+
+        delegate :keys, to: :@preferences
       end
 
       def initialize
@@ -36,12 +33,32 @@ module Spree
       end
 
       def add(klass, name, preferences)
-        @store[klass.to_s][name] = Definition.new(klass, preferences)
+        @store[klass.to_s][name] = Definition.new(klass.to_s, preferences)
       end
 
       def for_class(klass)
         @store[klass.to_s]
       end
+
+      def validate!
+        @store.keys.map(&:constantize).each do |klass|
+          validate_for_class!(klass)
+        end
+      end
+
+      private
+
+      def validate_for_class!(klass)
+        for_class(klass).each do |name, preferences|
+          klass_keys = klass.defined_preferences.map(&:to_s)
+          extra_keys = preferences.keys.map(&:to_s) - klass_keys
+          next if extra_keys.empty?
+
+          raise \
+            "Unexpected keys found for #{klass} under #{name}: #{extra_keys.sort.join(', ')} " \
+            "(expected keys: #{klass_keys.sort.join(', ')})"
+        end
+      end
     end
   end
 end

data/lib/spree/testing_support/dummy_app.rb

@@ -90,7 +90,7 @@ module DummyApp
     config.active_record.dump_schema_after_migration = false
 
     # Configure active storage to use storage within tmp folder
-    unless ENV['DISABLE_ACTIVE_STORAGE']
+    unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
@@ -138,9 +138,9 @@ Spree.user_class = 'Spree::LegacyUser'
 Spree.load_defaults(Spree.solidus_version)
 Spree.config do |config|
   config.mails_from = "store@example.com"
-  config.use_legacy_events = ENV['USE_LEGACY_EVENTS'].present?
+  config.use_legacy_events = (ENV['USE_LEGACY_EVENTS'] == 'true')
 
-  if ENV['DISABLE_ACTIVE_STORAGE']
+  if (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
     config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.7
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1023,7 +1023,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.