Compile endpoints on first call or when API compile!

Author: ericproulx

CHANGELOG.md

@@ -12,6 +12,8 @@
 * [#2643](https://github.com/ruby-grape/grape/pull/2638): Remove `try` method in codebase - [@ericproulx](https://github.com/ericproulx).
 * [#2646](https://github.com/ruby-grape/grape/pull/2646): Call `valid_encoding?` before scrub - [@ericproulx](https://github.com/ericproulx).
 * [#2644](https://github.com/ruby-grape/grape/pull/2644): Clean useless/not valuable dependencies - [@ericproulx](https://github.com/ericproulx).
+* [#2645](https://github.com/ruby-grape/grape/pull/2645): Endpoints are compiled when API is compiled - [@ericproulx](https://github.com/ericproulx).
+
 * Your contribution here.
 
 #### Fixes

lib/grape/api/instance.rb

@@ -104,6 +104,7 @@ def initialize
         add_head_not_allowed_methods_and_options_methods
         self.class.endpoints.each do |endpoint|
           endpoint.mount_in(@router)
+          endpoint.compile!
         end
 
         @router.compile!

lib/grape/endpoint.rb

@@ -71,16 +71,14 @@ def initialize(new_settings, **options, &block)
 
       @options[:path] = Array(options[:path])
       @options[:path] << '/' if options[:path].empty?
-
       @options[:method] = Array(options[:method])
 
-      @lazy_initialize_lock = Mutex.new
-      @lazy_initialized = nil
       @status = nil
       @stream = nil
       @body = nil
       @source = self.class.block_to_unbound_method(block)
       @before_filter_passed = false
+      @compiled = false
     end
 
     # Update our settings from a given set of stackable parameters. Used when
@@ -124,7 +122,7 @@ def namespace
     end
 
     def call(env)
-      lazy_initialize!
+      compile!
       dup.call!(env)
     end
 
@@ -155,6 +153,14 @@ def inspect
       "#{self.class} in '#{route.origin}' endpoint"
     end
 
+    def compile!
+      return if @compiled
+
+      @app = options[:app] || build_stack
+      @helpers = build_helpers
+      @compiled = true
+    end
+
     protected
 
     def run
@@ -203,18 +209,6 @@ def execute
       end
     end
 
-    def lazy_initialize!
-      return true if @lazy_initialized
-
-      @lazy_initialize_lock.synchronize do
-        return true if @lazy_initialized
-
-        @app = options[:app] || build_stack
-        @helpers = build_helpers
-        @lazy_initialized = true
-      end
-    end
-
     def run_validators(validators, request)
       validation_errors = []
 

lib/grape/router.rb

@@ -2,8 +2,6 @@
 
 module Grape
   class Router
-    attr_reader :map, :compiled
-
     # Taken from Rails
     #     normalize_path("/foo")  # => "/foo"
     #     normalize_path("/foo/") # => "/foo"
@@ -39,22 +37,22 @@ def initialize
     end
 
     def compile!
-      return if compiled
+      return if @compiled
 
       @union = Regexp.union(@neutral_regexes)
       @neutral_regexes = nil
       (Grape::HTTP_SUPPORTED_METHODS + ['*']).each do |method|
-        next unless map.key?(method)
+        next unless @map.key?(method)
 
-        routes = map[method]
+        routes = @map[method]
         optimized_map = routes.map.with_index { |route, index| route.to_regexp(index) }
         @optimized_map[method] = Regexp.union(optimized_map)
       end
       @compiled = true
     end
 
     def append(route)
-      map[route.request_method] << route
+      @map[route.request_method] << route
     end
 
     def associate_routes(greedy_route)
@@ -91,7 +89,7 @@ def identity(input, method, env)
 
     def rotation(input, method, env, exact_route)
       response = nil
-      map[method].each do |route|
+      @map[method].each do |route|
         next if exact_route == route
         next unless route.match?(input)
 
@@ -143,7 +141,7 @@ def process_route(route, input, env, include_allow_header: false)
     end
 
     def with_optimization
-      compile! unless compiled
+      compile!
       yield || default_response
     end
 

spec/grape/api/defines_boolean_in_params_spec.rb

@@ -22,13 +22,5 @@
       expect(last_response.status).to eq(201)
       expect(last_response.body).to eq expected_body
     end
-
-    context 'Params endpoint type' do
-      subject { app.new.router.map[Rack::POST].first.options[:params]['message'][:type] }
-
-      it 'params type is a boolean' do
-        expect(subject).to eq 'Grape::API::Boolean'
-      end
-    end
   end
 end