move API.scope to Routing DSL

yalongzhang · yalongzhang · commit 67c81955627e · 2016-02-22T07:17:05.000+08:00
diff --git a/lib/grape/api.rb b/lib/grape/api.rb
@@ -13,8 +13,8 @@ class << self
 
       # Clears all defined routes, endpoints, etc., on this API.
       def reset!
-        @endpoints = []
-        @routes = nil
+        reset_endpoints!
+        reset_routes!
         reset_validations!
       end
 
@@ -43,20 +43,10 @@ def call!(env)
         instance.call(env)
       end
 
-      # Create a scope without affecting the URL.
-      #
-      # @param _name [Symbol] Purely placebo, just allows to name the scope to
-      # make the code more readable.
-      def scope(_name = nil, &block)
-        within_namespace do
-          nest(block)
-        end
-      end
-
       # (see #cascade?)
       def cascade(value = nil)
         if value.nil?
-          inheritable_setting.namespace_inheritable.keys.include?(:cascade) ? !!namespace_inheritable(:cascade) : true
+          inheritable_setting.namespace_inheritable.keys.include?(:cascade) ? !namespace_inheritable(:cascade).nil? : true
         else
           namespace_inheritable(:cascade, value)
         end
@@ -90,9 +80,7 @@ def inherited(subclass)
       def inherit_settings(other_settings)
         top_level_setting.inherit_from other_settings.point_in_time_copy
 
-        endpoints.each(&:reset_routes!)
-
-        @routes = nil
+        reset_routes!
       end
     end
 
diff --git a/lib/grape/dsl/routing.rb b/lib/grape/dsl/routing.rb
@@ -58,6 +58,16 @@ def prefix(prefix = nil)
           namespace_inheritable(:root_prefix, prefix)
         end
 
+        # Create a scope without affecting the URL.
+        #
+        # @param _name [Symbol] Purely placebo, just allows to name the scope to
+        # make the code more readable.
+        def scope(_name = nil, &block)
+          within_namespace do
+            nest(block)
+          end
+        end
+
         # Do not route HEAD requests to GET requests automatically.
         def do_not_route_head!
           namespace_inheritable(:do_not_route_head, true)
@@ -175,9 +185,14 @@ def routes
 
         # Remove all defined routes.
         def reset_routes!
+          endpoints.each(&:reset_routes!)
           @routes = nil
         end
 
+        def reset_endpoints!
+          @endpoints = []
+        end
+
         # Thie method allows you to quickly define a parameter route segment
         # in your API.
         #
diff --git a/spec/grape/dsl/routing_spec.rb b/spec/grape/dsl/routing_spec.rb
@@ -31,6 +31,13 @@ class Dummy
         end
       end
 
+      describe '.scope' do
+        it 'create a scope without affecting the URL' do
+          expect(subject).to receive(:within_namespace)
+          subject.scope {}
+        end
+      end
+
       describe '.do_not_route_head!' do
         it 'sets do not route head option' do
           expect(subject).to receive(:namespace_inheritable).with(:do_not_route_head, true)
