spree_core 4.2.0.rc2 → 4.2.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc2
+  version: 4.2.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -45,20 +45,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -215,30 +215,42 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +265,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -421,7 +447,9 @@ 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
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
@@ -432,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
@@ -579,7 +609,7 @@ files:
 - app/models/spree/return_item/eligibility_validator/inventory_shipped.rb
 - app/models/spree/return_item/eligibility_validator/no_reimbursements.rb
 - app/models/spree/return_item/eligibility_validator/order_completed.rb
-- app/models/spree/return_item/eligibility_validator/r_m_a_required.rb
+- app/models/spree/return_item/eligibility_validator/rma_required.rb
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_product.rb
@@ -635,9 +665,10 @@ files:
 - app/presenters/spree/variant_presenter.rb
 - app/presenters/spree/variants/option_types_presenter.rb
 - app/presenters/spree/variants/options_presenter.rb
-- app/services/spree/account/addresses/base.rb
 - 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
@@ -655,11 +686,14 @@ files:
 - app/services/spree/checkout/update.rb
 - app/services/spree/compare_line_items.rb
 - app/services/spree/generate_token.rb
+- app/sorters/spree/base_sorter.rb
 - app/sorters/spree/orders/sort.rb
 - app/sorters/spree/products/sort.rb
 - 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
@@ -686,8 +720,10 @@ files:
 - config/initializers/active_storage.rb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
+- config/initializers/inflections.rb
 - config/initializers/premailer_assets.rb
 - config/initializers/premailer_rails.rb
+- config/initializers/rails61_fixes.rb
 - config/initializers/state_machine.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -979,6 +1015,14 @@ files:
 - db/migrate/20201006110150_add_checkout_zone_field_to_store.rb
 - db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb
 - db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
+- db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb
+- db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb
+- 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
@@ -999,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
@@ -1014,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
@@ -1038,8 +1081,6 @@ files:
 - lib/spree/database_type_utilities.rb
 - lib/spree/dependencies_helper.rb
 - lib/spree/i18n.rb
-- lib/spree/i18n/base.rb
-- lib/spree/i18n/initializer.rb
 - lib/spree/localized_number.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
@@ -1106,11 +1147,15 @@ 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
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
@@ -1130,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.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1148,7 +1193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.

data/lib/generators/spree/install/templates/config/initializers/spree_storefront.rb

@@ -1 +0,0 @@
-SpreeStorefrontConfig = YAML.load_file(Rails.root.join('config', 'spree_storefront.yml')).with_indifferent_access

data/lib/generators/spree/install/templates/config/spree_storefront.yml

@@ -1,67 +0,0 @@
-default:
-  navigation:
-    - title: Women
-      subtitle: Categories
-      url: /t/women
-      items:
-        - :title: Skirts
-          :url: /t/women/skirts
-        - :title: Dresses
-          :url: /t/women/dresses
-        - :title: Shirts and Blouses
-          :url: /t/women/shirts-and-blouses
-        - :title: Sweaters
-          :url: /t/women/sweaters
-        - :title: Tops and T-shirts
-          :url: /t/women/tops-and-t-shirts
-        - :title: Jackets and Coats
-          :url: /t/women/jackets-and-coats
-      promo_banners:
-        - subtitle: New collection
-          title: Summer 2019
-          url: /t/new-collection/summer-2019
-          image: 'meganav/promo_banner_left-first-category.jpg'
-        - subtitle: Special Offers
-          title: Get up to 30% off
-          url: /t/special-offers/30-off
-          image: 'meganav/promo_banner_right-first-category.jpg'
-    - title: Men
-      subtitle: Categories
-      url: /t/men
-      items:
-        - :title: Shirts
-          :url: /t/men/shirts
-        - :title: T-shirts
-          :url: /t/men/t-shirts
-        - :title: Sweaters
-          :url: /t/men/sweaters
-        - :title: Jackets and Coats
-          :url: /t/men/jackets-and-coats
-      promo_banners:
-        - subtitle: New collection
-          title: Summer 2019
-          url: /t/new-collection/summer-2019
-          image: 'meganav/promo_banner_left-second-category.jpg'
-        - subtitle: Special Offers
-          title: Get up to 30% off
-          url: /t/special-offers/30-off
-          image: 'meganav/promo_banner_right-second-category.jpg'
-    - title: Sportswear
-      subtitle: Categories
-      url: /t/sportswear
-      items:
-        - :title: Tops
-          :url: /t/sportswear/tops
-        - :title: Sweatshirts
-          :url: /t/sportswear/sweatshirts
-        - :title: Pants
-          :url: /t/sportswear/pants
-      promo_banners:
-        - subtitle: New collection
-          title: Summer 2019
-          url: /t/new-collection/summer-2019
-          image: 'meganav/promo_banner_left-third-category.jpg'
-        - subtitle: Special Offers
-          title: Get up to 30% off
-          url: /t/special-offers/30-off
-          image: 'meganav/promo_banner_right-third-category.jpg'

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

@@ -1,15 +0,0 @@
-module Spree
-  module Core
-    module ControllerHelpers
-      module CurrencyHelpers
-        def self.included(receiver)
-          receiver.send :helper_method, :supported_currencies
-        end
-
-        def supported_currencies
-          current_store.supported_currencies_list
-        end
-      end
-    end
-  end
-end

data/lib/spree/i18n/base.rb

@@ -1,17 +0,0 @@
-module Spree
-  module ViewContext
-    def self.context=(context)
-      @context = context
-    end
-
-    def self.context
-      @context
-    end
-
-    def view_context
-      super.tap do |context|
-        Spree::ViewContext.context = context
-      end
-    end
-  end
-end

data/lib/spree/i18n/initializer.rb

@@ -1 +0,0 @@
-Spree::BaseController.include Spree::ViewContext