spree_api 5.0.3 → 5.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9cbd0c57ebd6dffbc58bcdefbf769a8451acee8d5976ebc0ce9dd3ff7f85ee
-  data.tar.gz: 924a6bcbe8042b81d1ba059378817da825d1c09360716b36dc215f1294c997ee
+  metadata.gz: 135a1dc5140d807b83dd4a366141eede834c6d7e3c03979c881c3a5551f750b8
+  data.tar.gz: fe206c574f166d016107b1d9c1c32000d5b6ff825ee35fd65233adfe9284a87d
 SHA512:
-  metadata.gz: 2f8476d2e0808e21cbac5e549278c592073e775992fe885131e7fa7672b83d4548c9afe5d2cadb870a5b3618e52f8c1f8cc25091abd9a49d909a9d9d84e69df0
-  data.tar.gz: 388801696f457cd843ed27b49a7b5683cb45ba7c5bbd1b312cbd619607e71401a99c177bdc39f0738f1d2b80d7a6a07626704b1283e348557b8ee5f204b38344
+  metadata.gz: 5d77511e3dae8752352fd0124339a8f7737ecb834266bbc136c499c8e55004c93161a0f452a81641db5fb93e684eb3c0820d31a8ede262c2c26a79e4af6fcb1e
+  data.tar.gz: 24c4f966a8c57d89fc29e5c757a5f831bfc89b8f8d32f054f301027fb3f0fec3bd875d6a3f00681f08d0fdddf313370c0a9a7000e64b5e7b83e688e2233fa31e

data/app/controllers/concerns/spree/api/v2/product_list_includes.rb

@@ -3,22 +3,28 @@ module Spree
     module V2
       module ProductListIncludes
         def product_list_includes
-          {
-            product_properties: [],
-            option_types: [],
-            variant_images: [],
-            master: product_variant_includes,
-            variants: product_variant_includes,
-            translations: []
+          @product_list_includes ||= {
+            taggings: [:tag],
+            variants: [],
+            master: [:prices]
           }
+
+          @product_list_includes[:variant_images] = [] if params[:include]&.match('images')
+          @product_list_includes[:option_types] = [] if params[:include]&.match('option_types')
+          @product_list_includes[:product_properties] = [:property] if params[:include]&.match('product_properties')
+          @product_list_includes[:master] = variant_includes if params[:include]&.match(/master|default_variant/)
+          @product_list_includes[:variants] = variant_includes if params[:include]&.match(/variants|default_variant/)
+          @product_list_includes[:taxons] = [:taxonomy, :icon, :store, :rich_text_translations, image_attachment: :blob] if params[:include]&.match('taxons')
+          @product_list_includes
         end
 
-        def product_variant_includes
-          {
+        def variant_includes
+          variant_includes = {
             prices: [],
             option_values: :option_type,
-            images: []
           }
+          variant_includes[:images] = [] if params[:include]&.match(/images/)
+          variant_includes
         end
       end
     end

data/app/controllers/spree/api/v2/base_controller.rb

@@ -96,7 +96,12 @@ module Spree
 
         # Needs to be overridden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(spree_current_user)
+          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(spree_current_user, ability_options)
+        end
+
+        # this method can be extended in extensions or developer applications
+        def ability_options
+          { store: current_store }
         end
 
         def request_includes

data/app/models/spree/webhooks/subscriber.rb

@@ -28,7 +28,7 @@ module Spree
       def latest_event_at
         events.order(:created_at).last&.created_at
       end
-      
+
       def self.with_urls_for(event)
         where(
           case ActiveRecord::Base.connection.adapter_name
@@ -43,11 +43,15 @@ module Spree
       end
 
       def self.supported_events
-        Spree::Base.descendants.
-          select { |model| model.included_modules.include? Spree::Webhooks::HasWebhooks }.
-          to_h do |model|
-          model_name = model.name.demodulize.underscore.to_sym
-          [model_name, model.supported_webhook_events]
+        @supported_events ||= begin
+          Rails.application.eager_load! if Rails.env.development?
+          Spree::Base.descendants.
+            select { |model| model.included_modules.include? Spree::Webhooks::HasWebhooks }.
+            sort_by { |model| model.name.demodulize.underscore }.
+            to_h do |model|
+              model_name = model.name.demodulize.underscore.to_sym
+              [model_name, model.supported_webhook_events]
+            end
         end
       end
 

data/config/initializers/doorkeeper.rb

@@ -25,7 +25,7 @@ Doorkeeper.configure do
   end
 
   admin_authenticator do |routes|
-    current_spree_user&.spree_admin? || redirect_to(routes.root_url)
+    current_spree_user&.spree_admin?(Spree::Store.current) || redirect_to(routes.root_url)
   end
 
   grant_flows %w[password client_credentials]

data/lib/spree/api/testing_support/factories/webhook_subscriber_factory.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :webhook_subscriber, aliases: [:subscriber], class: Spree::Webhooks::Subscriber do
+  factory :webhook_subscriber, aliases: [:subscriber, :webhooks_subscriber], class: Spree::Webhooks::Subscriber do
     sequence(:url) { |n| "https://www.url#{n}.com/" }
 
     trait :active do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0.beta
 platform: ruby
 authors:
 - Ryan Bigg
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.1.0.beta
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -364,9 +364,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
 post_install_message:
 rdoc_options: []
 require_paths: