regal 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db4e4203da5b1a0bec0c51c723f9b568ce05156e
-  data.tar.gz: cbf14817181216d249f47bd98911a82e76037f46
+SHA256:
+  metadata.gz: 45ac2e7667747b949959086c13d4e1f9d8aafe68324c2c0124ad52ba34f7f99c
+  data.tar.gz: f48537179e64376e9d616859883e9ce88f016f79f1b99ece62cd009ec265597c
 SHA512:
-  metadata.gz: c7872761ee284242b04d66a6d9a69bcdd63e34c7db5385188c92db0c0221f21927983f367d7eb8520acfc748226337c5e001e95e57ceffd171d184d2904f67d9
-  data.tar.gz: 13f6d5b016259691a1f8d7f6bb8fe29c80543c2b395c95a4e847bbaf418f006a0156cb87085f4e4d1a47b354d76648a74f65c7e5c359c63dee800d6ed0a5f387
+  metadata.gz: 15d39814b9bc1b8f9b80e1a937c7b6dc5d9f26afd6d228d54dc4fa655e7043d87eeab8d5477d3cd711a7261172e06bba6f4ffb73ffecbfed4a06d2b3966184ff
+  data.tar.gz: 1f16718c266cbac372fa03c1ad99843de49b75eb15123945194d62f056ac1a8d8749adba34d03d51eeaac216490717c433469ca223d2edd842845843900bb5fb

data/lib/regal/app.rb

@@ -58,6 +58,7 @@ module Regal
           MountGraft.new(app, route)
         end
         routes.merge!(mounted_routes)
+        routes.default = mounted_routes.default
       end
       @routes.each do |path, cls|
         routes[path] = cls.new(attributes)

data/lib/regal/version.rb

@@ -1,4 +1,4 @@
 module Regal
   # @private
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/spec/regal/app_spec.rb

@@ -592,6 +592,27 @@ module Regal
       end
     end
 
+    context 'an app that has a top-level capturing route' do
+      let :app do
+        App.new do
+          route :foo do
+            get do
+              'whatever'
+            end
+          end
+        end
+      end
+
+      it 'matches anything for the capture route' do
+        get '/something'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('whatever')
+        get '/something-else'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('whatever')
+      end
+    end
+
     context 'an app that mounts another app' do
       GoodbyeApp = App.create do
         route 'goodbye' do
@@ -701,6 +722,87 @@ module Regal
       end
     end
 
+    context 'an app that has an mounted capturing route' do
+      let :app do
+        InnerApp = App.create do
+          route 'static' do
+            get do
+              'static'
+            end
+          end
+
+          route :bar do
+            get do
+              'inside'
+            end
+          end
+        end
+
+        App.new do
+          route 'foo' do
+            mount InnerApp
+          end
+
+          route :outside do
+            get do
+              'outside'
+            end
+          end
+        end
+      end
+
+      it 'prioritizes the static route' do
+        get '/foo/static'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('static')
+      end
+
+      it 'matches anything for the mounted capture route' do
+        get '/foo/this'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('inside')
+      end
+
+      it 'still matches anything for the parent capture route' do
+        get '/this'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('outside')
+      end
+    end
+
+    context 'an app that has two mounted capturing routes' do
+      let :app do
+        InnerApp1 = App.create do
+          route :bar do
+            get do
+              'inside 1'
+            end
+          end
+        end
+
+        InnerApp2 = App.create do
+          route :bar do
+            get do
+              'inside 2'
+            end
+          end
+        end
+
+        App.new do
+          route 'foo' do
+            mount InnerApp1
+            mount InnerApp2
+          end
+        end
+      end
+
+      it 'last capture route replaces earlier mounted capture route' do
+        get '/foo/this'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('inside 2')
+      end
+    end
+
     context 'an app that groups routes together in scopes' do
       let :app do
         App.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 description: ''
 email:
 - theo@iconara.net
@@ -61,14 +61,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
-- spec/regal/app_spec.rb
+- spec/spec_helper.rb
 - spec/regal/request_spec.rb
 - spec/regal/response_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+- spec/regal/app_spec.rb