Support optional (named) segments inside Route paths

adambeynon · adambeynon · commit 4c009d8e47e9 · 2013-11-29T16:09:28.000Z
diff --git a/opal/vienna/router.rb b/opal/vienna/router.rb
@@ -44,12 +44,15 @@ class Route
       # Regexp for matching named splats in path
       SPLAT = /\\\*(\w+)/
 
+      OPTIONAL = /\\\((.*?)\\\)/
+
       attr_reader :regexp, :named
 
       def initialize(pattern, &handler)
         @named, @handler = [], handler
 
         pattern = Regexp.escape pattern
+        pattern = pattern.gsub OPTIONAL, "(?:$1)?"
 
         pattern.gsub(NAMED) { |m| @named << m[1..-1] }
         pattern.gsub(SPLAT) { |m| @named << m[2..-1] }
diff --git a/spec/route_spec.rb b/spec/route_spec.rb
@@ -57,7 +57,33 @@
       subject.new('/:first/:second') { |params|
         params.should eq({ 'first' => 'woosh', 'second' => 'kapow' })
       }.match('/woosh/kapow')
-     end
+    end
+
+    describe "optional segment" do
+      it "can match simple optional segments" do
+        route = subject.new('/foo(/bar)')
+
+        expect(route.match('/foo')).to eq(true)
+        expect(route.match('/foo/bar')).to eq(true)
+        expect(route.match('/foo/baz')).to_not eq(true)
+      end
+
+      it "can match a named part inside an optional part" do
+        route = subject.new('/foo(/:bar)')
+        expect(route.named).to eq(['bar'])
+      end
+
+      it "returns set named part to nil when optional part not given" do
+        subject.new('/foo(/:bar)') { |params|
+          params.should eq({ 'bar' => nil })
+        }.match('/foo')
+      end
+
+      it "returns correct value for named param inside optional part" do
+        subject.new('/foo(/:bar)') { |params|
+          params.should eq({ 'bar' => '42' })
+        }.match('/foo/42')
+      end
+    end
   end
 end
-
