solidus_core 2.5.2 → 2.6.0.rc1

data/lib/spree/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/app_configuration'
 
 Spree::Config = Spree::AppConfiguration.new

data/lib/spree/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/all'
 require 'acts_as_list'
 require 'awesome_nested_set'
@@ -82,6 +84,7 @@ require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/role_configuration'
 require 'spree/core/stock_configuration'
+require 'spree/core/validators/email'
 require 'spree/permission_sets'
 
 require 'spree/preferences/store'

data/lib/spree/core/active_merchant_dependencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_merchant/errors'
 
 require 'active_merchant/billing/base'

data/lib/spree/core/class_constantizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ClassConstantizer

data/lib/spree/core/controller_helpers/auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cancan'
 
 module Spree
@@ -40,7 +42,10 @@ module Spree
 
         def set_guest_token
           unless cookies.signed[:guest_token].present?
-            cookies.permanent.signed[:guest_token] = SecureRandom.urlsafe_base64(nil, false)
+            cookies.permanent.signed[:guest_token] = {
+              value: SecureRandom.urlsafe_base64(nil, false),
+              httponly: true
+            }
           end
         end
 
@@ -65,10 +70,10 @@ module Spree
         def try_spree_current_user
           # This one will be defined by apps looking to hook into Spree
           # As per authentication_helpers.rb
-          if respond_to?(:spree_current_user)
+          if respond_to?(:spree_current_user, true)
             spree_current_user
           # This one will be defined by Devise
-          elsif respond_to?(:current_spree_user)
+          elsif respond_to?(:current_spree_user, true)
             current_spree_user
           end
         end

data/lib/spree/core/controller_helpers/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'carmen'
 
 module Spree
@@ -46,10 +48,17 @@ module Spree
         private
 
         def set_user_language
-          locale = session[:locale]
-          locale ||= config_locale if respond_to?(:config_locale, true)
-          locale ||= Rails.application.config.i18n.default_locale
-          locale ||= I18n.default_locale
+          available_locales = Spree.i18n_available_locales
+          locale = [
+            params[:locale],
+            session[:locale],
+            (config_locale if respond_to?(:config_locale, true)),
+            I18n.default_locale
+          ].detect do |candidate|
+            candidate &&
+              available_locales.include?(candidate.to_sym)
+          end
+          session[:locale] = locale
           I18n.locale = locale
           Carmen.i18n_backend.locale = locale
         end

data/lib/spree/core/controller_helpers/order.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/core/controller_helpers/pricing'
 
 module Spree

data/lib/spree/core/controller_helpers/payment_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core::ControllerHelpers::PaymentParameters
     # This method handles the awkwardness of how the html forms are currently

data/lib/spree/core/controller_helpers/pricing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/deprecation'
 
 module Spree

data/lib/spree/core/controller_helpers/search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers

data/lib/spree/core/controller_helpers/store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module ControllerHelpers

data/lib/spree/core/current_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Default class for deciding what the current store is, given an HTTP request
 # This is an extension point used in Spree::Core::ControllerHelpers::Store
 # Custom versions of this class must respond to a store instance method

data/lib/spree/core/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/config'
 
 module Spree

data/lib/spree/core/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/core/environment_extension'
 
 module Spree

data/lib/spree/core/environment/calculators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     class Environment

data/lib/spree/core/environment_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/core/class_constantizer'
 
 module Spree
@@ -9,7 +11,7 @@ module Spree
         def add_class_set(name)
           define_method(name) do
             set = instance_variable_get("@#{name}")
-            set = send("#{name}=", []) unless set
+            set ||= send("#{name}=", [])
             set
           end
 

data/lib/spree/core/importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module Importer

data/lib/spree/core/importer/order.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module Importer

data/lib/spree/core/importer/product.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module Importer

data/lib/spree/core/permalinks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     module Permalinks

data/lib/spree/core/product_duplicator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class ProductDuplicator
     attr_accessor :product

data/lib/spree/core/product_filters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     # THIS FILE SHOULD BE OVER-RIDDEN IN YOUR SITE EXTENSION!

data/lib/spree/core/role_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 require 'spree/core/class_constantizer'
 
@@ -36,7 +38,7 @@ module Spree
       end
 
       # Yields the instance of the singleton, used for configuration
-      # @yield_param instance [Spree::RoleConfiguration]
+      # @yieldparam instance [Spree::RoleConfiguration]
       def configure
         Spree::Deprecation.warn "Spree::RoleConfiguration.configure is deprecated. Call Spree::Config.roles.assign_permissions instead"
         yield(Spree::Config.roles)

data/lib/spree/core/search/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/deprecation'
 
 module Spree
@@ -44,6 +46,10 @@ module Spree
           end
         end
 
+        def respond_to_missing?(name)
+          @properties.key?(name) || super(name)
+        end
+
         protected
 
         def get_base_scope

data/lib/spree/core/search/variant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 
 module Spree
@@ -47,7 +49,7 @@ module Spree
         # Subclasses may override this to allow conditional filtering, etc.
         #
         # @api public
-        # @param word [String] One of the search words provided by the user.
+        # @param _word [String] One of the search words provided by the user.
         #   e.g. a SKU
         # @return [Array<Symbol>] the list of search terms to use for this word
         def search_terms(_word)

data/lib/spree/core/stock_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Core
     class StockConfiguration

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

@@ -1,7 +1,30 @@
-class EmailValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    unless value =~ /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
-      record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+# frozen_string_literal: true
+
+module Spree
+  # == An ActiveModel Email Validator
+  #
+  # === Usage
+  #
+  #     require 'spree/core/validators/email'
+  #
+  #     class Person < ApplicationRecord
+  #       validates :email_address, 'spree/email' => true
+  #     end
+  #
+  class EmailValidator < ActiveModel::EachValidator
+    EMAIL_REGEXP = /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
+
+    def validate_each(record, attribute, value)
+      unless value =~ EMAIL_REGEXP
+        record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+      end
     end
   end
 end
+
+# @private
+EmailValidator = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
+  'EmailValidator',
+  'Spree::EmailValidator',
+  message: "EmailValidator is deprecated! Use Spree::EmailValidator instead.\nChange `validates :email, email: true` to `validates :email, 'spree/email' => true`\n"
+)

data/lib/spree/core/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Spree
   def self.solidus_version
-    "2.5.2"
+    "2.6.0.rc1"
   end
 
   def self.solidus_gem_version

data/lib/spree/deprecation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/deprecation'
 
 module Spree

data/lib/spree/i18n.rb

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
+
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
 require 'action_view'
 
 module Spree
+  def self.i18n_available_locales
+    I18n.available_locales.select do |locale|
+      I18n.t('spree.i18n.this_file_language', locale: locale, fallback: false, default: nil)
+    end
+  end
+
   class TranslationHelperWrapper # :nodoc:
     include ActionView::Helpers::TranslationHelper
   end

data/lib/spree/localized_number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class LocalizedNumber
     # Given a string, strips all non-price-like characters from it,

data/lib/spree/mailer_previews/carton_preview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class MailerPreviews
     class CartonPreview < ActionMailer::Preview

data/lib/spree/mailer_previews/order_preview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class MailerPreviews
     class OrderPreview < ActionMailer::Preview

data/lib/spree/mailer_previews/reimbursement_preview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class MailerPreviews
     class ReimbursementPreview < ActionMailer::Preview

data/lib/spree/migration_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module MigrationHelpers
     def safe_remove_index(table, column)

data/lib/spree/migrations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class Migrations
     attr_reader :config, :engine_name

data/lib/spree/money.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'money'
 require 'monetize'
@@ -100,13 +100,13 @@ module Spree
       if !other.respond_to?(:money)
         raise TypeError, "Can't compare #{other.class} to Spree::Money"
       end
-      if self.currency != other.currency
+      if currency != other.currency
         # By default, ::Money will try to run a conversion on `other.money` and
         # try a comparison on that. We do not want any currency conversion to
         # take place so we'll catch this here and raise an error.
         raise(
           DifferentCurrencyError,
-          "Can't compare #{self.currency} with #{other.currency}"
+          "Can't compare #{currency} with #{other.currency}"
         )
       end
       @money <=> other.money

data/lib/spree/paranoia_deprecations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module ParanoiaDeprecations
     def paranoia_destroy

data/lib/spree/permission_sets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/permission_sets/base'
 require 'spree/permission_sets/configuration_display'
 require 'spree/permission_sets/configuration_management'

data/lib/spree/permission_sets/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module PermissionSets
     # This is the base class used for crafting permission sets.