spree_core 6.0.0.beta4 → 6.0.0.rc2

data/lib/tasks/preferences_json.rake

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+# 5.6 → 6.0 follow-ups to the ConvertPreferencesToJson migration
+# (docs/plans/6.0-json-preferences.md). Both are idempotent.
+module Spree
+  module SecretPreferencesUpgrade
+    # The models keeping secrets in `secret_preferences`, one per table.
+    def self.models
+      Rails.application.eager_load!
+      Spree::Base.descendants.select do |model|
+        model.include?(Spree::SecretPreferences) && model.base_class == model && model.table_exists?
+      end
+    end
+
+    # Every row of the model, deleted ones included, except rows whose class
+    # is no longer installed — loading one of those raises, which would stop
+    # the task before it reached the rest. They are reported and left as
+    # they are; their secrets stay readable.
+    #
+    # @return [ActiveRecord::Relation]
+    def self.loadable_rows(model)
+      rows = model.unscoped
+      return rows unless model.column_names.include?(model.inheritance_column)
+
+      types = rows.distinct.pluck(model.inheritance_column)
+      missing = types.compact.reject(&:safe_constantize)
+      return rows if missing.empty?
+
+      missing.each { |type| puts "  #{model.table_name}: skipped rows of #{type}, which is not installed" }
+      rows.where.not(model.inheritance_column => missing).or(rows.where(model.inheritance_column => nil))
+    end
+  end
+end
+
+namespace :spree do
+  namespace :upgrade do
+    desc <<~DESC
+      Converts any preferences row still holding YAML to JSON, and moves secrets
+      left in `preferences` to the encrypted `secret_preferences` column.
+
+      The 6.0 migration does both itself, so a normal `db:migrate` leaves nothing
+      for this task. It exists for schemas changed out of band, and for secrets of
+      a class that was not loaded when the migration ran (an extension gem added
+      afterwards).
+    DESC
+    task preferences_json: :environment do
+      conversion = Spree::Preferences::JsonConversion.new(ActiveRecord::Base.connection, log: ->(message) { puts "  #{message}" })
+
+      conversion.preference_tables.each do |table|
+        converted = conversion.text_column?(table) ? conversion.convert_text_table(table) : conversion.convert_table(table)
+        puts "  #{table}: #{converted} rows converted from YAML" if converted.positive?
+      end
+
+      Spree::SecretPreferencesUpgrade.models.each do |model|
+        moved = 0
+
+        Spree::SecretPreferencesUpgrade.loadable_rows(model).find_each do |record|
+          separated = record.separated_secret_preferences
+          next unless separated
+
+          # Written without callbacks: moving a secret is not a change to it, and
+          # must not look like one to a gateway that re-registers on key changes.
+          record.update_columns(separated)
+          moved += 1
+        end
+
+        puts "  #{model.table_name}: moved secrets out of preferences for #{moved} rows" if moved.positive?
+      end
+
+      puts 'preferences_json done.'
+    end
+
+    desc <<~DESC
+      Encrypts every `secret_preferences` value still stored in plain text.
+
+      The 6.0 migration moves existing secrets into `secret_preferences` without
+      encrypting them, so it never depends on encryption keys. They stay readable
+      as they are and are encrypted on their next save; this task encrypts them
+      all at once. Skips with a note when Active Record encryption keys are not
+      configured.
+    DESC
+    task encrypt_secret_preferences: :environment do
+      unless ActiveRecord::Encryption.config.has_primary_key?
+        puts '  Active Record encryption keys are not configured, so secrets stay in plain text. ' \
+             'See https://spreecommerce.org/docs/developer/deployment/environment_variables'
+        next
+      end
+
+      Spree::SecretPreferencesUpgrade.models.each do |model|
+        count = 0
+        Spree::SecretPreferencesUpgrade.loadable_rows(model).where.not(secret_preferences: nil).find_each do |record|
+          record.encrypt
+          count += 1
+        end
+        puts "  #{model.table_name}: encrypted secrets for #{count} rows"
+      end
+
+      puts 'encrypt_secret_preferences done.'
+    end
+  end
+end

data/lib/tasks/seller_sample_data.rake

@@ -107,7 +107,7 @@ namespace :spree do
           order = sample_orders[index]
           seller.seller_transfers.create!(
             store: store, order: order, payout: payout,
-            amount: order.total * 0.85, currency: currency,
+            amount: Spree::Money::Rounding.to_currency(order.total * BigDecimal('0.85'), currency), currency: currency,
             kind: 'earning', provider: provider, status: 'completed',
             created_at: order.completed_at
           )
@@ -118,7 +118,7 @@ namespace :spree do
         original = seller.seller_transfers.earnings.order(:created_at).last
         seller.seller_transfers.create!(
           store: store, order: original.order, reversed_from: original,
-          amount: -(original.amount * 0.5), currency: currency,
+          amount: -Spree::Money::Rounding.to_currency(original.amount / 2, currency), currency: currency,
           kind: 'refund_reversal', provider: provider, status: 'completed'
         )
 

data/lib/tasks/store_settings.rake

@@ -1,5 +1,8 @@
-namespace :spree do
-  namespace :store_settings do
+module Spree
+  # Constants for `rake spree:store_settings:backfill_from_config`. A rake
+  # `namespace` block does not scope constants, so they live here instead of
+  # on Object.
+  module StoreSettingsBackfill
     # Settings that moved from Spree::Config onto Spree::Store, mapped to the
     # default they carried as globals and — where the two differ — the name the
     # store preference goes by. A global still at its default says nothing about
@@ -39,7 +42,11 @@ namespace :spree do
     # is no "explicitly set" flag to read. Without this marker, a merchant who
     # turns a copied setting off would have it turned back on by the next run.
     BACKFILL_MARKER = 'store_settings_backfilled_from_config'.freeze
+  end
+end
 
+namespace :spree do
+  namespace :store_settings do
     desc <<~DESC
       Copies commerce settings that moved from Spree::Config onto every store
       (Spree 6.0).
@@ -54,11 +61,11 @@ namespace :spree do
       afterwards — the globals are deprecated and are deleted in 6.1.
     DESC
     task backfill_from_config: :environment do
-      changed = MOVED_SETTINGS.reject do |name, config|
+      changed = Spree::StoreSettingsBackfill::MOVED_SETTINGS.reject do |name, config|
         Spree::Config.send(name) == config[:default]
       end
 
-      capture_method = CAPTURE_METHOD_FROM_CONFIG.call
+      capture_method = Spree::StoreSettingsBackfill::CAPTURE_METHOD_FROM_CONFIG.call
       capture_method = nil if capture_method == Spree::CaptureMethod::DEFAULT_CAPTURE_METHOD
 
       if changed.empty? && capture_method.nil?
@@ -69,7 +76,7 @@ namespace :spree do
       Spree::Store.find_each do |store|
         metadata = store.metadata || {}
 
-        if metadata[BACKFILL_MARKER]
+        if metadata[Spree::StoreSettingsBackfill::BACKFILL_MARKER]
           puts "  #{store.name} (#{store.id}): already backfilled — skipped."
           next
         end
@@ -97,7 +104,7 @@ namespace :spree do
           end
         end
 
-        store.metadata = metadata.merge(BACKFILL_MARKER => true)
+        store.metadata = metadata.merge(Spree::StoreSettingsBackfill::BACKFILL_MARKER => true)
         store.save!
       end
     end

data/lib/tasks/typed_adjustments_migration.rake

@@ -63,7 +63,7 @@ namespace :spree do
               promotion = action&.promotion
               Spree::TypedAdjustmentsMigration.build_distributed_discounts(order, row, adjustable, promotion, action, stats)
             when nil
-              if row.amount.to_f.negative?
+              if row.amount.to_d.negative?
                 Spree::TypedAdjustmentsMigration.build_distributed_discounts(order, row, adjustable, nil, nil, stats, kind: 'manual')
               else
                 Spree::Fee.create!(

data/lib/tasks/uploads.rake

@@ -0,0 +1,19 @@
+namespace :spree do
+  namespace :uploads do
+    desc <<~DESC
+      Gives every attached file the store of the record it is attached to
+      (Spree 6.0). Idempotent — files that already have a store are skipped.
+      Files attached in more than one store are listed, not changed.
+    DESC
+    task assign_stores: :environment do
+      result = Spree::Uploads::AssignStores.call
+      puts "  Assigned a store to #{result.value[:assigned]} file(s)."
+
+      conflicts = result.value[:conflicts]
+      next if conflicts.empty?
+
+      puts "  #{conflicts.size} file(s) are attached to records of more than one store and were left as they are:"
+      conflicts.each { |blob_id| puts "    active_storage_blobs.id = #{blob_id}" }
+    end
+  end
+end

data/spec/fixtures/mailer_views/custom_views_probe_mailer/welcome_email.html.erb

@@ -0,0 +1,4 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1>Welcome</h1>
+  <%= render 'spree/shared/mailer_button', url: 'https://example.com/start', label: 'Get started' %>
+<% end %>