regal 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db4e4203da5b1a0bec0c51c723f9b568ce05156e
-  data.tar.gz: cbf14817181216d249f47bd98911a82e76037f46
+SHA256:
+  metadata.gz: ef206f9aa897e6b16abeb2b835eed4a6ad20709f58fe4be98f7d6f2a43cc8511
+  data.tar.gz: 372d5656715377d810b81df4031465303b066762d8bd5d36947168e00ae61ab4
 SHA512:
-  metadata.gz: c7872761ee284242b04d66a6d9a69bcdd63e34c7db5385188c92db0c0221f21927983f367d7eb8520acfc748226337c5e001e95e57ceffd171d184d2904f67d9
-  data.tar.gz: 13f6d5b016259691a1f8d7f6bb8fe29c80543c2b395c95a4e847bbaf418f006a0156cb87085f4e4d1a47b354d76648a74f65c7e5c359c63dee800d6ed0a5f387
+  metadata.gz: 4cff885e626bd9e3041084832c7732f49e89eb8a54f688080ea74193eed68ef311f7a532e7e24b1b6a1594f59633caecd9898d94961b36fa842d07344b87a5c7
+  data.tar.gz: d44c0b141c83ae570703be9b23b1237c0e5bbcd8d8e3c2893dfe7c44d950e600c68c80ced1fa9f5f27c5bb294058bd3cbbe5aa8e88d227fa5982c0cde22d1a40

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)
@@ -354,9 +355,9 @@ module Regal
         end
         response
       elsif matching_route
-        METHOD_NOT_ALLOWED_RESPONSE
+        [405, {}, []]
       else
-        NOT_FOUND_RESPONSE
+        [404, {}, []]
       end
     end
 
@@ -373,8 +374,6 @@ module Regal
 
     private
 
-    METHOD_NOT_ALLOWED_RESPONSE = [405, {}.freeze, [].freeze].freeze
-    NOT_FOUND_RESPONSE = [404, {}.freeze, [].freeze].freeze
     SLASH = '/'.freeze
     PATH_INFO_KEY = 'PATH_INFO'.freeze
     REQUEST_METHOD_KEY = 'REQUEST_METHOD'.freeze

data/lib/regal/response.rb

@@ -20,7 +20,7 @@ module Regal
     # @private
     def initialize
       @status = 200
-      @headers = {}
+      @headers = Rack::Headers.new
       @body = nil
       @raw_body = nil
       @finished = false

data/lib/regal/version.rb

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

data/spec/regal/app_spec.rb

@@ -126,7 +126,7 @@ module Regal
 
       it 'can set response headers' do
         get '/redirect'
-        expect(last_response.headers).to include('Location' => 'somewhere/else')
+        expect(last_response.headers).to include('location' => 'somewhere/else')
       end
     end
 
@@ -262,11 +262,11 @@ module Regal
 
         it 'does not call further handlers or before blocks when the response is marked as finished' do
           expect(last_response.body).to eq('Go somewhere else')
-          expect(last_response.headers).to_not have_key('X-HandlerCalled')
+          expect(last_response.headers).to_not have_key('x-handlercalled')
         end
 
         it 'calls after blocks' do
-          expect(last_response.headers).to include('WasAfterCalled' => 'yes')
+          expect(last_response.headers).to include('wasaftercalled' => 'yes')
         end
       end
 
@@ -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
@@ -780,28 +882,28 @@ module Regal
       it 'calls the route\'s parent scope\'s before blocks only' do
         get '/scoped/1'
         expect(last_response.status).to eq(200)
-        expect(last_response.headers).to include('BeforeScope' => '1')
+        expect(last_response.headers).to include('beforescope' => '1')
         get '/scoped/2'
         expect(last_response.status).to eq(200)
-        expect(last_response.headers).to include('BeforeScope' => '2', 'BeforeSubScope' => '2')
+        expect(last_response.headers).to include('beforescope' => '2', 'beforesubscope' => '2')
       end
 
       it 'calls the route\'s parent scope\'s after blocks only' do
         get '/scoped/1'
         expect(last_response.status).to eq(200)
-        expect(last_response.headers).to include('AfterScope' => '1')
+        expect(last_response.headers).to include('afterscope' => '1')
         get '/scoped/2'
         expect(last_response.status).to eq(200)
-        expect(last_response.headers).to include('AfterScope' => '2')
+        expect(last_response.headers).to include('afterscope' => '2')
       end
 
       it 'calls the common before and after blocks' do
         get '/scoped/1'
         expect(last_response.status).to eq(200)
-        expect(last_response.headers).to include('CommonBefore' => 'yes', 'CommonAfter' => 'yes')
+        expect(last_response.headers).to include('commonbefore' => 'yes', 'commonafter' => 'yes')
         get '/scoped/2'
         expect(last_response.status).to eq(200)
-        expect(last_response.headers).to include('CommonBefore' => 'yes', 'CommonAfter' => 'yes')
+        expect(last_response.headers).to include('commonbefore' => 'yes', 'commonafter' => 'yes')
       end
     end
 
@@ -1310,7 +1412,7 @@ module Regal
 
         it 'calls after blocks when errors are handled' do
           get '/handled'
-          expect(last_response.headers['WasAfterCalled']).to eq('yes')
+          expect(last_response.headers['wasaftercalled']).to eq('yes')
         end
 
         it 'lets them bubble all the way up when there are no matching error handlers' do
@@ -1326,12 +1428,12 @@ module Regal
 
         it 'delegates them to matching error handlers at the same level, not below' do
           get '/handled/at-the-right-level/level-3/level-4'
-          expect(last_response.headers).to include('HandledAtLevel' => '3')
+          expect(last_response.headers).to include('handledatlevel' => '3')
         end
 
         it 'calls after blocks when errors are handled' do
           get '/handled/from-before'
-          expect(last_response.headers['WasAfterCalled']).to eq('yes')
+          expect(last_response.headers['wasaftercalled']).to eq('yes')
         end
 
       end
@@ -1344,8 +1446,8 @@ module Regal
 
         it 'calls the rest of the after blocks when errors are handled' do
           get '/handled/from-after'
-          expect(last_response.headers['NextAfterWasCalled']).to eq('yes')
-          expect(last_response.headers['WasAfterCalled']).to eq('yes')
+          expect(last_response.headers['nextafterwascalled']).to eq('yes')
+          expect(last_response.headers['wasaftercalled']).to eq('yes')
         end
       end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: regal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Theo Hultberg
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
 description: ''
 email:
 - theo@iconara.net
@@ -46,7 +45,6 @@ homepage: http://github.com/iconara/regal
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -54,16 +52,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ''
 test_files:
@@ -71,4 +67,3 @@ test_files:
 - spec/regal/request_spec.rb
 - spec/regal/response_spec.rb
 - spec/spec_helper.rb
-has_rdoc: