Move block call to separate method so it can be spied on

ruby-grape · Dec 18, 2019 · 28d34ee · 28d34ee
1 parent c7f0ac2
commit 28d34ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -44,7 +44,7 @@ Metrics/BlockLength:
 # Offense count: 10
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 302
+  Max: 305
 
 # Offense count: 30
 Metrics/CyclomaticComplexity:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,13 +3,14 @@
 #### Features
 
 * Your contribution here.
-* [#1944](https://github.com/ruby-grape/grape/pull/1944): Reduced attribute_translator string allocations - [@ericproulx](https://github.com/ericproulx).
-* [#1943](https://github.com/ruby-grape/grape/pull/1943): Reduce number of regex string allocations - [@ericproulx](https://github.com/ericproulx).
-* [#1942](https://github.com/ruby-grape/grape/pull/1942): Optimized retained memory methods - [@ericproulx](https://github.com/ericproulx).
-* [#1941](https://github.com/ruby-grape/grape/pull/1941): Frozen string literal - [@ericproulx](https://github.com/ericproulx).
-* [#1940](https://github.com/ruby-grape/grape/pull/1940): Get rid of a needless step in HashWithIndifferentAccess - [@dnesteryuk](https://github.com/dnesteryuk).
-* [#1938](https://github.com/ruby-grape/grape/pull/1938): Add project metadata to the gemspec - [@orien](https://github.com/orien).
-* [#1920](https://github.com/ruby-grape/grape/pull/1920): Replace Virtus with dry-types - [@dnesteryuk](https://github.com/dnesteryuk).
+* [#1944](https://github.com/ruby-grape/grape/pull/1944): Reduces `attribute_translator` string allocations - [@ericproulx](https://github.com/ericproulx).
+* [#1943](https://github.com/ruby-grape/grape/pull/1943): Reduces number of regex string allocations - [@ericproulx](https://github.com/ericproulx).
+* [#1942](https://github.com/ruby-grape/grape/pull/1942): Optimizes retained memory methods - [@ericproulx](https://github.com/ericproulx).
+* [#1941](https://github.com/ruby-grape/grape/pull/1941): Adds frozen string literal - [@ericproulx](https://github.com/ericproulx).
+* [#1940](https://github.com/ruby-grape/grape/pull/1940): Gets rid of a needless step in `HashWithIndifferentAccess` - [@dnesteryuk](https://github.com/dnesteryuk).
+* [#1938](https://github.com/ruby-grape/grape/pull/1938): Adds project metadata to the gemspec - [@orien](https://github.com/orien).
+* [#1920](https://github.com/ruby-grape/grape/pull/1920): Replaces Virtus with dry-types - [@dnesteryuk](https://github.com/dnesteryuk).
+* [#1930](https://github.com/ruby-grape/grape/pull/1930): Moves block call to separate method so it can be spied on - [@estolfo](https://github.com/estolfo).
 
 #### Fixes
 

diff --git a/lib/grape/endpoint.rb b/lib/grape/endpoint.rb
@@ -262,7 +262,7 @@ def run
             run_validators validations, request
             remove_renamed_params
             run_filters after_validations, :after_validation
-            response_object = @block ? @block.call(self) : nil
+            response_object = execute
           end
 
           run_filters afters, :after
@@ -335,6 +335,10 @@ def remove_renamed_params
 
     private :build_stack, :build_helpers, :remove_renamed_params
 
+    def execute
+      @block ? @block.call(self) : nil
+    end
+
     def helpers
       lazy_initialize! && @helpers
     end