spree_core 4.6.0 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 619f5416fb099c1cccaeb2432fd6002b53aa605aff90c9b4078f2a51ba73e89b
-  data.tar.gz: e53a5c780f9c4e79c50cc38d2fdd055dc20b04bef93c89e33e88b7a4fd9facce
+  metadata.gz: 25515bda9382eb9a7fc0e07ac95fea0b0094fd7de31af286e0eed57d5feb205f
+  data.tar.gz: f7aba240ca2172c68b41e7da1c0e4864fcadb1ec6a632c919cca59fa7e129076
 SHA512:
-  metadata.gz: 7e8cc84789a7c8564b45576c2aa9f8974f62da3b2c752869a9950497b01382b073b50a4d7746d9f2142bee4248115b58a527637b104f3750504499f2a6608459
-  data.tar.gz: fab84d0b2eb02221f96209f11c118feb77928d69269b009abb4c9a773089f1a011a96bbb3b731abce9cd8af45208eaabdef464c27244b7fd954554de1203c15b
+  metadata.gz: 2f829f28024c84e1b8b7dba2868fedeffc0f105b237ef3ad946ad64ec9a2c0f789c8f3ae367f42203a3d3c53be08b598df0a4cd3d58aa45479bf4e755091f27c
+  data.tar.gz: afefb4b5952e8187f5dc605202fcc578c13bdd9d7f43d411c0763471c32ddb622aaf6f62c2160b1e835d1f974452d54812ebcabd3a072da0ff31af1a698ab3a8

data/app/models/concerns/spree/translatable_resource_slug.rb

@@ -4,12 +4,10 @@ module Spree
 
     included do
       def localized_slugs_for_store(store)
-        localized_slugs = Hash[translations.pluck(:locale, :slug)]
-        default_locale = store.default_locale
         supported_locales = store.supported_locales_list
 
         supported_locales.each_with_object({}) do |locale, hash|
-          hash[locale] = localized_slugs[locale] || localized_slugs[default_locale]
+          hash[locale] = I18n.with_locale(locale) { slug }
         end
       end
     end

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

@@ -13,6 +13,7 @@ module Spree
     extend FriendlyId
     friendly_id :permalink, slug_column: :permalink, use: :history
     before_validation :set_permalink, on: :create, if: :name
+    alias_attribute :slug, :permalink
 
     acts_as_nested_set dependent: :destroy
 
@@ -61,17 +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
+        self.permalink = generate_slug
+      end
+
+      private
+
+      def generate_slug
         if parent.present?
-          self.permalink = [parent.permalink, (permalink.blank? ? name.to_url : permalink.split('/').last)].join('/')
+          generate_permalink_including_parent
+        elsif permalink.blank?
+          name_with_fallback.to_url
         else
-          self.permalink = name.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/app/services/spree/locales/set_fallback_locale_for_store.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Locales
+    class SetFallbackLocaleForStore
+      def call(store:)
+        store_default_locale = store.default_locale
+        fallbacks = store.supported_locales_list.each_with_object({}) do |locale, object|
+          object[locale] = [store_default_locale]
+        end
+
+        fallbacks_instance = I18n::Locale::Fallbacks.new(fallbacks)
+
+        Mobility.store_based_fallbacks = fallbacks_instance
+      end
+    end
+  end
+end

data/config/initializers/mobility.rb

@@ -8,11 +8,9 @@ Mobility.configure do |config|
     backend_reader
     query
     cache
-    fallbacks
+    store_based_fallbacks
     locale_accessors
     presence
     dirty
   end
-
-  config.defaults[:fallbacks] = true
 end

data/lib/mobility/plugins/store_based_fallbacks.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'concurrent'
+require 'mobility'
+
+# The default implementation in the Mobility gem requires fallbacks to be defined when booting the application.
+# This patch allows to dynamically reconfigure translations fallbacks, by setting Mobility.store_based_fallbacks attribute.
+# The implementation is based on the default fallbacks plugin, with some changes around fetching the list of fallbacks to be used.
+# https://github.com/shioyama/mobility/blob/master/lib/mobility/plugins/fallbacks.rb
+module Mobility
+  @store_based_fallbacks = Concurrent::ThreadLocalVar.new(I18n::Locale::Fallbacks.new)
+
+  class << self
+    def store_based_fallbacks
+      @store_based_fallbacks.value
+    end
+
+    def store_based_fallbacks=(value)
+      @store_based_fallbacks.value = value
+    end
+  end
+
+  module Plugins
+    module StoreBasedFallbacks
+      extend ::Mobility::Plugin
+
+      default true
+      requires :backend, include: :before
+
+      # Applies fallbacks plugin to attributes. Completely disables fallbacks
+      # on model if option is +false+.
+      included_hook do |_, backend_class|
+        unless options[:fallbacks] == false
+          backend_class.include(BackendInstanceMethods)
+        end
+      end
+
+      module BackendInstanceMethods
+        def read(locale, fallback: true, **kwargs)
+          return super(locale, **kwargs) if !fallback || kwargs[:locale]
+
+          locales = Mobility.store_based_fallbacks[locale]
+          locales.each do |fallback_locale|
+            value = super(fallback_locale, **kwargs)
+            return value if Util.present?(value)
+          end
+
+          super(locale, **kwargs)
+        end
+      end
+    end
+
+    register_plugin(:store_based_fallbacks, StoreBasedFallbacks)
+  end
+end

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

@@ -6,6 +6,7 @@ module Spree
 
         included do
           before_action :set_locale
+          before_action :set_fallback_locale
 
           if defined?(helper_method)
             helper_method :supported_locales
@@ -21,6 +22,12 @@ module Spree
           I18n.locale = current_locale
         end
 
+        def set_fallback_locale
+          return unless respond_to?(:current_store) && current_store.present?
+
+          Spree::Locales::SetFallbackLocaleForStore.new.call(store: current_store)
+        end
+
         def current_locale
           @current_locale ||= if user_locale?
                                 try_spree_current_user.selected_locale

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.0'.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

data/lib/spree_core.rb

@@ -1,3 +1,4 @@
 require 'friendly_id/paranoia'
+require 'mobility/plugins/store_based_fallbacks'
 
 require 'spree/core'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.2
 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-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -801,6 +801,7 @@ files:
 - app/services/spree/line_items/destroy.rb
 - app/services/spree/line_items/helper.rb
 - app/services/spree/line_items/update.rb
+- app/services/spree/locales/set_fallback_locale_for_store.rb
 - app/services/spree/orders/approve.rb
 - app/services/spree/orders/cancel.rb
 - app/services/spree/payments/create.rb
@@ -923,6 +924,7 @@ 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/mobility/plugins/store_based_fallbacks.rb
 - lib/spree/core.rb
 - lib/spree/core/components.rb
 - lib/spree/core/configuration.rb
@@ -1077,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.0
+  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.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.6.2
 post_install_message:
 rdoc_options: []
 require_paths: