solidus_api 2.11.0 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0073a2dd8fda3f900d1eacc4221b4ef2e0b418adb5a08818dfadd32aa8c55020
-  data.tar.gz: 1f453e33e88e7f80a4c0b618cb4336a54cf8dff3044d9b526e6bb6d312f46e07
+  metadata.gz: b700b541040c01e87ec18bc5d65f51be73904fc72eed6cb11702f3d59e29857f
+  data.tar.gz: 1e218892060c961813eff6df57d8183f51704fdfd98670c6adef7805e546a42d
 SHA512:
-  metadata.gz: 4783fe7f6037f082e38fd384732c895e7c591781d0770a45f107248b7380a40a6675cd1935455aaeef230ed7c0c4eb61e55f506eaaabbdb3a846de1a71989b0a
-  data.tar.gz: e722663fa5ac036dc85edd355d8faa09a73b36c4dd3a3e17fa145a7f31f815349d71315355def89cfd724d5610497ce0bef6824d73cf1d554abe8f1b36e1659e
+  metadata.gz: 34dfc56c007035a10026061a90ddc88eb561829291bc4f1c195a40a65e494d70723b3c98d674ccdbca71faceaf9d88f376a45413814f7d8351b929834e4da883
+  data.tar.gz: 316013b0da91d2393f9528bbcb77125eda9de788238f7efc6f94f072adcf7aa721711d983fb86f7b2d35931cb510d895e790a523e67fe7ea659a03cb20f78c04

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

@@ -76,9 +76,11 @@ module Spree
       end
 
       def parameter_missing_error(exception)
+        # use original_message to remove DidYouMean suggestions, if defined
+        message = exception.try(:original_message) || exception.message
         render json: {
-          exception: exception.message,
-          error: exception.message,
+          exception: message,
+          error: message,
           missing_param: exception.param
         }, status: :unprocessable_entity
       end

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

@@ -20,7 +20,7 @@ module Spree
       end
 
       def update
-        @image = scope.images.accessible_by(current_ability, :update).find(params[:id])
+        @image = scope.gallery.images.accessible_by(current_ability, :update).find(params[:id])
         @image.update(image_params)
         respond_with(@image, default_template: :show)
       end

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

@@ -53,7 +53,13 @@ class Spree::Api::ResourceController < Spree::Api::BaseController
   def destroy
     authorize! :destroy, @object
 
-    if @object.destroy
+    destroy_result = if @object.respond_to?(:discard)
+      @object.discard
+    else
+      @object.destroy
+    end
+
+    if destroy_result
       respond_with(@object, status: 204)
     else
       invalid_resource!(@object)

data/lib/spree/api/testing_support/helpers.rb

@@ -30,11 +30,20 @@ module Spree
         # This method can be overriden (with a let block) inside a context
         # For instance, if you wanted to have an admin user instead.
         def current_api_user
-          @current_api_user ||= stub_model(Spree::LegacyUser, email: "spree@example.com", spree_roles: [])
+          @current_api_user ||= stub_model(Spree::LegacyUser, email: "solidus@example.com", spree_roles: [])
         end
 
         def image(filename)
-          File.open(Spree::Api::Engine.root + "spec/fixtures" + filename)
+          File.open(
+            File.join(
+              Spree::Core::Engine.root,
+              "lib",
+              "spree",
+              "testing_support",
+              "fixtures",
+              filename
+            )
+          )
         end
 
         def upload_image(filename)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.11.5
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.