spree_core 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a956aa0f5f8359d02e3804606a880d73af297547ef3eca07066e7ee244a728
-  data.tar.gz: 55cb848ec873396022bcaa67b8d8f6281ce4dd2d48dd1692e59f72e012c0dd13
+  metadata.gz: 64ed9c27607a84506590ffdc101c8522ed7c712f3e81d05f00ab31729aef8d1a
+  data.tar.gz: bbf9d7ff2c461d432d74a6de99ff3981428126cba5d090bc77557d629bbce01b
 SHA512:
-  metadata.gz: '0749dcc7a17168458bfa742d9f4df1ad99c2f642fd6a4654be232cc8b75c8f72f73286effb135909a17bbcc27d5bdf7932f75c073068eb1492d4159f23793a66'
-  data.tar.gz: 8ddae63ba67bf3c68492f80605646176bb82bdb2ca1d80ffa3139cafca4402d4156e9f14d15353bff0b7d7fa1f72cd340b4dbf826697ee0b995c64383bfcf5a2
+  metadata.gz: 03dffc2c1ad6d02a5ed737c7da3908caf7cce12e127f7aa444a73651f83b4ee9cda106c86b0d0347acdbac1540517b05cef38842f3681c0b9e6dd7329a22f2c8
+  data.tar.gz: 4ba193ec3c530fea11b8a8e1f3ab67db32b517afc8ea64fd512e4ffc0a7f60a973f03fdf102ef7842bcf6fa45aa986dfe79d27402492c5b6dae46720cb8769a2

data/app/finders/spree/products/find.rb

@@ -142,11 +142,8 @@ module Spree
       def by_options(products)
         return products unless options?
 
-        products.where(
-          id: options.map do |key, value|
-            products.with_option_value(key, value).ids
-          end.flatten.compact.uniq
-        )
+        products_ids = options.map { |key, value| products.with_option_value(key, value).ids }
+        products.where(id: products_ids.reduce(&:intersection))
       end
 
       def by_option_value_ids(products)

data/app/helpers/spree/base_helper.rb

@@ -170,7 +170,8 @@ module Spree
     end
 
     def base_cache_key
-      [I18n.locale, current_currency]
+      [I18n.locale, current_currency, defined?(try_spree_current_user) && try_spree_current_user.present?,
+        defined?(try_spree_current_user) && try_spree_current_user.try(:has_spree_role?, 'admin')]
     end
 
     def maximum_quantity

data/app/models/spree/stock_location.rb

@@ -107,18 +107,25 @@ module Spree
 
     def create_stock_items
       variants_scope = Spree::Variant
-      prepared_stock_items = variants_scope.ids.map do |variant_id|
-        Hash[
-          'stock_location_id', id,
-          'variant_id', variant_id,
-          'backorderable', backorderable_default,
-          'created_at', Time.current,
-          'updated_at', Time.current
-        ]
-      end
-      if prepared_stock_items.any?
-        stock_items.insert_all(prepared_stock_items)
-        variants_scope.touch_all
+
+      if self.class.method_defined?(:insert_all) && self.class.method_defined?(:touch_all)
+        prepared_stock_items = variants_scope.ids.map do |variant_id|
+          Hash[
+            'stock_location_id', id,
+            'variant_id', variant_id,
+            'backorderable', backorderable_default,
+            'created_at', Time.current,
+            'updated_at', Time.current
+          ]
+        end
+        if prepared_stock_items.any?
+          stock_items.insert_all(prepared_stock_items)
+          variants_scope.touch_all
+        end
+      else
+        variants_scope.find_each do |variant|
+          propagate_variant(variant)
+        end
       end
     end
 

data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb

@@ -1,4 +1,4 @@
-class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[6.0]
+class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[5.2]
   def change
     Spree::Store.where(default_currency: nil).update_all(default_currency: Spree::Config[:currency])
   end

data/db/migrate/20191017121054_add_supported_currencies_to_store.rb

@@ -1,4 +1,4 @@
-class AddSupportedCurrenciesToStore < ActiveRecord::Migration[6.0]
+class AddSupportedCurrenciesToStore < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :supported_currencies)
       add_column :spree_stores, :supported_currencies, :string

data/db/migrate/20200102141311_add_social_to_spree_stores.rb

@@ -1,4 +1,4 @@
-class AddSocialToSpreeStores < ActiveRecord::Migration[6.0]
+class AddSocialToSpreeStores < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_stores, :facebook, :string
     add_column :spree_stores, :twitter, :string

data/db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb

@@ -1,4 +1,4 @@
-class AddHideFromNavToTaxons < ActiveRecord::Migration[6.0]
+class AddHideFromNavToTaxons < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_taxons, :hide_from_nav, :boolean, default: false, index: true
   end

data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb

@@ -1,4 +1,4 @@
-class AddDefaultLocaleToSpreeStore < ActiveRecord::Migration[6.0]
+class AddDefaultLocaleToSpreeStore < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :default_locale)
       add_column :spree_stores, :default_locale, :string

data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb

@@ -1,4 +1,4 @@
-class AddCustomerSupportEmailToSpreeStore < ActiveRecord::Migration[6.0]
+class AddCustomerSupportEmailToSpreeStore < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :customer_support_email)
       add_column :spree_stores, :customer_support_email, :string

data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb

@@ -1,4 +1,4 @@
-class AddCompareAtAmountToSpreePrices < ActiveRecord::Migration[6.0]
+class AddCompareAtAmountToSpreePrices < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_prices, :compare_at_amount)
       add_column :spree_prices, :compare_at_amount, :decimal, precision: 10, scale: 2

data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb

@@ -1,4 +1,4 @@
-class AddDefaultCountryIdToSpreeStore < ActiveRecord::Migration[6.0]
+class AddDefaultCountryIdToSpreeStore < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :default_country_id)
       add_column :spree_stores, :default_country_id, :integer

data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb

@@ -1,4 +1,4 @@
-class AddFooterFieldsToSpreeStores < ActiveRecord::Migration[6.0]
+class AddFooterFieldsToSpreeStores < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_stores, :description, :text unless column_exists?(:spree_stores, :description)
     add_column :spree_stores, :address, :text unless column_exists?(:spree_stores, :address)

data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb

@@ -1,4 +1,4 @@
-class AddShowPropertyToSpreeProductProperties < ActiveRecord::Migration[6.0]
+class AddShowPropertyToSpreeProductProperties < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_product_properties, :show_property, :boolean, default: true unless column_exists?(:spree_product_properties, :show_property)
   end

data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb

@@ -1,4 +1,4 @@
-class AddStoreOwnerOrderNotificationDeliveredToSpreeOrders < ActiveRecord::Migration[6.0]
+class AddStoreOwnerOrderNotificationDeliveredToSpreeOrders < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_orders, :store_owner_notification_delivered)
       add_column :spree_orders, :store_owner_notification_delivered, :boolean

data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb

@@ -1,4 +1,4 @@
-class AddNewOrderNotificationsEmailToSpreeStores < ActiveRecord::Migration[6.0]
+class AddNewOrderNotificationsEmailToSpreeStores < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :new_order_notifications_email)
       add_column :spree_stores, :new_order_notifications_email, :string

data/db/migrate/20200610113542_add_label_to_spree_addresses.rb

@@ -1,4 +1,4 @@
-class AddLabelToSpreeAddresses < ActiveRecord::Migration[6.0]
+class AddLabelToSpreeAddresses < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_addresses, :label, :string unless column_exists?(:spree_addresses, :label)
   end

data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb

@@ -1,4 +1,4 @@
-class AddUniqueIndexOnTaxonIdAndProductIdToSpreeProductsTaxons < ActiveRecord::Migration[6.0]
+class AddUniqueIndexOnTaxonIdAndProductIdToSpreeProductsTaxons < ActiveRecord::Migration[5.2]
   def change
     add_index :spree_products_taxons, [:product_id, :taxon_id], unique: true unless index_exists? :spree_products_taxons, [:product_id, :taxon_id]
   end

data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb

@@ -1,4 +1,4 @@
-class AddCheckoutZoneFieldToStore < ActiveRecord::Migration[6.0]
+class AddCheckoutZoneFieldToStore < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :checkout_zone_id)
       add_column :spree_stores, :checkout_zone_id, :integer

data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb

@@ -1,4 +1,4 @@
-class AddFilterableColumnToSpreeOptionTypes < ActiveRecord::Migration[6.0]
+class AddFilterableColumnToSpreeOptionTypes < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_option_types, :filterable)
       add_column :spree_option_types, :filterable, :boolean, default: true, null: false

data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb

@@ -1,4 +1,4 @@
-class AddSeoRobotsToSpreeStores < ActiveRecord::Migration[6.0]
+class AddSeoRobotsToSpreeStores < ActiveRecord::Migration[5.2]
   def change
     add_column :spree_stores, :seo_robots, :string unless column_exists?(:spree_stores, :seo_robots)
   end

data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb

@@ -1,4 +1,4 @@
-class AddDefaultCountryKindToSpreeZones < ActiveRecord::Migration[6.0]
+class AddDefaultCountryKindToSpreeZones < ActiveRecord::Migration[5.2]
   def change
     change_column_default(:spree_zones, :kind, :state)
   end

data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb

@@ -1,4 +1,4 @@
-class RemoveContactEmailFromSpreeStores < ActiveRecord::Migration[6.0]
+class RemoveContactEmailFromSpreeStores < ActiveRecord::Migration[5.2]
   def change
     remove_column :spree_stores, :contact_email
   end

data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb

@@ -1,4 +1,4 @@
-class CreateSpreePaymentMethodsStores < ActiveRecord::Migration[6.0]
+class CreateSpreePaymentMethodsStores < ActiveRecord::Migration[5.2]
   def change
     create_table :spree_payment_methods_stores, id: false do |t|
       t.belongs_to :payment_method

data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb

@@ -1,4 +1,4 @@
-class MigrateDataPaymentMethodsStores < ActiveRecord::Migration[6.0]
+class MigrateDataPaymentMethodsStores < ActiveRecord::Migration[5.2]
   def up
     Spree::PaymentMethod.all.each do |payment_method|
       next if payment_method.store_ids.any?

data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb

@@ -1,4 +1,4 @@
-class RemoveStoreIdFromSpreePaymentMethods < ActiveRecord::Migration[6.0]
+class RemoveStoreIdFromSpreePaymentMethods < ActiveRecord::Migration[5.2]
   def change
     remove_column :spree_payment_methods, :store_id, :integer
   end

data/db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb

@@ -1,4 +1,4 @@
-class EnsureDefaultLocaleInSpreeStores < ActiveRecord::Migration[6.0]
+class EnsureDefaultLocaleInSpreeStores < ActiveRecord::Migration[5.2]
   def change
     Spree::Store.where(default_locale: nil).update_all(default_locale: I18n.locale)
   end

data/db/migrate/20210205211040_add_supported_locales_to_spree_stores.rb

@@ -1,4 +1,4 @@
-class AddSupportedLocalesToSpreeStores < ActiveRecord::Migration[6.0]
+class AddSupportedLocalesToSpreeStores < ActiveRecord::Migration[5.2]
   def change
     unless column_exists?(:spree_stores, :supported_locales)
       add_column :spree_stores, :supported_locales, :string

data/db/migrate/20210215202602_migrate_spree_i18n_globalize_config.rb

@@ -1,4 +1,4 @@
-class MigrateSpreeI18nGlobalizeConfig < ActiveRecord::Migration[6.0]
+class MigrateSpreeI18nGlobalizeConfig < ActiveRecord::Migration[5.2]
   def up
     locales = []
 

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -32,7 +32,6 @@ module Spree
       opts[:skip_bundle] = true
       opts[:skip_gemfile] = true
       opts[:skip_git] = true
-      opts[:skip_keeps] = true
       opts[:skip_listen] = true
       opts[:skip_rc] = true
       opts[:skip_spring] = true

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.2.4'.freeze
+  VERSION = '4.2.5'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/factories/options_factory.rb

@@ -8,5 +8,15 @@ FactoryBot.define do
   factory :option_type, class: Spree::OptionType do
     sequence(:name) { |n| "foo-size-#{n}" }
     presentation    { 'Size' }
+
+    trait :size do
+      name { 'size' }
+      presentation { 'Size' }
+    end
+
+    trait :color do
+      name { 'color' }
+      presentation { 'Color' }
+    end
   end
 end

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -1,15 +1,28 @@
 FactoryBot.define do
-  factory :check_payment_method, class: Spree::PaymentMethod::Check do
+  factory :payment_method, class: Spree::PaymentMethod do
+    name { 'Test' }
+
+    before(:create) do |payment_method|
+      if payment_method.stores.empty?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        payment_method.stores << [store]
+      end
+    end
+  end
+
+  factory :check_payment_method, parent: :payment_method, class: Spree::PaymentMethod::Check do
     name { 'Check' }
   end
 
-  factory :credit_card_payment_method, class: Spree::Gateway::Bogus do
+  factory :credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::Bogus do
     name { 'Credit Card' }
   end
 
   # authorize.net was moved to spree_gateway.
   # Leaving this factory in place with bogus in case anyone is using it.
-  factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do
+  factory :simple_credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::BogusSimple do
     name { 'Credit Card' }
   end
 

data/spree_core.gemspec

@@ -27,29 +27,28 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.add_dependency 'activemerchant', '~> 1.67'
-  s.add_dependency 'acts_as_list', '~> 0.8'
-  s.add_dependency 'awesome_nested_set', '>= 3.3.1', '< 4.0'
-  s.add_dependency 'carmen', '>= 1.0', '< 1.2'
+  s.add_dependency 'acts_as_list', '>= 0.8'
+  s.add_dependency 'awesome_nested_set', '~> 3.3', '>= 3.3.1'
+  s.add_dependency 'carmen', '>= 1.0'
   s.add_dependency 'cancancan', '~> 3.2'
-  s.add_dependency 'ffaker', '~> 2.9'
-  s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.5.0'
-  s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
-  s.add_dependency 'kaminari', '~> 1.2.1'
+  s.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.1'
+  s.add_dependency 'highline', '~> 2.0' # Necessary for the install generator
+  s.add_dependency 'kaminari', '~> 1.2'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
-  s.add_dependency 'paranoia', '~> 2.4.2'
+  s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '>= 6.0', '< 6.2'
-  s.add_dependency 'ransack', '>= 2.3', '< 2.5'
+  s.add_dependency 'rails', '>= 5.2', '< 6.2'
+  s.add_dependency 'ransack', '~> 2.3'
   s.add_dependency 'responders'
   s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
-  s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
+  s.add_dependency 'twitter_cldr', '>= 4.3'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
+  s.add_dependency 'mini_magick', '~> 4.9', '>= 4.9.4'
   s.add_dependency 'image_processing', '~> 1.2'
   s.add_dependency 'active_storage_validations', '~> 0.9'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -29,36 +29,36 @@ dependencies:
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -66,9 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,9 +73,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -94,67 +88,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: friendly_id
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '5.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -189,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +197,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -227,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.2'
@@ -235,22 +215,16 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -328,9 +302,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -338,9 +309,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -373,22 +341,22 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -1175,9 +1143,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.5
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.4
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.5
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1193,7 +1161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.