solidus_core 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b882356a483b6ec07df20020cfdf2429122ed885165c9626384017479b26442
-  data.tar.gz: a840c6d60aab4097f5159588a9b648ac5baac0fba6704ea21e1928eb7dc1dd88
+  metadata.gz: caace905606e0421dddde4e2092959bc15679b45d4fd6f71202aca8ac9b22cca
+  data.tar.gz: d0076132f422409dbfc7754d68cfc5d1dd72165429ce1ee2c5cbf7e6a7aa78e6
 SHA512:
-  metadata.gz: fdcc5ba0f68af828dd0d0908c55e4f69fdf14b7ca12ad80ad63d0083c73a49924a3d575ddc60ab3786c240faa120f1543aafbeed01c037e7246161d129d2bb0b
-  data.tar.gz: fae363d934fae8f8bbfcb26ce5f9187984c4e1094c11d43ad9e3f956f0682414d284195f13e390cda73bd4791dfe8ea8ab2e81ef71a8831300b0d5b39beaabe3
+  metadata.gz: 30d1a926a99a01a2610f0f87a7eaf6881693fd1bb0f449d795e3ba147e88e3bbab335aa47a0efc981eaec818e7820cc81a74d1bb21888c25bf656f01b4604cc7
+  data.tar.gz: b4f85d2275a4b1823411f9d592f5d5c2acf13b47d137b34e9f15733114cda5280c79d243a5deaa89994b7a5cdcf5cf4fafcf40e9a01e276094257e7c2e26c233

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/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1,3 +1,3 @@
 apply "#{__dir__}/break_down_solidus_gem.rb"
 run_bundle
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/main/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v3.3/template.rb'

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/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.3.0"
+  VERSION = "3.3.2"
 
   def self.solidus_version
     VERSION

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 @@ end
 Spree.user_class = 'Spree::LegacyUser'
 Spree.load_defaults(Spree.solidus_version)
 Spree.config do |config|
-  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.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1034,7 +1034,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.