lib/flexirest/request.rb in flexirest-1.3.20 vs lib/flexirest/request.rb in flexirest-1.3.21

@@ -159,13 +159,13 @@
           Flexirest::Logger.debug "  \033[1;4;32m#{Flexirest.name}\033[0m #{@instrumentation_name} - Faked response found"
           content_type = @method[:options][:fake_content_type] || "application/json"
           return handle_response(OpenStruct.new(status:200, body:fake, response_headers:{"X-ARC-Faked-Response" => "true", "Content-Type" => content_type}))
         end
         if object_is_class?
-          @object.send(:_filter_request, :before, @method[:name], self)
+          @object.send(:_callback_request, :before, @method[:name], self)
         else
-          @object.class.send(:_filter_request, :before, @method[:name], self)
+          @object.class.send(:_callback_request, :before, @method[:name], self)
         end
         append_get_parameters
         prepare_request_body
         self.original_url = self.url
         cached = original_object_class.read_cached_response(self)
@@ -203,13 +203,13 @@
 
           if object_is_class? && @object.record_response?
             @object.record_response(self.url, response_env)
           end
           if object_is_class?
-            @object.send(:_filter_request, :after, @method[:name], response_env)
+            @object.send(:_callback_request, :after, @method[:name], response_env)
           else
-            @object.class.send(:_filter_request, :after, @method[:name], response_env)
+            @object.class.send(:_callback_request, :after, @method[:name], response_env)
           end
 
           result = handle_response(response_env, cached)
           @response_delegate.__setobj__(result)
           original_object_class.write_cached_response(self, response_env, result)
@@ -400,9 +400,11 @@
       end
 
       if (200..399).include?(status)
         if @method[:options][:plain]
           return @response = Flexirest::PlainResponse.from_response(response)
+        elsif status == 204 && @response.body.blank?
+          return true
         elsif is_json_response? || is_xml_response?
           if @response.respond_to?(:proxied) && @response.proxied
             Flexirest::Logger.debug "  \033[1;4;32m#{Flexirest.name}\033[0m #{@instrumentation_name} - Response was proxied, unable to determine size"
           else
             Flexirest::Logger.debug "  \033[1;4;32m#{Flexirest.name}\033[0m #{@instrumentation_name} - Response received #{@response.body.size} bytes"