Merge pull request #1277 from totothink/master

rename @config_context to @config_class

Author: dblock

lib/grape/dsl/settings.rb

@@ -71,7 +71,7 @@ def namespace_setting(key, value = nil)
 
       # (see #unset_global_setting)
       def unset_namespace_setting(key)
-        unset :namespace_setting, key
+        unset :namespace, key
       end
 
       # (see #global_setting)
@@ -106,7 +106,7 @@ def api_class_setting(key, value = nil)
 
       # (see #unset_global_setting)
       def unset_api_class_setting(key)
-        unset :api_class_setting, key
+        unset :api_class, key
       end
 
       # Fork our inheritable settings to a new instance, copied from our

lib/grape/util/strict_hash_configuration.rb

@@ -98,7 +98,7 @@ def config_context
           new_config_class = config_class(*args)
 
           class_mod.send(:define_method, :config_class) do
-            @config_context ||= new_config_class
+            @config_class ||= new_config_class
           end
         end
       end

spec/grape/dsl/settings_spec.rb

@@ -42,6 +42,13 @@ def reset_validations!; end
         end
       end
 
+      describe '#unset_global_setting' do
+        it 'delegates to unset' do
+          expect(subject).to receive(:unset).with(:global, :dummy)
+          subject.unset_global_setting(:dummy)
+        end
+      end
+
       describe '#route_setting' do
         it 'delegates to get_or_set' do
           expect(subject).to receive(:get_or_set).with(:route, :dummy, 1)
@@ -58,6 +65,13 @@ def reset_validations!; end
         end
       end
 
+      describe '#unset_route_setting' do
+        it 'delegates to unset' do
+          expect(subject).to receive(:unset).with(:route, :dummy)
+          subject.unset_route_setting(:dummy)
+        end
+      end
+
       describe '#namespace_setting' do
         it 'delegates to get_or_set' do
           expect(subject).to receive(:get_or_set).with(:namespace, :dummy, 1)
@@ -94,6 +108,13 @@ def reset_validations!; end
         end
       end
 
+      describe '#unset_namespace_setting' do
+        it 'delegates to unset' do
+          expect(subject).to receive(:unset).with(:namespace, :dummy)
+          subject.unset_namespace_setting(:dummy)
+        end
+      end
+
       describe '#namespace_inheritable' do
         it 'delegates to get_or_set' do
           expect(subject).to receive(:get_or_set).with(:namespace_inheritable, :dummy, 1)
@@ -120,6 +141,13 @@ def reset_validations!; end
         end
       end
 
+      describe '#unset_namespace_inheritable' do
+        it 'delegates to unset' do
+          expect(subject).to receive(:unset).with(:namespace_inheritable, :dummy)
+          subject.unset_namespace_inheritable(:dummy)
+        end
+      end
+
       describe '#namespace_stackable' do
         it 'delegates to get_or_set' do
           expect(subject).to receive(:get_or_set).with(:namespace_stackable, :dummy, 1)
@@ -146,13 +174,27 @@ def reset_validations!; end
         end
       end
 
+      describe '#unset_namespace_stackable' do
+        it 'delegates to unset' do
+          expect(subject).to receive(:unset).with(:namespace_stackable, :dummy)
+          subject.unset_namespace_stackable(:dummy)
+        end
+      end
+
       describe '#api_class_setting' do
         it 'delegates to get_or_set' do
           expect(subject).to receive(:get_or_set).with(:api_class, :dummy, 1)
           subject.api_class_setting(:dummy, 1)
         end
       end
 
+      describe '#unset_api_class_setting' do
+        it 'delegates to unset' do
+          expect(subject).to receive(:unset).with(:api_class, :dummy)
+          subject.unset_api_class_setting(:dummy)
+        end
+      end
+
       describe '#within_namespace' do
         it 'calls start and end for a namespace' do
           expect(subject).to receive :namespace_start