spree_core 4.2.0.rc3 → 4.2.2

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

@@ -5,7 +5,7 @@ module Spree
         def build_searcher(params)
           Spree::Config.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
-            searcher.current_currency = current_currency
+            searcher.current_currency = current_currency&.upcase
           end
         end
       end

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

@@ -5,30 +5,18 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :supported_currencies
-          helper_method :current_currency
           helper_method :current_store
           helper_method :current_price_options
         end
 
-        def current_currency
-          if defined?(session) && session.key?(:currency) && supported_currencies.map(&:iso_code).include?(session[:currency])
-            session[:currency]
-          elsif params[:currency].present? && supported_currencies.map(&:iso_code).include?(params[:currency])
-            params[:currency]
-          else
-            current_store.default_currency
-          end
-        end
-
-        def supported_currencies
-          current_store.supported_currencies_list
-        end
-
         def current_store
           @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
         end
 
+        def store_locale
+          current_store.default_locale
+        end
+
         # Return a Hash of things that influence the prices displayed in your shop.
         #
         # By default, the only thing that influences prices that is the current order's +tax_zone+

data/lib/spree/core/version.rb

@@ -1,5 +1,7 @@
 module Spree
+  VERSION = '4.2.2'.freeze
+
   def self.version
-    '4.2.0.rc3'
+    VERSION
   end
 end

data/lib/spree/i18n.rb

@@ -16,6 +16,18 @@ module Spree
       TranslationHelperWrapper.new.translate(key, **options)
     end
 
+    def available_locales
+      locales_from_i18n = I18n.available_locales
+      locales =
+        if defined?(SpreeI18n)
+          (SpreeI18n::Locale.all << :en).map(&:to_s)
+        else
+          [Rails.application.config.i18n.default_locale, I18n.locale, :en]
+        end
+
+      (locales + locales_from_i18n).uniq.compact
+    end
+
     alias t translate
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -99,7 +99,7 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords, :logo,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :facebook, :twitter, :instagram,
-                          :description, :address, :contact_phone,
+                          :description, :address, :contact_phone, :supported_locales,
                           :default_locale, :default_country_id, :supported_currencies,
                           :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
 

data/lib/spree/service_module.rb

@@ -1,8 +1,8 @@
 module Spree
   module ServiceModule
     module Callable
-      def call(*args)
-        new.call(*args).tap do |result|
+      def call(*args, **kwargs)
+        new.call(*args, **kwargs).tap do |result|
           return yield(result) if block_given?
         end
       end

data/lib/spree/testing_support/common_rake.rb

@@ -15,7 +15,7 @@ namespace :common do
     Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', "--user_class=#{args[:user_class]}"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', '--install_storefront=false', "--user_class=#{args[:user_class]}"]
 
     puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create > #{File::NULL}")

data/lib/spree/testing_support/controller_requests.rb

@@ -9,7 +9,7 @@ module Spree
 
       def spree_get(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_get is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
           Please use get, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'GET')
@@ -18,7 +18,7 @@ module Spree
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_post is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
           Please use post, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'POST')
@@ -27,7 +27,7 @@ module Spree
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_put is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
           Please use put, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PUT')
@@ -36,7 +36,7 @@ module Spree
       # # Executes a request simulating PATCH HTTP method and set/volley the response
       def spree_patch(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_patch is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
           Please use patch, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PATCH')
@@ -45,7 +45,7 @@ module Spree
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_delete is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
           Please use delete, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'DELETE')
@@ -53,35 +53,35 @@ module Spree
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :get)
       end
 
       def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :post)
       end
 
       def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :put)
       end
 
       def spree_xhr_patch(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :patch)
       end
 
       def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :delete)
       end

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

@@ -20,8 +20,8 @@ FactoryBot.define do
         product_1 = create(:product)
         product_2 = create(:product)
 
-        stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
-        stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)
+        stock_location.stock_items.where(variant_id: product_1.master_id).first.adjust_count_on_hand(10)
+        stock_location.stock_items.where(variant_id: product_2.master_id).first.adjust_count_on_hand(20)
       end
     end
   end

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

@@ -8,6 +8,7 @@ FactoryBot.define do
     new_order_notifications_email { 'store-owner@example.com' }
     default_currency       { 'USD' }
     supported_currencies   { 'USD,EUR,GBP' }
+    default_locale         { 'en' }
     facebook               { 'spreecommerce' }
     twitter                { 'spreecommerce' }
     instagram              { 'spreecommerce' }

data/lib/spree/testing_support/flatpickr_capybara.rb

@@ -0,0 +1,101 @@
+module Spree
+  module TestingSupport
+    module FlatpickrCapybara
+      def fill_in_date_manually(label_text, with:)
+        with_open_flatpickr(label_text) do |field|
+          fill_in field[:id], with: with
+        end
+      end
+
+      def fill_in_date_picker(label_text, with:)
+        within_open_flatpickr(label_text) do
+          within_flatpickr_months do
+            fill_in_flatpickr_year(with.split('-')[0])
+
+            select_flatpickr_month(with.split('-')[1])
+
+            click_on_flatpickr_day(with.split('-')[2])
+          end
+        end
+      end
+
+      def fill_in_date_time_picker(label_text, with:)
+        within_open_flatpickr(label_text) do
+          within_flatpickr_months do
+            fill_in_flatpickr_year(with.split('-')[0])
+
+            select_flatpickr_month(with.split('-')[1])
+
+            click_on_flatpickr_day(with.split('-')[2])
+          end
+
+          within_flatpickr_time do
+            select_flatpickr_hour(with.split('-')[3])
+
+            select_flatpickr_min(with.split('-')[4])
+          end
+        end
+      end
+
+      def fill_in_date_with_js(label_text, with:)
+        date_field = find("input[id='#{label_text}']")
+        script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"
+
+        page.execute_script(script)
+      end
+
+      private
+
+      def with_open_flatpickr(label_text)
+        field_label = find_field(id: label_text, type: :hidden)
+
+        date_field = field_label.sibling('.flatpickr-alt-input')
+        date_field.click # Open the widget
+
+        yield(date_field)
+
+        date_field.send_keys :tab # Close the date picker widget
+      end
+
+      def within_open_flatpickr(label_text)
+        with_open_flatpickr(label_text) do
+          within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]") { yield }
+        end
+      end
+
+      def within_flatpickr_months
+        within find('.flatpickr-months .flatpickr-month .flatpickr-current-month') { yield }
+      end
+
+      def within_flatpickr_time
+        within find('.flatpickr-time') { yield }
+      end
+
+      def select_flatpickr_month(month)
+        find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option
+      end
+
+      def fill_in_flatpickr_year(year)
+        find('input.cur-year').set(year)
+      end
+
+      def click_on_flatpickr_day(day)
+        within_flatpickr_days do
+          find('span', text: day).click
+        end
+      end
+
+      def within_flatpickr_days
+        within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days') { yield }
+      end
+
+      def select_flatpickr_hour(hour)
+        find('input.flatpickr-hour').set(hour)
+      end
+
+      def select_flatpickr_min(min)
+        find('input.flatpickr-minute').set(min)
+      end
+    end
+  end
+end

data/lib/spree/testing_support/locale_helpers.rb

@@ -0,0 +1,78 @@
+module Spree
+  module TestingSupport
+    module LocaleHelpers
+      # rubocop:disable Layout/ArgumentAlignment
+      def add_french_locales
+        I18n.backend.store_translations(:fr,
+          spree: {
+            added_to_cart: 'Ajouté au panier avec succès!',
+            continue_shopping: 'Continuer vos achats',
+            choose_currency: 'Choisir la devise',
+            internationalization: 'Internationalisation',
+            i18n: {
+              language: 'Langue',
+              this_file_language: 'Français (FR)'
+            },
+            cart_page: {
+              header: 'Votre panier',
+              empty_info: 'Votre panier est vide',
+              add_promo_code: 'AJOUTER UN CODE PROMOTIONNEL',
+              checkout: 'Passer la commande',
+              product: 'articles',
+              quantity: 'quantité',
+              title: 'Panier',
+              change_quantity: 'Changer la quantité',
+              remove_from_cart: 'Retirer du panier'
+            },
+            shopping_cart: 'Panier',
+            cart: 'Panier',
+            close: 'Fermer',
+            search: 'Rechercher',
+            home: 'Accueil',
+            nav_bar: {
+              admin_panel: "Panneau d'administration",
+              close_menu: 'Fermer le menu',
+              go_to_previous_menu: 'Vers le menu précédent',
+              show_menu: 'Afficher le menu',
+              show_search: 'Afficher la recherche',
+              show_user_menu: 'Afficher le menu utilisateur',
+              change_country: 'Changer de pays',
+              desktop: 'Navigation sur le bureau',
+              mobile: 'Navigation mobile'
+            },
+            login: 'Connexion',
+            logout: 'Se déconnecter',
+            sign_up: 'Enregistrer',
+            email: 'Courriel',
+            password: 'Mot de passe',
+            remember_me: 'Se souvenir de moi',
+            my_account: 'Mon compte',
+            my_orders: 'Mes commandes',
+            logged_in_succesfully: 'Connexion réussie'
+          })
+      end
+      # rubocop:enable Layout/ArgumentAlignment
+
+      def open_i18n_menu
+        find('#header #internationalization-button-desktop').click
+        expect(page).to have_selector('#internationalization-options-desktop')
+      end
+
+      def close_i18n_menu
+        find('#header #internationalization-button-desktop').click
+        expect(page).not_to have_selector('#internationalization-options-desktop')
+      end
+
+      def switch_to_currency(currency)
+        open_i18n_menu
+        select currency, from: 'switch_to_currency'
+        expect(page).to have_no_css '.turbolinks-progress-bar'
+      end
+
+      def switch_to_locale(locale)
+        open_i18n_menu
+        select locale, from: 'Language'
+      end
+    end
+  end
+end

data/lib/spree/testing_support/next_instance_of.rb

@@ -0,0 +1,38 @@
+# Helper services with prepended ServiceModule
+# https://gitlab.com/gitlab-org/gitlab-foss/-/issues/33587
+#
+# ex:
+# expect_next_instance_of(service_class) do |instance|
+#   expect(instance).to receive(:call)
+# end
+
+module NextInstanceOf
+  def expect_next_instance_of(klass, *new_args)
+    stub_new(expect(klass), *new_args) do |expectation|
+      yield(expectation)
+    end
+  end
+
+  def allow_next_instance_of(klass, *new_args)
+    stub_new(allow(klass), *new_args) do |allowance|
+      yield(allowance)
+    end
+  end
+
+  private
+
+  def stub_new(target, *new_args)
+    receive_new = receive(:new)
+    receive_new.with(*new_args) if new_args.any?
+
+    target.to receive_new.and_wrap_original do |method, *original_args|
+      method.call(*original_args).tap do |instance|
+        yield(instance)
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include NextInstanceOf
+end

data/spree_core.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   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 'cancancan', '~> 3.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc3
+  version: 4.2.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -447,6 +447,7 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
+- app/controllers/spree/errors_controller.rb
 - app/finders/spree/addresses/find.rb
 - app/finders/spree/base_finder.rb
 - app/finders/spree/countries/find.rb
@@ -459,6 +460,8 @@ files:
 - app/finders/spree/variants/option_types_finder.rb
 - app/finders/spree/variants/visible_finder.rb
 - app/helpers/spree/base_helper.rb
+- app/helpers/spree/currency_helper.rb
+- app/helpers/spree/locale_helper.rb
 - app/helpers/spree/mail_helper.rb
 - app/helpers/spree/products_helper.rb
 - app/mailers/spree/base_mailer.rb
@@ -665,6 +668,7 @@ files:
 - app/services/spree/account/addresses/create.rb
 - app/services/spree/account/addresses/helper.rb
 - app/services/spree/account/addresses/update.rb
+- app/services/spree/build_localized_redirect_url.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/estimate_shipping_rates.rb
@@ -688,6 +692,8 @@ files:
 - app/validators/db_maximum_length_validator.rb
 - app/validators/email_validator.rb
 - app/views/layouts/spree/base_mailer.html.erb
+- app/views/spree/errors/forbidden.html.erb
+- app/views/spree/errors/unauthorized.html.erb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
@@ -1014,6 +1020,9 @@ files:
 - db/migrate/20210114182625_create_spree_payment_methods_stores.rb
 - db/migrate/20210114220232_migrate_data_payment_methods_stores.rb
 - db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb
+- db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb
+- db/migrate/20210205211040_add_supported_locales_to_spree_stores.rb
+- db/migrate/20210215202602_migrate_spree_i18n_globalize_config.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -1034,8 +1043,6 @@ files:
 - lib/generators/spree/dummy_model/templates/model.rb.tt
 - lib/generators/spree/install/install_generator.rb
 - lib/generators/spree/install/templates/config/initializers/spree.rb
-- lib/generators/spree/install/templates/config/initializers/spree_storefront.rb
-- lib/generators/spree/install/templates/config/spree_storefront.yml
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
@@ -1049,7 +1056,8 @@ files:
 - lib/spree/core/components.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
-- lib/spree/core/controller_helpers/currency_helpers.rb
+- lib/spree/core/controller_helpers/currency.rb
+- lib/spree/core/controller_helpers/locale.rb
 - lib/spree/core/controller_helpers/order.rb
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
@@ -1139,9 +1147,12 @@ files:
 - lib/spree/testing_support/factories/zone_factory.rb
 - lib/spree/testing_support/factories/zone_member_factory.rb
 - lib/spree/testing_support/flash.rb
+- lib/spree/testing_support/flatpickr_capybara.rb
 - lib/spree/testing_support/i18n.rb
 - lib/spree/testing_support/image_helpers.rb
 - lib/spree/testing_support/kernel.rb
+- lib/spree/testing_support/locale_helpers.rb
+- lib/spree/testing_support/next_instance_of.rb
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/preferences.rb
 - lib/spree/testing_support/rspec_retry_config.rb
@@ -1164,9 +1175,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.0.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.2
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.2
 post_install_message:
 rdoc_options: []
 require_paths: