spree_frontend 4.6.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47fb4519b72315d61a790677b3592cf1d03cebaa77a8b4f483a5cad9bfb8573
-  data.tar.gz: 1ccd7a7756fcd9a45df1de4881128621a1dc4dba0f95db9ad287a0e3cc88b16d
+  metadata.gz: 66ee07c39f3973037fba8e3d5c16f5de80d7cf7152051058b7138ea98b1e0160
+  data.tar.gz: 8413f7984b0dca8fbc785c36d958bf409d7d635dadf997861ed3db8c2f9949c2
 SHA512:
-  metadata.gz: d300612e8c06e3e6444ef44922bf71912ca3bf9a2d296abca6f1e4a951c984c4af5222f5f92312c4a8471a0e5ad57d12aff42edc61d41b9667bc4f0b7782feef
-  data.tar.gz: ce09a386bb4c4488b3cd7369b265dfbe3cbe5578926d152e094c4437c53a30f180ad48d58aec9b38e8979fbee5a68292de4bd09265c043a07ac8bfdf5a432711
+  metadata.gz: 4276034e9e0892d040c79e0ddbb31753c926d0e1d2d7a7f43a378d23224e2418ec41480b95be79ac84bce9da899b2f6951a7dabbdfdf367b430464084230363c
+  data.tar.gz: 67a583cbbf0c984f0b297b4a258a3391bcef391a54683fa5b7c4bbaaeab5897b37a837e655cba233cfa4835315b908402e5e18fcb6b3371e19bdcd39204f20a3

data/.circleci/config.yml

@@ -7,59 +7,14 @@ defaults: &defaults
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
     BUNDLE_PATH: ~/spree/vendor/bundle
-    RAILS_VERSION: '~> 7.0'
+    RAILS_VERSION: '~> 7.1.0'
   working_directory: ~/spree
-  docker:
-    - image: &ruby_2_7_image circleci/ruby:2.7-node-browsers
-    - image: &redis_image circleci/redis:6.2-alpine
-
-defaults_3_2: &defaults_3_2
-  <<: *defaults
   docker:
     - image: &ruby_3_2_image circleci/ruby:3.0-node-browsers
-    - image: *redis_image
-
-run_tests_2_7: &run_tests_2_7
-  <<: *defaults
-  parallelism: 8
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - spree-storefront-old-bundle-v10-ruby-2-7-{{ .Branch }}
-          - spree-storefront-old-bundle-v10-ruby-2-7
-    - run:
-        name: Add keyserver
-        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-    - run:
-        name: Install libvips
-        command: sudo apt-get update && sudo apt-get install libvips
-    - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-    - run:
-          name: Ensure bundle Install
-          command: |
-            bundle check || bundle install
-    - run:
-        name: Create test app
-        command: |
-          bundle exec rake test_app
-    - run:
-          name: Run Rspec
-          command: |
-            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            bundle exec rspec --format documentation \
-                              --format RspecJunitFormatter \
-                              -o ~/rspec/rspec.xml \
-                              -- ${TESTFILES}
-    - store_test_results:
-          path: ~/rspec
-    - store_artifacts:
-          path: tmp/capybara
+    - image: &redis_image circleci/redis:6.2-alpine
 
 run_tests_3_2: &run_tests_3_2
-  <<: *defaults_3_2
+  <<: *defaults
   parallelism: 8
   steps:
     - checkout
@@ -98,34 +53,8 @@ run_tests_3_2: &run_tests_3_2
           path: tmp/capybara
 
 jobs:
-  bundle_ruby_2_7:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - spree-storefront-old-bundle-v10-ruby-2-7-{{ .Branch }}
-            - spree-storefront-old-bundle-v10-ruby-2-7
-      - run:
-          name: Add keyserver
-          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-      - run:
-          name: Install libvips
-          command: sudo apt-get update && sudo apt-get install libvips
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-storefront-old-bundle-v10-ruby-2-7-{{ checksum "Gemfile.lock" }}
-
   bundle_ruby_3_2:
-    <<: *defaults_3_2
+    <<: *defaults
     steps:
       - checkout
       - restore_cache:
@@ -150,31 +79,22 @@ jobs:
             - vendor/bundle
           key: spree-storefront-old-bundle-v10-ruby-3-2-{{ checksum "Gemfile.lock" }}
 
-  tests_ruby_2_7_rails_7_0_postgres:
-    <<: *run_tests_2_7
+  tests_ruby_3_2_rails_7_1_postgres:
+    <<: *run_tests_3_2
     environment: &postgres_environment
       <<: *environment
       DB: postgres
       DB_HOST: localhost
       DB_USERNAME: postgres
     docker:
-      - image: *ruby_2_7_image
-      - image: *redis_image
+      - image: *ruby_3_2_image
       - image: &postgres_image circleci/postgres:12-alpine
         environment:
           POSTGRES_USER: postgres
-
-  tests_ruby_3_2_rails_7_0_postgres:
-    <<: *run_tests_3_2
-    environment:
-      <<: *postgres_environment
-    docker:
-      - image: *ruby_3_2_image
-      - image: *postgres_image
       - image: *redis_image
 
-  tests_ruby_2_7_rails_7_0_mysql:
-    <<: *run_tests_2_7
+  tests_ruby_3_2_rails_7_1_mysql:
+    <<: *run_tests_3_2
     environment: &mysql_environment
       <<: *environment
       DB: mysql
@@ -183,7 +103,7 @@ jobs:
       COVERAGE: true
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_2_7_image
+      - image: *ruby_3_2_image
       - image: *redis_image
       - image: &mysql_image circleci/mysql:8-ram
 
@@ -191,14 +111,10 @@ workflows:
   version: 2
   main:
     jobs:
-      - bundle_ruby_2_7
       - bundle_ruby_3_2
-      - tests_ruby_3_2_rails_7_0_postgres:
+      - tests_ruby_3_2_rails_7_1_postgres:
           requires:
             - bundle_ruby_3_2
-      - tests_ruby_2_7_rails_7_0_postgres:
+      - tests_ruby_3_2_rails_7_1_mysql:
           requires:
-            - bundle_ruby_2_7
-      - tests_ruby_2_7_rails_7_0_mysql:
-          requires:
-            - bundle_ruby_2_7
+            - bundle_ruby_3_2

data/.codeclimate.yml

@@ -15,8 +15,8 @@ plugins:
         enabled: false
     config:
       file: .rubocop.yml
-    channel: "rubocop-0-80" # need to keep this value the same as rubocop version
-                            # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
+    channel: "rubocop-1-50-3" # need to keep this value the same as rubocop version
+                              # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
   eslint:
     enabled: true
     config:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   Exclude:
     - '**/sandbox/**/*'
     - '**/db/migrate/*'

data/Gemfile

@@ -6,7 +6,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
   actionmailer actionpack actionview activejob activemodel activerecord
   activestorage activesupport railties
 ].each do |rails_gem|
-  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.0.0'), require: false
+  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.1.0'), require: false
 end
 
 platforms :jruby do
@@ -22,21 +22,21 @@ platforms :ruby do
 end
 
 group :test do
-  gem 'capybara', '~> 3.24'
-  gem 'capybara-screenshot', '~> 1.0'
+  gem 'capybara'
+  gem 'capybara-screenshot'
   gem 'capybara-select-2'
   gem 'database_cleaner', '~> 2.0'
   gem 'email_spec'
   gem 'factory_bot_rails', '~> 6.0'
   gem 'multi_json'
-  gem 'rspec-activemodel-mocks', '~> 1.0'
-  gem 'rspec-rails', '~> 5.0'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rspec_junit_formatter'
   gem 'rswag-specs'
   gem 'jsonapi-rspec'
   gem 'simplecov', '0.17.1'
-  gem 'webmock', '~> 3.7'
+  gem 'webmock'
   gem 'timecop'
   gem 'rails-controller-testing'
 end
@@ -48,9 +48,8 @@ group :test, :development do
   gem 'rubocop', '~> 1.22.3', require: false # bumped
   gem 'rubocop-rspec', require: false
   gem 'pry-byebug'
-  gem 'webdrivers', '~> 4.1'
-  # Puma 6.0 causes issues in specs due to conflict with capybara version
-  gem 'puma', '< 6.0'
+  gem 'webdrivers'
+  gem 'puma'
   gem 'ffaker'
 end
 

data/app/helpers/spree/frontend_helper.rb

@@ -18,7 +18,7 @@ module Spree
       image_path ||= if logo_attachment&.attached? && logo_attachment&.variable?
                        main_app.cdn_image_url(logo_attachment.variant(resize: '244x104>'))
                      elsif logo_attachment&.attached? && logo_attachment&.image?
-                       main_app.cdn_image_url(current_store.logo)
+                       main_app.cdn_image_url(logo_attachment)
                      else
                        asset_path('logo/spree_50.png')
                      end
@@ -251,7 +251,7 @@ module Spree
     end
 
     def price_filter_values
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `FrontendHelper#price_filter_values` is deprecated and will be removed in Spree 5.0.
         Please use `ProductsFiltersHelper#price_filters` method
       DEPRECATION

data/app/helpers/spree/navigation_helper.rb

@@ -3,7 +3,7 @@ require 'digest'
 module Spree
   module NavigationHelper
     def spree_navigation_data
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         NavigationHelper#spree_navigation_data is deprecated and will be removed in Spree 5.0.
         Please migrate to the new navigation cms system.
       DEPRECATION
@@ -20,7 +20,7 @@ module Spree
     end
 
     def spree_nav_cache_key(section = 'header')
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         NavigationHelper#spree_nav_cache_key is deprecated and will be removed in Spree 5.0.
         Please migrate to the new navigation cms system.
       DEPRECATION

data/app/helpers/spree/taxons_helper.rb

@@ -4,7 +4,7 @@ module Spree
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         TaxonsHelper is deprecated and will be removed in Spree 5.0.
         Please remove any `helper 'spree/taxons'` from your controllers.
       DEPRECATION

data/app/services/spree/build_localized_redirect_url.rb

@@ -118,14 +118,14 @@ module Spree
         Mobility.with_locale(default_locale) { Spree::Product.friendly.find(product_path_match[1]) }
       end
 
-      new_slug = Mobility.with_locale(locale) { product.slug(fallbacks: default_locale) }
+      new_slug = product.slug(locale: locale) || product.slug(locale: default_locale)
       new_path_slug = "/products/#{new_slug}"
       default_locale_supplied ? new_path_slug : "/#{locale}/#{new_path_slug}"
     end
 
     def generate_taxon_path(taxon_path_match, previous_locale, locale, default_locale, default_locale_supplied)
       taxon = Mobility.with_locale(previous_locale) { Spree::Taxon.friendly.find(taxon_path_match[1]) }
-      new_slug = Mobility.with_locale(locale) { taxon.permalink(fallbacks: default_locale) }
+      new_slug = taxon.permalink(locale: locale) || taxon.permalink(locale: default_locale)
       new_path_slug = "/t/#{new_slug}"
       default_locale_supplied ? new_path_slug : "/#{locale}/#{new_path_slug}"
     end

data/config/initializers/admin_actions.rb

@@ -0,0 +1,18 @@
+Rails.application.config.after_initialize do
+  if Spree::Core::Engine.backend_available?
+    action = ::Spree::Admin::Actions::ActionBuilder.new('preview', ->(resource) { "/products/#{resource.slug}" }).
+              with_icon_key('view.svg').
+              with_label_translation_key('admin.utilities.preview').
+              with_id('adminPreviewProduct').
+              with_target(:blank).
+              with_data_attributes({ turbo: false }).
+              build
+
+    Rails.application.config.spree_backend.actions[:product].add(action)
+    Rails.application.config.spree_backend.actions[:images].add(action)
+    Rails.application.config.spree_backend.actions[:variants].add(action)
+    Rails.application.config.spree_backend.actions[:prices].add(action)
+    Rails.application.config.spree_backend.actions[:stock].add(action)
+    Rails.application.config.spree_backend.actions[:product_properties].add(action)
+  end
+end

data/lib/spree/frontend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Frontend
-    VERSION = '4.6.0'.freeze
+    VERSION = '4.7.0'.freeze
 
     def self.version
       VERSION

data/spree_frontend.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 3.0'
 
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
   requirement: !ruby/object:Gem::Requirement
@@ -601,6 +601,7 @@ files:
 - app/views/spree/users/_address_controls.html.erb
 - app/views/spree/users/edit.html.erb
 - app/views/spree/users/show.html.erb
+- config/initializers/admin_actions.rb
 - config/initializers/assets.rb
 - config/initializers/canonical_rails.rb
 - config/routes.rb
@@ -632,9 +633,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.6.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.7.0
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.6.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.7.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -643,7 +644,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="