spree_core 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5c1992fb7f20f237e3d088cc7c0c79692efb72eaec1e654069ee5b8aeeb846
-  data.tar.gz: 7dd674422290e6570f1b8bb116bd541cac61cbb403402a5996d829b304dac604
+  metadata.gz: 25515bda9382eb9a7fc0e07ac95fea0b0094fd7de31af286e0eed57d5feb205f
+  data.tar.gz: f7aba240ca2172c68b41e7da1c0e4864fcadb1ec6a632c919cca59fa7e129076
 SHA512:
-  metadata.gz: 586c58de60df801c9f4e54983a929f8c507cb8b05c8161ff3f82bc0780a3a64ee33cc42d1ffa01dbea9ed7dce9dda4ced801ba0298b326e255d38314d1286539
-  data.tar.gz: 1aeebb1b70bd971a5589f265903a00cd9d6d3c38843968668000d7bf5277832280a2f3b6d7774d73845f2d45f72166873bfc01c493171f0bce973c4cc374c458
+  metadata.gz: 2f829f28024c84e1b8b7dba2868fedeffc0f105b237ef3ad946ad64ec9a2c0f789c8f3ae367f42203a3d3c53be08b598df0a4cd3d58aa45479bf4e755091f27c
+  data.tar.gz: afefb4b5952e8187f5dc605202fcc578c13bdd9d7f43d411c0763471c32ddb622aaf6f62c2160b1e835d1f974452d54812ebcabd3a072da0ff31af1a698ab3a8

data/app/models/spree/product.rb

@@ -42,9 +42,25 @@ module Spree
     translates(*TRANSLATABLE_FIELDS)
 
     self::Translation.class_eval do
+      before_save :set_slug
       acts_as_paranoid
       # deleted translation values also need to be accessible for index views listing deleted resources
       default_scope { unscope(where: :deleted_at) }
+      def set_slug
+        self.slug = generate_slug
+      end
+
+      private
+
+      def generate_slug
+        if name.blank? && slug.blank?
+          translated_model.name.to_url
+        elsif slug.blank?
+          name.to_url
+        else
+          slug.to_url
+        end
+      end
     end
 
     friendly_id :slug_candidates, use: [:history, :mobility]

data/app/models/spree/taxon.rb

@@ -62,19 +62,40 @@ module Spree
 
     self::Translation.class_eval do
       alias_attribute :slug, :permalink
-
-      before_create :set_permalink
+      before_save :set_permalink
 
       def set_permalink
-        parent = translated_model.parent
-        name_with_fallback = name || translated_model.name
+        self.permalink = generate_slug
+      end
+
+      private
 
+      def generate_slug
         if parent.present?
-          self.permalink = [parent.permalink, (permalink.blank? ? name_with_fallback.to_url : permalink.split('/').last)].join('/')
+          generate_permalink_including_parent
+        elsif permalink.blank?
+          name_with_fallback.to_url
         else
-          self.permalink = name_with_fallback.to_url if permalink.blank?
+          permalink.to_url
         end
       end
+
+      def generate_permalink_including_parent
+        [parent_permalink_with_fallback, (permalink.blank? ? name_with_fallback.to_url : permalink.split('/').last.to_url)].join('/')
+      end
+
+      def name_with_fallback
+        name.blank? ? translated_model.name : name
+      end
+
+      def parent
+        translated_model.parent
+      end
+
+      def parent_permalink_with_fallback
+        localized_parent = parent.translations.find_by(locale: locale)
+        localized_parent.present? ? localized_parent.permalink : parent.permalink
+      end
     end
 
     # indicate which filters should be used for a taxon

data/lib/spree/core/product_duplicator.rb

@@ -26,7 +26,10 @@ module Spree
 
     def duplicate_product
       product.dup.tap do |new_product|
-        product.translations.each { |t| new_product.send(:name=, "COPY OF #{t.name}", locale: t.locale) }
+        new_product.translations.each do |t|
+          t.name = "COPY OF #{t.name}"
+          t.slug = nil
+        end
         new_product.taxons = product.taxons
         new_product.stores = product.stores
         new_product.created_at = nil

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.6.1'.freeze
+  VERSION = '4.6.2'.freeze
 
   def self.version
     VERSION

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

@@ -13,6 +13,8 @@ FactoryBot.define do
     twitter                { 'spreecommerce' }
     instagram              { 'spreecommerce' }
     meta_description       { 'Sample store description.' }
+    digital_asset_authorized_clicks { 5 }
+    digital_asset_authorized_days   { 7 }
 
     trait :with_favicon do
       transient do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -1079,9 +1079,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.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.6.2
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.6.1
+  source_code_uri: https://github.com/spree/spree/tree/v4.6.2
 post_install_message:
 rdoc_options: []
 require_paths: