solidus_core 2.11.12 → 2.11.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a34b58af2575a9f4916aa79bdb8b968887685a642e1087c417ed186475762142
-  data.tar.gz: 774a645e0ab71b87649d6f9d2b30366a2dd6e308a7ac41dbfa7d144ad392dffa
+  metadata.gz: 170be97648ddea982ac1e60483efd0c1c9f335e435e5f800b68610bf23588bf1
+  data.tar.gz: 43b3b39eba6eea77b196bb386d35f21cc6ab0fb4168a46a0ee0a440f9ba3f2ae
 SHA512:
-  metadata.gz: ffadd725195f8e3909d8c8f67adf4fe8e7176c5af9e436160028be10a4bb06b1871178d7ec88540320811093ee924fde68e0e13c3fdb1c5ee59124a66e792f44
-  data.tar.gz: f2a49eaa1d162dfd28500b6ea14e7e37a622ba471f9bec40d51b0a4f20b8c4291b662e0632471d9ef8fa11520644cfab142d93032888e8aae68889ff1e2d1673
+  metadata.gz: 4a873724850ac63a210c93304bbe5f974a85299720677cdec7c67b841728728a42d376adce4685c53b0cfcbdf46c03b27c4e282ef9a626c7e3072e519adc1ec5
+  data.tar.gz: 657463dd2bff50cca895615e6e26660e9f3b36e4a79e6305b211364ea35aa9352eb0f7eeba798c6b339304c062c92965bcffea644b9faf9ef5e49901223d45ac

data/app/models/spree/address.rb

@@ -84,6 +84,7 @@ module Spree
     # @return [Hash] hash of attributes contributing to value equality with optional merge
     def self.value_attributes(base_attributes, merge_attributes = {})
       base = base_attributes.stringify_keys.merge(merge_attributes.stringify_keys)
+      base.delete("name") unless Spree::Config.use_combined_first_and_last_name_in_address
 
       name_from_attributes = Spree::Address::Name.from_attributes(base)
       if base['firstname'].presence || base['first_name'].presence

data/app/models/spree/product.rb

@@ -49,6 +49,7 @@ module Spree
 
     has_many :variants,
       -> { where(is_master: false).order(:position) },
+      inverse_of: :product,
       class_name: 'Spree::Variant'
 
     has_many :variants_including_master,

data/app/models/spree/promotion_code.rb

@@ -5,12 +5,12 @@ class Spree::PromotionCode < Spree::Base
   belongs_to :promotion_code_batch, class_name: "Spree::PromotionCodeBatch", optional: true
   has_many :adjustments
 
+  before_validation :normalize_code
+
   validates :value, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
   validates :promotion, presence: true
   validate :promotion_not_apply_automatically, on: :create
 
-  before_save :normalize_code
-
   self.whitelisted_ransackable_attributes = ['value']
 
   # Whether the promotion code has exceeded its usage restrictions

data/lib/spree/core/validators/email.rb

@@ -12,7 +12,7 @@ module Spree
   #     end
   #
   class EmailValidator < ActiveModel::EachValidator
-    EMAIL_REGEXP = /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
+    EMAIL_REGEXP = URI::MailTo::EMAIL_REGEXP
 
     def validate_each(record, attribute, value)
       unless EMAIL_REGEXP.match? value

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/blacklist_urls.rb

@@ -5,7 +5,7 @@ module Spree
     module BlacklistUrls
       def setup_url_blacklist(browser)
         if browser.respond_to?(:url_blacklist)
-          browser.url_blacklist = ['http://fonts.googleapis.com']
+          browser.url_blacklist = ['https://fonts.googleapis.com']
         end
       end
     end

data/lib/tasks/solidus/check_orders_with_invalid_email.rake

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  desc 'Prints orders with invalid email (after fix for GHSA-qxmr-qxh6-2cc9)'
+  task check_orders_with_invalid_email: :environment do
+    matches = Spree::Order.find_each.reduce([]) do |matches, order|
+      order.email.nil? || Spree::EmailValidator::EMAIL_REGEXP.match?(order.email) ? matches : matches + [order]
+    end
+    if matches.any?
+      puts 'Email / ID / Number'
+      puts(matches.map do |order|
+        "#{order.email} / #{order.id} / #{order.number}"
+      end.join("\n"))
+    else
+      puts 'NO MATCHES'
+    end
+  end
+end

data/solidus_core.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'paperclip', '>= 4.2'
+  s.add_dependency 'kt-paperclip', '>= 4.4.0'
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.12
+  version: 2.11.15
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -331,19 +331,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: kt-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -942,6 +942,7 @@ files:
 - lib/tasks/migrations/migrate_user_addresses.rake
 - lib/tasks/migrations/rename_gateways.rake
 - lib/tasks/order_capturing.rake
+- lib/tasks/solidus/check_orders_with_invalid_email.rake
 - lib/tasks/upgrade.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
@@ -985,8 +986,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []