solidus_api 4.3.5 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f429e34d41a7311e140db04b7ea766989bef6ec5671a4e81cd2b780480426243
-  data.tar.gz: e28e7b8b6953878a147d86ea67abacbca26dc3afc396ba9284761665967a5212
+  metadata.gz: 465e94668f9d4569b0d86d62018781833b2b3aaa5cd9054b7cb08fbc3e427527
+  data.tar.gz: 8941c7f042864c2bdc06fb71c8fa029dec79928620a21f359b2d197b5b0bfdbb
 SHA512:
-  metadata.gz: ba7b566efd83c5d2e5dd6669f7bf59a682688d15d0b0e9c1ddc0cd895481adea23902fc4b3824f43aa6d7fc9387360ba2127369c8896909eb9e5687e6128344c
-  data.tar.gz: 195c1e2d0ff19e7c3693444e96788b6abe61a9933118ceeed96f6fb9c1ce4c2d934d0a81cf8e45dd5ccd644e050d49fa456c429056cf1a376275f31ede5ca40c
+  metadata.gz: 20203cff2aca2b4560995700e128e9a3fcb5f366fe82e4248bacc23d0513285b6378c7c50fde4bf837a2934ba7cc4633ee992200efb1db3f3300b32a394df8c8
+  data.tar.gz: c372bf3b4539959ed54452df5e79d97d76dc57510584b20206a5909de2d86cbeac940344cbeb2afcb40546ee96b0700ac2688748c22d3490d7eb0d9ff2d3d933

data/app/controllers/spree/api/coupon_codes_controller.rb

@@ -10,7 +10,7 @@ module Spree
         authorize! :update, @order, order_token
 
         @order.coupon_code = params[:coupon_code]
-        @handler = Spree::Config.coupon_code_handler_class.new(@order).apply
+        @handler = Spree::Config.promotions.coupon_code_handler_class.new(@order).apply
 
         if @handler.successful?
           render 'spree/api/promotions/handler', status: 200
@@ -24,7 +24,7 @@ module Spree
         authorize! :update, @order, order_token
 
         @order.coupon_code = params[:id]
-        @handler = Spree::Config.coupon_code_handler_class.new(@order).remove
+        @handler = Spree::Config.promotions.coupon_code_handler_class.new(@order).remove
 
         if @handler.successful?
           render 'spree/api/promotions/handler', status: 200

data/app/controllers/spree/api/orders_controller.rb

@@ -46,8 +46,13 @@ module Spree
 
       def empty
         authorize! :update, @order, order_token
-        @order.empty!
-        respond_with(@order, default_template: :show)
+
+        if @order.complete?
+          invalid_resource!(@order)
+        else
+          @order.empty!
+          respond_with(@order, default_template: :show)
+        end
       end
 
       def index

data/app/controllers/spree/api/promotions_controller.rb

@@ -13,7 +13,7 @@ module Spree
       private
 
       def load_promotion
-        @promotion = Spree::Promotion.with_coupon_code(params[:id]) || Spree::Promotion.find(params[:id])
+        @promotion = Spree::Config.promotions.promotion_finder_class.by_code_or_id(params[:id])
       end
     end
   end

data/app/controllers/spree/api/variants_controller.rb

@@ -28,7 +28,7 @@ module Spree
         @variants =
           if params[:variant_search_term]
             Spree::Config.variant_search_class.new(
-              params[:variant_search_term], scope: scope
+              params[:variant_search_term], scope:
             ).results.includes(include_list)
           else
             scope.includes(include_list).ransack(params[:q]).result

data/app/views/spree/api/credit_cards/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.credit_cards(@credit_cards) do |credit_card|
-  json.partial!("spree/api/credit_cards/credit_card", credit_card: credit_card)
+  json.partial!("spree/api/credit_cards/credit_card", credit_card:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @credit_cards

data/app/views/spree/api/images/index.json.jbuilder

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 json.images(@images) do |image|
-  json.partial!("spree/api/images/image", image: image)
+  json.partial!("spree/api/images/image", image:)
 end

data/app/views/spree/api/line_items/_line_item.json.jbuilder

@@ -9,10 +9,10 @@ json.cache! [I18n.locale, line_item] do
     json.partial!("spree/api/variants/small", variant: line_item.variant)
     json.(line_item.variant, :product_id)
     json.images(line_item.variant.gallery.images) do |image|
-      json.partial!("spree/api/images/image", image: image)
+      json.partial!("spree/api/images/image", image:)
     end
   end
   json.adjustments(line_item.adjustments) do |adjustment|
-    json.partial!("spree/api/adjustments/adjustment", adjustment: adjustment)
+    json.partial!("spree/api/adjustments/adjustment", adjustment:)
   end
 end

data/app/views/spree/api/option_types/index.json.jbuilder

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 json.array! @option_types do |option_type|
-  json.partial!("spree/api/option_types/option_type", option_type: option_type)
+  json.partial!("spree/api/option_types/option_type", option_type:)
 end

data/app/views/spree/api/option_values/index.json.jbuilder

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 json.array! @option_values do |option_value|
-  json.partial!("spree/api/option_values/option_value", option_value: option_value)
+  json.partial!("spree/api/option_values/option_value", option_value:)
 end

data/app/views/spree/api/orders/_big.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-json.partial!("spree/api/orders/order", order: order)
+json.partial!("spree/api/orders/order", order:)
 json.payment_methods(order.available_payment_methods) do |payment_method|
   json.(payment_method, :id, :name, :partial_name)
   json.method_type payment_method.partial_name
@@ -20,7 +20,7 @@ json.ship_address do
   end
 end
 json.line_items(order.line_items) do |line_item|
-  json.partial!("spree/api/line_items/line_item", line_item: line_item)
+  json.partial!("spree/api/line_items/line_item", line_item:)
 end
 json.payments(order.payments) do |payment|
   json.(payment, *payment_attributes)
@@ -36,7 +36,7 @@ json.payments(order.payments) do |payment|
     if payment_source
       json.partial!(
         "spree/api/payments/source_views/#{payment.payment_method.partial_name}",
-        payment_source: payment_source
+        payment_source:
       )
     else
       json.nil!
@@ -44,14 +44,14 @@ json.payments(order.payments) do |payment|
   end
 end
 json.shipments(order.shipments) do |shipment|
-  json.partial!("spree/api/shipments/small", shipment: shipment)
+  json.partial!("spree/api/shipments/small", shipment:)
 end
 json.adjustments(order.adjustments) do |adjustment|
-  json.partial!("spree/api/adjustments/adjustment", adjustment: adjustment)
+  json.partial!("spree/api/adjustments/adjustment", adjustment:)
 end
 json.permissions do
   json.can_update current_ability.can?(:update, order)
 end
 json.credit_cards(order.valid_credit_cards) do |credit_card|
-  json.partial!("spree/api/credit_cards/credit_card", credit_card: credit_card)
+  json.partial!("spree/api/credit_cards/credit_card", credit_card:)
 end

data/app/views/spree/api/orders/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.orders(@orders) do |order|
-  json.partial!("spree/api/orders/order", order: order)
+  json.partial!("spree/api/orders/order", order:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @orders

data/app/views/spree/api/orders/mine.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.orders(@orders) do |order|
-  json.partial!("spree/api/orders/big", order: order)
+  json.partial!("spree/api/orders/big", order:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @orders

data/app/views/spree/api/products/_product.json.jbuilder

@@ -14,7 +14,7 @@ json.cache! [I18n.locale, @current_user_roles.include?('admin'), current_pricing
       json.partial!("spree/api/variants/small", variant: product.master)
     end
     json.variants(product.variants) do |variant|
-      json.partial!("spree/api/variants/small", variant: variant)
+      json.partial!("spree/api/variants/small", variant:)
     end
   end
   unless @exclude_data[:option_types]

data/app/views/spree/api/products/index.json.jbuilder

@@ -2,5 +2,5 @@
 
 json.partial! 'spree/api/shared/pagination', pagination: @products
 json.products(@products) do |product|
-  json.partial!("spree/api/products/product", product: product)
+  json.partial!("spree/api/products/product", product:)
 end

data/app/views/spree/api/shipments/_big.json.jbuilder

@@ -2,14 +2,14 @@
 
 json.cache! [I18n.locale, shipment] do
   json.(shipment, *shipment_attributes)
-  json.partial!("spree/api/shipments/small", shipment: shipment)
+  json.partial!("spree/api/shipments/small", shipment:)
   json.inventory_units(shipment.inventory_units) do |inventory_unit|
     json.(inventory_unit, *inventory_unit_attributes)
     json.variant do
       json.partial!("spree/api/variants/small", variant: inventory_unit.variant)
       json.(inventory_unit.variant, :product_id)
       json.images(inventory_unit.variant.gallery.images) do |image|
-        json.partial!("spree/api/images/image", image: image)
+        json.partial!("spree/api/images/image", image:)
       end
     end
     json.line_item do

data/app/views/spree/api/shipments/_small.json.jbuilder

@@ -5,7 +5,7 @@ json.cache! [I18n.locale, shipment] do
   json.order_id(shipment.order.number)
   json.stock_location_name(shipment.stock_location.name)
   json.shipping_rates(shipment.shipping_rates) do |shipping_rate|
-    json.partial!("spree/api/shipping_rates/shipping_rate", shipping_rate: shipping_rate)
+    json.partial!("spree/api/shipping_rates/shipping_rate", shipping_rate:)
   end
   json.selected_shipping_rate do
     if shipment.selected_shipping_rate
@@ -29,6 +29,6 @@ json.cache! [I18n.locale, shipment] do
     json.states(manifest_item.states)
   end
   json.adjustments(shipment.adjustments) do |adjustment|
-    json.partial!("spree/api/adjustments/adjustment", adjustment: adjustment)
+    json.partial!("spree/api/adjustments/adjustment", adjustment:)
   end
 end

data/app/views/spree/api/shipments/mine.json.jbuilder

@@ -2,5 +2,5 @@
 
 json.partial! 'spree/api/shared/pagination', pagination: @shipments
 json.shipments(@shipments) do |shipment|
-  json.partial!("spree/api/shipments/big", shipment: shipment)
+  json.partial!("spree/api/shipments/big", shipment:)
 end

data/app/views/spree/api/shipments/show.json.jbuilder

@@ -5,7 +5,7 @@ json.cache! [I18n.locale, @shipment] do
   json.order_id(@shipment.order.number)
   json.stock_location_name(@shipment.stock_location.name)
   json.shipping_rates(@shipment.shipping_rates) do |shipping_rate|
-    json.partial!("spree/api/shipping_rates/shipping_rate", shipping_rate: shipping_rate)
+    json.partial!("spree/api/shipping_rates/shipping_rate", shipping_rate:)
   end
   json.selected_shipping_rate do
     if @shipment.selected_shipping_rate

data/app/views/spree/api/stock_items/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.stock_items(@stock_items) do |stock_item|
-  json.partial!("spree/api/stock_items/stock_item", stock_item: stock_item)
+  json.partial!("spree/api/stock_items/stock_item", stock_item:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @stock_items

data/app/views/spree/api/stock_locations/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.stock_locations(@stock_locations) do |stock_location|
-  json.partial!("spree/api/stock_locations/stock_location", stock_location: stock_location)
+  json.partial!("spree/api/stock_locations/stock_location", stock_location:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @stock_locations

data/app/views/spree/api/stock_movements/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.stock_movements(@stock_movements) do |stock_movement|
-  json.partial!("spree/api/stock_movements/stock_movement", stock_movement: stock_movement)
+  json.partial!("spree/api/stock_movements/stock_movement", stock_movement:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @stock_movements

data/app/views/spree/api/taxonomies/_nested.json.jbuilder

@@ -5,6 +5,6 @@ json.root do
   json.(taxonomy.root, *taxon_attributes)
   json.taxons(taxonomy.root.children) do |taxon|
     json.(taxon, *taxon_attributes)
-    json.partial!("spree/api/taxons/taxons", taxon: taxon)
+    json.partial!("spree/api/taxons/taxons", taxon:)
   end
 end

data/app/views/spree/api/taxonomies/_taxonomy.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 if params[:set] == "nested"
-  json.partial!("spree/api/taxonomies/nested", taxonomy: taxonomy)
+  json.partial!("spree/api/taxonomies/nested", taxonomy:)
 else
   json.(taxonomy, *taxonomy_attributes)
   json.root do

data/app/views/spree/api/taxonomies/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.taxonomies(@taxonomies) do |taxonomy|
-  json.partial!("spree/api/taxonomies/taxonomy", taxonomy: taxonomy)
+  json.partial!("spree/api/taxonomies/taxonomy", taxonomy:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @taxonomies

data/app/views/spree/api/taxons/_taxons.json.jbuilder

@@ -2,5 +2,5 @@
 
 json.taxons(taxon.children) do |taxon|
   json.(taxon, *taxon_attributes)
-  json.partial!("spree/api/taxons/taxons", taxon: taxon)
+  json.partial!("spree/api/taxons/taxons", taxon:)
 end

data/app/views/spree/api/taxons/index.json.jbuilder

@@ -4,6 +4,6 @@ json.partial! 'spree/api/shared/pagination', pagination: @taxons
 json.taxons(@taxons) do |taxon|
   json.(taxon, *taxon_attributes)
   unless params[:without_children]
-    json.partial!("spree/api/taxons/taxons", taxon: taxon)
+    json.partial!("spree/api/taxons/taxons", taxon:)
   end
 end

data/app/views/spree/api/users/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.users(@users) do |user|
-  json.partial!("spree/api/users/user", user: user)
+  json.partial!("spree/api/users/user", user:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @users

data/app/views/spree/api/variants/_big.json.jbuilder

@@ -2,7 +2,7 @@
 
 json.cache! [I18n.locale, Spree::StockLocation.accessible_by(current_ability), variant] do
   json.(variant, *variant_attributes)
-  json.partial!("spree/api/variants/small", variant: variant)
+  json.partial!("spree/api/variants/small", variant:)
   json.variant_properties(variant.variant_properties) do |variant_property|
     json.(variant_property, *variant_property_attributes)
   end

data/app/views/spree/api/variants/_small.json.jbuilder

@@ -16,6 +16,6 @@ json.cache! [I18n.locale, current_pricing_options, variant] do
     json.(option_value, *option_value_attributes)
   end
   json.images(variant.gallery.images) do |image|
-    json.partial!("spree/api/images/image", image: image)
+    json.partial!("spree/api/images/image", image:)
   end
 end

data/app/views/spree/api/variants/index.json.jbuilder

@@ -2,5 +2,5 @@
 
 json.partial! 'spree/api/shared/pagination', pagination: @variants
 json.variants(@variants) do |variant|
-  json.partial!("spree/api/variants/big", variant: variant)
+  json.partial!("spree/api/variants/big", variant:)
 end

data/app/views/spree/api/zones/index.json.jbuilder

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 json.zones(@zones) do |zone|
-  json.partial!("spree/api/zones/zone", zone: zone)
+  json.partial!("spree/api/zones/zone", zone:)
 end
 json.partial! 'spree/api/shared/pagination', pagination: @zones

data/lib/spree/api_configuration.rb

@@ -72,8 +72,8 @@ module Spree
 
     preference :adjustment_attributes, :array, default: [
       :id, :source_type, :source_id, :adjustable_type, :adjustable_id,
-      :amount, :label, :promotion_code_id,
-      :finalized, :eligible, :created_at, :updated_at
+      :amount, :label,
+      :finalized, :created_at, :updated_at
     ]
 
     preference :inventory_unit_attributes, :array, default: [
@@ -112,10 +112,17 @@ module Spree
       :variant_id
     ]
 
-    preference :promotion_attributes, :array, default: [
-      :id, :name, :description, :expires_at, :starts_at, :type, :usage_limit,
-      :advertise, :path
-    ]
+    def promotion_attributes
+      Spree::Config.promotions.promotion_api_attributes
+    end
+    alias_method :preferred_promotion_attributes, :promotion_attributes
+
+    def promotion_attributes=(value)
+      Spree::Config.promotions.promotion_api_attributes = value
+    end
+    alias_method :preferred_promotion_attributes=, :promotion_attributes=
+    promotion_attributes_deprecation_message = "Spree::ApiConfiguration#promotion_attributes= is deprecated. Please use Spree::Config.promotions.promotion_api_attributes= instead."
+    deprecate "promotion_attributes=" => promotion_attributes_deprecation_message, deprecator: Spree.deprecator
 
     preference :store_attributes, :array, default: [
       :id, :name, :url, :meta_description, :meta_keywords, :seo_title,

data/openapi/solidus-api.oas.yml

@@ -6118,16 +6118,12 @@ components:
           type: string
         display_amount:
           type: string
-        eligible:
-          type: boolean
         finalized:
           type: boolean
         id:
           type: integer
         label:
           type: string
-        promotion_code_id:
-          type: integer
         source_id:
           type: integer
         source_type:

data/solidus_api.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.metadata['rubygems_mfa_required'] = 'true'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(spec|script)/})
+    f.match(%r{^(spec|bin)/})
   end
 
-  s.required_ruby_version = '>= 3.0.0'
+  s.required_ruby_version = '>= 3.1.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'jbuilder', '~> 2.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.4.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.4.1
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -224,7 +224,6 @@ files:
 - app/views/spree/api/zones/_zone.json.jbuilder
 - app/views/spree/api/zones/index.json.jbuilder
 - app/views/spree/api/zones/show.json.jbuilder
-- bin/rails
 - config/i18n-tasks.yml
 - config/locales/en.yml
 - config/routes.rb
@@ -266,14 +265,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.

data/bin/rails

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/spree/api/engine', __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-
-require "rails/all"
-require "rails/engine/commands"