spree_core 5.4.0.beta10 → 5.4.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 73ed6afd1feda3d20e24a8910273785420d08dfadebf8af34aa90c20b017a0b8
4
- data.tar.gz: 323a92ea512ad2d37bac8be8b8f878f60dbbc4058ed020875c5740ef02a7481b
3
+ metadata.gz: bb701f06817ccd3c82b765594a0c66bbb23e6daec6d4c33600ecbfa34f0581f5
4
+ data.tar.gz: be65bdb6937fefda9bd82cefe65f1115259ff268f7f8ff59dce5b483919f4192
5
5
  SHA512:
6
- metadata.gz: 711d0f622de8f398bd3f0e8696c5e12e476d3671a6330781fd5a34a0ecb15cc32f17fcf9d8e1e3028584108a354465ba7721ca990e723077c89dddb9c428fcbb
7
- data.tar.gz: 3634efec05dc63e7c44a27bcfe0265331224592ee8d88bc1b417446967af051ccd450723344bc287977de3793b95d17ca0fef1235e905aa25e7a787f65325a81
6
+ metadata.gz: dcc8cb038dd29a19596e68875c041f9d3a2247e6fdac6548647ef58b0d41446afbd6524ca4efb2e0e09acc5d15fa7043bec9f5d57cf25b1676c2c9209888ba52
7
+ data.tar.gz: 2ebdb54fc12315d6102df129c38f663ec56c4bc267fdd7d2d2729cb4b39494b7b033cc14b949efc2f370c0a63ad6aafd17c1dc3ebffb8662ff94123a2cc78f8e
@@ -46,7 +46,6 @@ module Spree
46
46
  private
47
47
 
48
48
  def build_pagy(count, page, limit)
49
- require 'pagy'
50
49
  Pagy::Offset.new(count: count, page: page, limit: limit)
51
50
  end
52
51
 
@@ -29,7 +29,13 @@ module Spree
29
29
 
30
30
  Rails.logger.debug { "[Meilisearch] index=#{index_name} query=#{query.inspect} #{search_params.compact.inspect}" }
31
31
 
32
- ms_result = client.index(index_name).search(query.to_s, search_params)
32
+ begin
33
+ ms_result = client.index(index_name).search(query.to_s, search_params)
34
+ rescue ::Meilisearch::ApiError => e
35
+ Rails.logger.warn { "[Meilisearch] Search failed: #{e.message}. Run `rake spree:search:reindex` to initialize the index." }
36
+ Rails.error.report(e, handled: true, context: { index: index_name, query: query })
37
+ return empty_result(scope, page, limit)
38
+ end
33
39
 
34
40
  Rails.logger.debug { "[Meilisearch] #{ms_result['estimatedTotalHits']} hits in #{ms_result['processingTimeMs']}ms" }
35
41
 
@@ -278,7 +284,6 @@ module Spree
278
284
  end
279
285
 
280
286
  def build_pagy(ms_result, page, limit)
281
- require 'pagy'
282
287
  require 'pagy/toolbox/paginators/meilisearch'
283
288
 
284
289
  fake_result = Struct.new(:raw_answer).new({
@@ -290,6 +295,17 @@ module Spree
290
295
  Pagy::MeilisearchPaginator.paginate(fake_result, {})
291
296
  end
292
297
 
298
+ def empty_result(scope, page, limit)
299
+ SearchResult.new(
300
+ products: scope.none,
301
+ filters: [],
302
+ sort_options: available_sort_options.map { |id| { id: id } },
303
+ default_sort: 'manual',
304
+ total_count: 0,
305
+ pagy: Pagy::Offset.new(count: 0, page: page, limit: limit)
306
+ )
307
+ end
308
+
293
309
  def valid_prefixed_id?(value)
294
310
  value.to_s.match?(PREFIXED_ID_PATTERN)
295
311
  end
@@ -50,6 +50,8 @@ en:
50
50
  spree/customer_group:
51
51
  description: Description
52
52
  name: Name
53
+ spree/customer_return:
54
+ stock_location_id: Stock Location
53
55
  spree/gift_card:
54
56
  amount_used: Amount used
55
57
  expires_at: Expires at
@@ -1,5 +1,5 @@
1
1
  module Spree
2
- VERSION = '5.4.0.beta10'.freeze
2
+ VERSION = '5.4.0.rc1'.freeze
3
3
 
4
4
  def self.version
5
5
  VERSION
data/lib/spree/core.rb CHANGED
@@ -7,6 +7,7 @@ require 'active_record/railtie'
7
7
  require 'active_storage/engine'
8
8
  require 'action_text/engine'
9
9
  require 'action_cable/engine'
10
+ require 'pagy'
10
11
 
11
12
  require 'mail'
12
13
  require 'action_mailer/railtie'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.0.beta10
4
+ version: 5.4.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2026-03-19 00:00:00.000000000 Z
13
+ date: 2026-03-20 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: i18n-tasks
@@ -1695,9 +1695,9 @@ licenses:
1695
1695
  - BSD-3-Clause
1696
1696
  metadata:
1697
1697
  bug_tracker_uri: https://github.com/spree/spree/issues
1698
- changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta10
1698
+ changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc1
1699
1699
  documentation_uri: https://docs.spreecommerce.org/
1700
- source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta10
1700
+ source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc1
1701
1701
  post_install_message:
1702
1702
  rdoc_options: []
1703
1703
  require_paths: