solidus_core 2.11.8 → 2.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d36b03697769f4d9449dfeac2da6004e9d06b7d1575489abbbecf5497dfae1
-  data.tar.gz: a0de4d86e474402ac44765317ab8ffb2967dbb4de6675491616af185e17fb3dd
+  metadata.gz: f6be99509f3f7cdd74113426927e8751493ea311563e4d2a4fbf57d5661da05d
+  data.tar.gz: e5124764c6cfadd679394db2f28d1a45171f5cf45caa571f679a567a985ac5b2
 SHA512:
-  metadata.gz: 6f1a2577af4ea0108060bb3e9d81e81fa7114813b6ce5b1d925f53378da6b2f9c41b5e22d67d65389d2ee4e3d57719c79855fa4bbbb820f0cac68b63afeb313a
-  data.tar.gz: f4bf3efd9563905b2eca58c6df0b95c9c1591b0a46c07cbc4bfaaed0000cd691f2e9333dc7f860c78a0a450c38f38f2a74d1b8ab63f15e188ac46de5d7080520
+  metadata.gz: '0093e9c554425147adf6bbeadf7a7f4ed91190b5a34664935103bfae6c0cb277d62bb44c974b8a625235a400cc91cf00736fceeb971229d56d97fa83eb5c3947'
+  data.tar.gz: bb18cd30482e0bcd1a8efaf671fba77279a04f3f1bf0cb06632fb9bc577af67544cbabcb14e5eae3347d71f74946fe86dd5ee60d4c49a0f130abe4153b45995a

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

@@ -107,6 +107,8 @@ module Spree
 
     def url(style = default_style)
       attachment.url(style)
+    rescue ActiveStorage::FileNotFoundError
+      "noimage/#{style}.png"
     end
 
     def destroy_attachment(_name)

data/app/models/concerns/spree/active_storage_adapter/attachment.rb

@@ -9,11 +9,9 @@ module Spree
     class Attachment
       delegate_missing_to :@attachment
 
-      DEFAULT_SIZE = '100%'
-
       def initialize(attachment, styles: {})
         @attachment = attachment
-        @styles = styles
+        @styles = normalize_styles(styles)
       end
 
       def exists?
@@ -21,20 +19,18 @@ module Spree
       end
 
       def filename
-        blob.filename.to_s
+        blob&.filename.to_s
       end
 
       def url(style = nil)
-        variant(style).url
+        variant(style)&.url
       end
 
       def variant(style = nil)
-        size = style_to_size(style&.to_sym)
+        size = style_to_size(style)
         @attachment.variant(
-          resize: size,
-          strip: true,
-          'auto-orient': true,
-          colorspace: 'sRGB',
+          resize_to_limit: size,
+          strip: true
         ).processed
       end
 
@@ -61,8 +57,12 @@ module Spree
         @attachment.metadata
       end
 
+      def normalize_styles(styles)
+        styles.transform_values { |v| v.split('x') }
+      end
+
       def style_to_size(style)
-        @styles.fetch(style) { DEFAULT_SIZE }
+        @styles.fetch(style&.to_sym) { [width, height] }
       end
     end
   end

data/app/models/spree/image/active_storage_attachment.rb

@@ -7,6 +7,10 @@ module Spree::Image::ActiveStorageAttachment
   delegate :width, :height, to: :attachment, prefix: true
 
   included do
+    validates :attachment, presence: true
+    validate :attachment_is_an_image
+    validate :supported_content_type
+
     has_attachment :attachment,
                    styles: {
                    mini: '48x48>',
@@ -15,7 +19,11 @@ module Spree::Image::ActiveStorageAttachment
                    large: '1200x1200>'
                  },
                  default_style: :product
-    validates :attachment, presence: true
-    validate :attachment_is_an_image
+
+    def supported_content_type
+      unless attachment.content_type.in?(Spree::Config.allowed_image_mime_types)
+        errors.add(:attachment, :content_type_not_supported)
+      end
+    end
   end
 end

data/app/models/spree/image/paperclip_attachment.rb

@@ -15,7 +15,7 @@ module Spree::Image::PaperclipAttachment
                       convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
     validates_attachment :attachment,
       presence: true,
-      content_type: { content_type: %w[image/jpeg image/jpg image/png image/gif] }
+      content_type: { content_type: Spree::Config.allowed_image_mime_types }
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet

data/app/models/spree/payment_method/bogus_credit_card.rb

@@ -9,6 +9,10 @@ module Spree
 
     VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
 
+    AUTHORIZATION_CODE = '12345'
+    FAILURE_MESSAGE = 'Bogus Gateway: Forced failure'
+    SUCCESS_MESSAGE = 'Bogus Gateway: Forced success'
+
     attr_accessor :test
 
     def gateway_class
@@ -26,40 +30,40 @@ module Spree
     def authorize(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
       if VALID_CCS.include?(credit_card.number) || (profile_id && profile_id.starts_with?('BGS-'))
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'D' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'D' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, { message: FAILURE_MESSAGE }, test: true)
       end
     end
 
     def purchase(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
       if VALID_CCS.include?(credit_card.number) || (profile_id && profile_id.starts_with?('BGS-'))
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'M' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'M' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, message: FAILURE_MESSAGE, test: true)
       end
     end
 
     def credit(_money, _credit_card, _response_code, _options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
+      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
     end
 
     def capture(_money, authorization, _gateway_options)
       if authorization == '12345'
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true)
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true)
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', error: 'Bogus Gateway: Forced failure', test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, error: FAILURE_MESSAGE, test: true)
       end
     end
 
     def void(_response_code, _credit_card, _options = {})
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
+      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
     end
 
     # @see Spree::PaymentMethod#try_void
     def try_void(_payment)
-      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
+      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
     end
 
     def test?

data/app/models/spree/payment_method/simple_bogus_credit_card.rb

@@ -9,17 +9,17 @@ module Spree
 
     def authorize(_money, credit_card, _options = {})
       if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, { message: FAILURE_MESSAGE }, test: true)
       end
     end
 
     def purchase(_money, credit_card, _options = {})
       if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, message: FAILURE_MESSAGE, test: true)
       end
     end
   end

data/app/models/spree/refund.rb

@@ -48,6 +48,10 @@ module Spree
       return true if perform_after_create == false
       return true if transaction_id.present?
 
+      # This is needed otherwise set_perform_after_create_default callback
+      # will print a deprecation warning when save! creates a record
+      self.perform_after_create = false unless persisted?
+
       credit_cents = money.cents
 
       @perform_response = process!(credit_cents)
@@ -63,9 +67,7 @@ module Spree
       log_entries.build(details: perform_response.to_yaml)
 
       self.transaction_id = perform_response.authorization
-      # This is needed otherwise set_perform_after_create_default callback
-      # will print a deprecation warning when save! creates a record.
-      self.perform_after_create = false unless persisted?
+
       save!
 
       update_order

data/lib/generators/solidus/install/install_generator.rb

@@ -171,7 +171,7 @@ module Solidus
       end
 
       bundle_cleanly{ run "bundle install" } if @plugins_to_be_installed.any?
-      run "spring stop"
+      run "spring stop" if defined?(Spring)
 
       @plugin_generators_to_run.each do |plugin_generator_name|
         generate "#{plugin_generator_name} --skip_migrations=false"

data/lib/spree/app_configuration.rb

@@ -504,6 +504,14 @@ module Spree
     # Enumerable of images adhering to the present_image_class interface
     class_name_attribute :image_attachment_module, default: 'Spree::Image::PaperclipAttachment'
 
+    # @!attribute [rw] allowed_image_mime_types
+    #
+    # Defines which MIME types are allowed for images
+    # `%w(image/jpeg image/jpg image/png image/gif).freeze` is the default.
+    #
+    # @return [Array]
+    class_name_attribute :allowed_image_mime_types, default: %w(image/jpeg image/jpg image/png image/gif).freeze
+
     # Allows switching attachment library for Taxon
     #
     # `Spree::Taxon::PaperclipAttachment`

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/fixtures/file.txt

@@ -0,0 +1 @@
+This is a text file

data/lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake

@@ -8,24 +8,12 @@ namespace :solidus do
         if Spree::UserAddress.where(default_billing: true).any?
           Spree.user_class.joins(:bill_address).update_all(bill_address_id: nil) # rubocop:disable Rails/SkipsModelValidations
         end
-        adapter_type = Spree::Base.connection.adapter_name.downcase.to_sym
-        if adapter_type == :mysql2
-          sql = <<~SQL
-            UPDATE spree_user_addresses
+        Spree::UserAddress.joins(
+          <<~SQL
             JOIN spree_users ON spree_user_addresses.user_id = spree_users.id
-              AND spree_user_addresses.address_id = spree_users.bill_address_id
-            SET spree_user_addresses.default_billing = true
+                             AND spree_user_addresses.address_id = spree_users.bill_address_id
           SQL
-        else
-          sql = <<~SQL
-            UPDATE spree_user_addresses
-            SET default_billing = true
-            FROM spree_users
-            WHERE spree_user_addresses.address_id = spree_users.bill_address_id
-              AND spree_user_addresses.user_id = spree_users.id;
-          SQL
-        end
-        Spree::Base.connection.execute sql
+        ).update_all(default_billing: true)
         puts "Success"
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.8
+  version: 2.11.9
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -919,6 +919,7 @@ files:
 - lib/spree/testing_support/factories/zone_factory.rb
 - lib/spree/testing_support/factory_bot.rb
 - lib/spree/testing_support/fixtures/blank.jpg
+- lib/spree/testing_support/fixtures/file.txt
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/job_helpers.rb
 - lib/spree/testing_support/order_walkthrough.rb