solidus_core 4.6.2 → 4.7.0

data/lib/spree/deprecation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spree/core'
+require "spree/core"
 
 module Spree
   Deprecation = Spree.deprecator

data/lib/spree/deprecator.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/deprecation'
+require "active_support/deprecation"
 
 module Spree
   def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'Solidus')
+    @deprecator ||= ActiveSupport::Deprecation.new("5.0", "Solidus")
   end
 end

data/lib/spree/i18n.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'i18n'
+require "i18n"
 
 module Spree
   def self.i18n_available_locales
     I18n.available_locales.select do |locale|
-      I18n.t('spree.i18n.this_file_language', locale:, fallback: false, default: nil)
+      I18n.t("spree.i18n.this_file_language", locale:, fallback: false, default: nil)
     end
   end
 

data/lib/spree/localized_number.rb

@@ -14,14 +14,14 @@ module Spree
 
       # I18n.t('number.currency.format.delimiter') could be useful here, but is
       # unnecessary as it is stripped by the non_number_characters gsub.
-      separator = I18n.t(:'number.currency.format.separator')
+      separator = I18n.t(:"number.currency.format.separator")
       non_number_characters = /[^0-9\-#{separator}]/
 
       # strip everything else first
-      number = number.gsub(non_number_characters, '')
+      number = number.gsub(non_number_characters, "")
 
       # then replace the locale-specific decimal separator with the standard separator if necessary
-      number = number.gsub(separator, '.') unless separator == '.'
+      number = number.gsub(separator, ".") unless separator == "."
 
       # Handle empty string for ruby 2.4 compatibility
       BigDecimal(number.presence || 0)

data/lib/spree/manipulative_query_monitor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Spree
+  class ManipulativeQueryMonitor
+    def self.call(&block)
+      counter = ::DBQueryMatchers::QueryCounter.new({matches: [/^\ *(INSERT|UPDATE|DELETE\ FROM)/]})
+      ActiveSupport::Notifications.subscribed(counter.to_proc,
+        "sql.active_record",
+        &block)
+      if counter.count > 0
+        message = "Detected #{counter.count} manipulative queries. #{counter.log.join(", ")}\n"
+
+        message += caller.select { |line| line.include?(Rails.root.to_s) || line.include?("solidus") }.join("\n")
+
+        Rails.logger.warn(message)
+      end
+    end
+  end
+end

data/lib/spree/migrations.rb

@@ -25,12 +25,12 @@ module Spree
     def check
       return unless File.directory?(app_dir)
       return if missing_migrations.empty?
-      return if ENV['SOLIDUS_SKIP_MIGRATIONS_CHECK']
+      return if ENV["SOLIDUS_SKIP_MIGRATIONS_CHECK"]
 
       prefix = "[WARNING #{engine_name.capitalize}]"
       warn <<~WARN
         #{prefix} Missing migrations.
-        #{missing_migrations.map {|m| "#{prefix} - #{m}"}.join("\n")}
+        #{missing_migrations.map { |m| "#{prefix} - #{m}" }.join("\n")}
         #{prefix}
         #{prefix} Run `bin/rails railties:install:migrations` to get them.
         #{prefix} You can silence this warning by setting the `SOLIDUS_SKIP_MIGRATIONS_CHECK` environment variable.

data/lib/spree/permitted_attributes.rb

@@ -89,13 +89,13 @@ module Spree
     @@property_attributes = [:name, :presentation]
 
     @@return_authorization_attributes = [:memo, :stock_location_id, :return_reason_id,
-                                         customer_metadata: {},
-                                         return_items_attributes: [
-                                           :inventory_unit_id,
-                                           :exchange_variant_id,
-                                           :return_reason_id,
-                                           :preferred_reimbursement_type_id
-                                         ]]
+      customer_metadata: {},
+      return_items_attributes: [
+        :inventory_unit_id,
+        :exchange_variant_id,
+        :return_reason_id,
+        :preferred_reimbursement_type_id
+      ]]
 
     @@shipment_attributes = [
       :special_instructions, :stock_location_id, :id, :tracking,
@@ -123,9 +123,9 @@ module Spree
     ]
 
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
-                          :meta_description, :default_currency,
-                          :mail_from_address, :cart_tax_country_iso,
-                          :bcc_email, :reverse_charge_status]
+      :meta_description, :default_currency,
+      :mail_from_address, :cart_tax_country_iso,
+      :bcc_email, :reverse_charge_status]
 
     @@taxonomy_attributes = [:name]
 

data/lib/spree/preferences/configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/core/versioned_value'
-require 'spree/preferences/preferable'
+require "spree/core/versioned_value"
+require "spree/preferences/preferable"
 
 module Spree::Preferences
   # This takes the preferrable methods and adds some
@@ -107,10 +107,10 @@ module Spree::Preferences
       set(default_preferences)
     end
 
-    alias :[] :get_preference
-    alias :[]= :set_preference
+    alias_method :[], :get_preference
+    alias_method :[]=, :set_preference
 
-    alias :get :get_preference
+    alias_method :get, :get_preference
 
     # @param preferences [Hash] a hash of preferences to set
     def set(preferences)

data/lib/spree/preferences/preferable.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/preferable_class_methods'
-require 'active_support/concern'
-require 'active_support/core_ext/hash/keys'
+require "spree/preferences/preferable_class_methods"
+require "active_support/concern"
+require "active_support/core_ext/hash/keys"
 
 module Spree
   module Preferences
@@ -117,11 +117,9 @@ module Spree
       # This may raise an infinite loop error if any of the defaults are
       # dependent on other preferences defaults.
       def default_preferences
-        Hash[
-          defined_preferences.map do |preference|
-            [preference, preference_default(preference)]
-          end
-        ]
+        defined_preferences.map do |preference|
+          [preference, preference_default(preference)]
+        end.to_h
       end
 
       # Preference names representable as form fields in Solidus backend
@@ -165,8 +163,8 @@ module Spree
           value.to_i
         when :boolean
           if !value ||
-             value.to_s =~ /\A(f|false|0|^)\Z/i ||
-             (value.respond_to?(:empty?) && value.empty?)
+              value.to_s =~ /\A(f|false|0|^)\Z/i ||
+              (value.respond_to?(:empty?) && value.empty?)
             false
           else
             true

data/lib/spree/preferences/preferable_class_methods.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'spree/encryptor'
+require "spree/encryptor"
 
 module Spree::Preferences
   module PreferableClassMethods
-    DEFAULT_ADMIN_FORM_PREFERENCE_TYPES = %i(
+    DEFAULT_ADMIN_FORM_PREFERENCE_TYPES = %i[
       boolean
       decimal
       integer
@@ -12,7 +12,7 @@ module Spree::Preferences
       string
       text
       encrypted_string
-    )
+    ]
 
     def defined_preferences
       []
@@ -27,13 +27,13 @@ module Spree::Preferences
       end
 
       default = begin
-                  given = options[:default]
-                  if given.is_a?(Proc)
-                    given
-                  else
-                    proc { given }
-                  end
-                end
+        given = options[:default]
+        if given.is_a?(Proc)
+          given
+        else
+          proc { given }
+        end
+      end
 
       # The defined preferences on a class are all those defined directly on
       # that class as well as those defined on ancestors.
@@ -76,25 +76,25 @@ module Spree::Preferences
     end
 
     def preference_getter_method(name)
-      "preferred_#{name}".to_sym
+      :"preferred_#{name}"
     end
 
     def preference_setter_method(name)
-       "preferred_#{name}=".to_sym
+      :"preferred_#{name}="
     end
 
     def preference_default_getter_method(name)
-      "preferred_#{name}_default".to_sym
+      :"preferred_#{name}_default"
     end
 
     def preference_type_getter_method(name)
-      "preferred_#{name}_type".to_sym
+      :"preferred_#{name}_type"
     end
 
     def preference_encryptor(options)
       key = options[:encryption_key] ||
-            ENV['SOLIDUS_PREFERENCES_MASTER_KEY'] ||
-            Rails.application.credentials.secret_key_base
+        ENV["SOLIDUS_PREFERENCES_MASTER_KEY"] ||
+        Rails.application.credentials.secret_key_base
 
       Spree::Encryptor.new(key)
     end

data/lib/spree/preferences/preference_differentiator.rb

@@ -19,7 +19,7 @@ module Spree
             changes
           else
             changes.merge(
-              pref_key => { from: value_from, to: value_to }
+              pref_key => {from: value_from, to: value_to}
             )
           end
         end

data/lib/spree/preferences/scoped_store.rb

@@ -26,11 +26,11 @@ module Spree::Preferences
     private
 
     def key_for(key)
-      [rails_cache_id, @prefix, key, @suffix].compact.join('/')
+      [rails_cache_id, @prefix, key, @suffix].compact.join("/")
     end
 
     def rails_cache_id
-      ENV['RAILS_CACHE_ID']
+      ENV["RAILS_CACHE_ID"]
     end
   end
 end

data/lib/spree/preferences/static_model_preferences.rb

@@ -55,8 +55,8 @@ module Spree
           next if extra_keys.empty?
 
           raise \
-            "Unexpected keys found for #{klass} under #{name}: #{extra_keys.sort.join(', ')} " \
-            "(expected keys: #{klass_keys.sort.join(', ')})"
+            "Unexpected keys found for #{klass} under #{name}: #{extra_keys.sort.join(", ")} " \
+            "(expected keys: #{klass_keys.sort.join(", ")})"
         end
       end
     end

data/lib/spree/preferences/store.rb

@@ -3,7 +3,7 @@
 # Use singleton class Spree::Preferences::Store.instance to access
 #
 
-require 'singleton'
+require "singleton"
 
 module Spree::Preferences
   class StoreInstance
@@ -35,19 +35,19 @@ module Spree::Preferences
         # has been cleared from the cache
 
         # does it exist in the database?
-        if preference = Spree::Preference.find_by(key:)
+        val = if (preference = Spree::Preference.find_by(key:))
           # it does exist
-          val = preference.value
+          preference.value
         else
           # use the fallback value
-          val = yield
+          yield
         end
 
         # Cache either the value from the db or the fallback value.
         # This avoids hitting the db with subsequent queries.
         @cache.write(key, val)
 
-        return val
+        val
       else
         yield
       end
@@ -77,7 +77,7 @@ module Spree::Preferences
       return unless should_persist?
 
       preference = Spree::Preference.find_by(key: cache_key)
-      preference.destroy if preference
+      preference&.destroy
     end
 
     def should_persist?

data/lib/spree/testing_support/ability_helpers.rb

@@ -1,107 +1,107 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples_for 'access granted' do
-  it 'should allow show' do
+RSpec.shared_examples_for "access granted" do
+  it "should allow show" do
     expect(ability).to be_able_to(:show, resource, token) if token
     expect(ability).to be_able_to(:show, resource) unless token
   end
 
-  it 'should allow create' do
+  it "should allow create" do
     expect(ability).to be_able_to(:create, resource, token) if token
     expect(ability).to be_able_to(:create, resource) unless token
   end
 
-  it 'should allow update' do
+  it "should allow update" do
     expect(ability).to be_able_to(:update, resource, token) if token
     expect(ability).to be_able_to(:update, resource) unless token
   end
 end
 
-RSpec.shared_examples_for 'access denied' do
-  it 'should not allow show' do
+RSpec.shared_examples_for "access denied" do
+  it "should not allow show" do
     expect(ability).to_not be_able_to(:show, resource)
   end
 
-  it 'should not allow create' do
+  it "should not allow create" do
     expect(ability).to_not be_able_to(:create, resource)
   end
 
-  it 'should not allow update' do
+  it "should not allow update" do
     expect(ability).to_not be_able_to(:update, resource)
   end
 end
 
-RSpec.shared_examples_for 'admin granted' do
-  it 'should allow admin' do
+RSpec.shared_examples_for "admin granted" do
+  it "should allow admin" do
     expect(ability).to be_able_to(:admin, resource, token) if token
     expect(ability).to be_able_to(:admin, resource) unless token
   end
 end
 
-RSpec.shared_examples_for 'admin denied' do
-  it 'should not allow admin' do
+RSpec.shared_examples_for "admin denied" do
+  it "should not allow admin" do
     expect(ability).to_not be_able_to(:admin, resource)
   end
 end
 
-RSpec.shared_examples_for 'index allowed' do
-  it 'should allow index' do
+RSpec.shared_examples_for "index allowed" do
+  it "should allow index" do
     expect(ability).to be_able_to(:index, resource)
   end
 end
 
-RSpec.shared_examples_for 'no index allowed' do
-  it 'should not allow index' do
+RSpec.shared_examples_for "no index allowed" do
+  it "should not allow index" do
     expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
-RSpec.shared_examples_for 'create only' do
-  it 'should allow create' do
+RSpec.shared_examples_for "create only" do
+  it "should allow create" do
     expect(ability).to be_able_to(:create, resource)
   end
 
-  it 'should not allow show' do
+  it "should not allow show" do
     expect(ability).to_not be_able_to(:show, resource)
   end
 
-  it 'should not allow update' do
+  it "should not allow update" do
     expect(ability).to_not be_able_to(:update, resource)
   end
 
-  it 'should not allow index' do
+  it "should not allow index" do
     expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
-RSpec.shared_examples_for 'read only' do
-  it 'should not allow create' do
+RSpec.shared_examples_for "read only" do
+  it "should not allow create" do
     expect(ability).to_not be_able_to(:create, resource)
   end
 
-  it 'should not allow update' do
+  it "should not allow update" do
     expect(ability).to_not be_able_to(:update, resource)
   end
 
-  it 'should allow index' do
+  it "should allow index" do
     expect(ability).to be_able_to(:index, resource)
   end
 end
 
-RSpec.shared_examples_for 'update only' do
-  it 'should not allow create' do
+RSpec.shared_examples_for "update only" do
+  it "should not allow create" do
     expect(ability).to_not be_able_to(:create, resource)
   end
 
-  it 'should not allow show' do
+  it "should not allow show" do
     expect(ability).to_not be_able_to(:show, resource)
   end
 
-  it 'should allow update' do
+  it "should allow update" do
     expect(ability).to be_able_to(:update, resource)
   end
 
-  it 'should not allow index' do
+  it "should not allow index" do
     expect(ability).to_not be_able_to(:index, resource)
   end
 end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
-require 'cancan'
+require "cancan"
 
 module Spree
   module TestingSupport
     module AuthorizationHelpers
       module CustomAbility
         def build_ability(&block)
-          block ||= proc{ |_u| can :manage, :all }
+          block ||= proc { |_u| can :manage, :all }
           Class.new do
             include CanCan::Ability
+
             define_method(:initialize, block)
           end
         end
@@ -41,9 +42,9 @@ module Spree
           end
 
           before do
-            allow(Spree.user_class).to receive(:find_by).
-                                         with(hash_including(:spree_api_key)).
-                                         and_return(Spree.user_class.new)
+            allow(Spree.user_class).to receive(:find_by)
+              .with(hash_including(:spree_api_key))
+              .and_return(Spree.user_class.new)
           end
         end
 

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 = ['https://fonts.googleapis.com']
+          browser.url_blacklist = ["https://fonts.googleapis.com"]
         end
       end
     end

data/lib/spree/testing_support/bus_helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spree/bus'
+require "spree/bus"
 
 module Spree
   module TestingSupport

data/lib/spree/testing_support/capybara_driver.rb

@@ -6,4 +6,4 @@ require "capybara-screenshot"
 Capybara::Screenshot.register_driver(:selenium_headless) do |driver, path|
   driver.browser.save_screenshot(path)
 end
-Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_headless).to_sym
+Capybara.javascript_driver = (ENV["CAPYBARA_DRIVER"] || :selenium_headless).to_sym

data/lib/spree/testing_support/capybara_ext.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def eventually_fill_in(field, options = {})
-        expect(page).to have_css('#' + field)
+        expect(page).to have_css("#" + field)
         fill_in field, options
       end
 
@@ -42,7 +42,7 @@ module Spree
         }.merge(options)
         label = find_label_by_text(options[:from])
         within label.first(:xpath, ".//..") do
-          options[:from] = "##{find('.select2-container')['id']}"
+          options[:from] = "##{find(".select2-container")["id"]}"
         end
         select2_search_without_selection(options[:search], from: options[:from])
         select_select2_result(value) if options[:select]
@@ -65,14 +65,14 @@ module Spree
       # document. Can be used to 'escape' from within the context of another within
       # block.
       def within_entire_page(&block)
-        within(:xpath, '//body', &block)
+        within(:xpath, "//body", &block)
       end
 
       def select2(value, options)
         label = find_label_by_text(options[:from])
 
         within label.first(:xpath, ".//..") do
-          options[:from] = "##{find('.select2-container')['id']}"
+          options[:from] = "##{find(".select2-container")["id"]}"
         end
         targetted_select2(value, options)
       end
@@ -89,16 +89,16 @@ module Spree
 
       def targetted_select2(value, options)
         # find select2 element and click it
-        find(options[:from]).find('a').click
+        find(options[:from]).find("a").click
         select_select2_result(value)
       end
 
       def select_select2_result(value)
         # results are in a div appended to the end of the document
         within_entire_page do
-          expect(page).to have_selector('.select2-result-label', visible: true)
+          expect(page).to have_selector(".select2-result-label", visible: true)
           find("div.select2-result-label", text: /#{Regexp.escape(value)}/i, match: :prefer_exact).click
-          expect(page).not_to have_selector('.select2-result-label')
+          expect(page).not_to have_selector(".select2-result-label")
         end
       end
 
@@ -108,17 +108,17 @@ module Spree
         # We need to select labels which are not .select2-offscreen, as select2
         # makes a duplicate label with the same text, and we want to be sure to
         # find the original.
-        find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
+        find("label:not(.select2-offscreen)", text: /#{Regexp.escape(text)}/i, match: :one)
       end
 
-      def dialog(parent: 'body', **options)
+      def dialog(parent: "body", **options)
         within(parent) do
-          find('dialog', visible: :all, **options)
+          find("dialog", visible: :all, **options)
         end
       end
 
       def turbo_frame_modal
-        dialog(parent: find('turbo-frame', visible: :all))
+        dialog(parent: find("turbo-frame", visible: :all))
       end
     end
   end
@@ -144,4 +144,4 @@ RSpec.configure do |c|
 end
 
 # A workaround for https://github.com/rspec/rspec-rails/issues/1897
-Capybara.server = :puma, { Silent: true }
+Capybara.server = :puma, {Silent: true}