Ensure that the current segment (removed from request_path to give en…

…closing path) is singelton aware

lib/ardes/resources_controller/request_path_introspection.rb

@@ -11,7 +11,7 @@ def request_path
       end
 
       def nesting_request_path
-        @nesting_request_path ||= remove_namespace(request_path.sub(%r(/#{current_segment}(?!.+/#{current_segment}).*$), ''))
+        @nesting_request_path ||= remove_namespace(remove_current_segment(request_path))
       end
 
       # returns an array of hashes like {:segment => 'forum', :singleton => false}
@@ -29,6 +29,14 @@ def param_keys
       end
 
     private
+      def remove_current_segment(path, singleton = false)
+        if respond_to?(:resource_specification) && resource_specification.singleton?
+          path.sub(%r(/#{current_segment}(?!.*/#{current_segment}).*$), '')
+        else
+          path.sub(%r(/#{current_segment}(?!.+/#{current_segment}).*$), '')
+        end
+      end
+
       def current_segment
         respond_to?(:resource_specification) ? resource_specification.segment : controller_name
       end