api-blocks 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 350e8ea9a460e3a5d7306c60bf497aa5a03b173414c038c0595cd4ffd0bad210
-  data.tar.gz: 422dfc7fd2cecbf43961a501788aaa4e297a0de4929879aeb6c4ab841c4a8cc3
+  metadata.gz: 4a8c93e0ece56eb8dac64f1584d4b352e6943f8abe3609e57c3a8dab48041dad
+  data.tar.gz: 7787836a06bbd32a4c5b32aa431c7f41e26b40f27064e7255930e40620023bf5
 SHA512:
-  metadata.gz: 157d73d50b4d51ef1a6849abd390c8d102c9065c0a9824732d7dbd2c7d591f6a94419f6c7ef65d890e27d8f1544aa012eab7995ab87fa610020a192517957661
-  data.tar.gz: 344687ec6e19b861234215d2d911bbf8c464771d9b86dbf0b05ab73da154063bbdf6b9e666cd2a1cd22cbf56cf67e008cf1afa47bcbbb1b12e6ff2af6efbb905
+  metadata.gz: ea3b30b3e1b852574678df868c61dd01ab03cd81145930891ff2267fe209ea189f4653fd331bf29e88faec341d311213b53d960bd254cd88f4aae3a3f99e4aaa
+  data.tar.gz: f22b8967bb0aec216e68c9a474164f82c7aa7a5a3472b413e9db4d5ba6025ac22e0059f8276840495ebc4ee6c22457a9ecf86996906e201e89e824963f83c2ec

data/lib/api_blocks/doorkeeper/invitations/controller.rb

@@ -96,7 +96,7 @@ module ApiBlocks::Doorkeeper::Invitations::Controller
 
     # Returns the user model class.
     def user_model
-      raise 'the method `user_model` must be implemented on your password controller' # rubocop:disable Metrics/LineLength
+      raise 'the method `user_model` must be implemented on your invitations controller' # rubocop:disable Metrics/LineLength
     end
   end
 end

data/lib/api_blocks/responder.rb

@@ -3,6 +3,7 @@
 require 'action_controller/responder'
 require 'responders'
 require 'dry/monads/result'
+require 'dry/validation/result'
 
 # ApiBlocks::Responder provides a responder with better error handling and
 # `ApiBlocks::Interactor` through `Dry::Monads::Result` support.
@@ -14,15 +15,17 @@ class ApiBlocks::Responder < ActionController::Responder
   # code.
   #
   def resource_errors
-    case @resource
-    when ApplicationRecord
-      [{ errors: @resource.errors }, :unprocessable_entity]
+    case resource
+    when Dry::Validation::Result
+      [{ errors: resource.errors.to_h }, :unprocessable_entity]
     when ActiveRecord::RecordInvalid
-      [{ errors: @resource.record.errors }, :unprocessable_entity]
-    else
+      [{ errors: resource.record.errors }, :unprocessable_entity]
+    when StandardError
       # propagate the error so it can be handled through the standard rails
       # error handlers.
-      raise @resource
+      raise resource
+    else
+      super
     end
   end
 
@@ -45,13 +48,8 @@ class ApiBlocks::Responder < ActionController::Responder
   # assign the failure instead.
   #
   def to_format
-    return super unless resource.is_a?(Dry::Monads::Result)
-
-    # unwrap the result monad so it can be processed by
-    # ActionController::Responder
-    resource.fmap { |result| @resource = result }.or do |failure|
-      @resource = failure
-      @failure = true
+    if resource.is_a?(Dry::Monads::Result)
+      unwrap_dry_result
     end
 
     super
@@ -63,6 +61,10 @@ class ApiBlocks::Responder < ActionController::Responder
     super
   end
 
+  def json_resource_errors
+    [{ errors: resource.errors }, :unprocessable_entity]
+  end
+
   # Override ActionController::Responder#api_behavior in order to
   # provide one that matches our API documentation.
   #
@@ -80,4 +82,15 @@ class ApiBlocks::Responder < ActionController::Responder
       head :no_content
     end
   end
+
+  private
+
+  def unwrap_dry_result
+    # unwrap the result monad so it can be processed by
+    # ActionController::Responder
+    resource.fmap { |result| @resource = result }.or do |failure|
+      @resource = failure
+      @failure = true
+    end
+  end
 end

data/lib/api_blocks/version.rb

@@ -2,5 +2,5 @@
 
 module ApiBlocks
   # Current version of ApiBlocks
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-blocks
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Paul d'Hubert