Merge pull request sinatra#208 from jkowens/fix_namespacing

Fix issue prefixing routes with conditions
zzak · Jul 20, 2016 · b537546 · b537546
2 parents 72291c6 + 86211ec
commit b537546
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/sinatra-contrib/lib/sinatra/namespace.rb b/sinatra-contrib/lib/sinatra/namespace.rb
@@ -268,6 +268,12 @@ def compile(pattern, conditions, default_pattern = nil)
       def prefixed_path(a, b)
         return a || b || /.*/ unless a and b
 
+        concat_patterns(a, b)
+      end
+
+      def concat_patterns(a, b)
+        return Mustermann.new(b) if a == /.*/
+
         Mustermann.new(a) + Mustermann.new(b)
       end