Merge pull request ruby-grape#831 from dblock/remove-logging-value

Remove logging value, improve nested loading performance.

lib/grape.rb

@@ -100,7 +100,6 @@ module Versioner
   end
 
   module Util
-    autoload :LoggingValue,      'grape/util/logging_value'
     autoload :InheritableValues, 'grape/util/inheritable_values'
     autoload :StackableValues,   'grape/util/stackable_values'
     autoload :InheritableSetting, 'grape/util/inheritable_setting'

lib/grape/util/inheritable_values.rb

@@ -6,7 +6,7 @@ class InheritableValues
 
       def initialize(inherited_values = {})
         self.inherited_values = inherited_values
-        self.new_values = LoggingValue.new
+        self.new_values = {}
       end
 
       def [](name)
@@ -44,17 +44,7 @@ def initialize_copy(other)
       protected
 
       def values
-        result = LoggingValue.new
-
-        @inherited_values.keys.each_with_object(result) do |key, res|
-          begin
-            res[key] = @inherited_values[key].clone
-          rescue
-            res[key] = @inherited_values[key]
-          end
-        end
-
-        result.merge(@new_values)
+        @inherited_values.merge(@new_values)
       end
     end
   end

lib/grape/util/stackable_values.rb

@@ -8,7 +8,7 @@ class StackableValues
 
       def initialize(inherited_values = {})
         @inherited_values = inherited_values
-        @new_values = LoggingValue.new
+        @new_values = {}
         @froozen_values = {}
       end
 
@@ -35,7 +35,7 @@ def keys
 
       def to_hash
         keys.each_with_object({}) do |key, result|
-          result[key] = self[key].dup
+          result[key] = self[key]
         end
       end
 

spec/grape/loading_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Grape::API do
+  let(:jobs_api) {
+    Class.new(Grape::API) do
+      namespace :one do
+        namespace :two do
+          namespace :three do
+            get :one do
+            end
+            get :two do
+            end
+          end
+        end
+      end
+    end
+  }
+
+  let(:combined_api) {
+    JobsApi = jobs_api
+    Class.new(Grape::API) do
+      version :v1, using: :accept_version_header, cascade: true
+      mount JobsApi
+    end
+  }
+
+  subject {
+    CombinedApi = combined_api
+    Class.new(Grape::API) do
+      format :json
+      mount CombinedApi => '/'
+    end
+  }
+
+  def app
+    subject
+  end
+
+  it 'execute first request in reasonable time' do
+    started = Time.now
+    get '/mount1/nested/test_method'
+    expect(Time.now - started).to be < 5
+  end
+end