sinatra-router 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89e770f9cecfaa6f9ef8ee2c03928c683679ef29
-  data.tar.gz: 5ea0e147dd53d872a318e81a3e393e3e329d01f2
+SHA256:
+  metadata.gz: c9a8de0d20079516830e1f738a4d10b98af59bc4c2ac1adb235654d7d1c3fe0a
+  data.tar.gz: 777c676fa17f2d5d9fc9ba5e513a414a211970c7e3559b7a83cd2ec569a4d8d0
 SHA512:
-  metadata.gz: 08d376d6f5eb2f90ce76a4b03073820f662b2a0914c360b2fcbba2c817608847a41eb7d3a19c716a2ec4b899af8fe1ca3f4af174a2f5483204a9fcc62d24ddd8
-  data.tar.gz: f611d3dad232c3c9814b63021880f9dff0232fa1d8c9f76edfd281691e0b22a8c08e6120c366afd0b0b61c17bd412a143882e2ea2c34052c314a798a19274dcf
+  metadata.gz: 6f54da7b5cae76cde89c4f221b459bd26bf6e6674011d8ff83b08d313ef1ec66654ce98408c07c309198eac864273e83f18f60e2f2be03abb55131b5f98778f3
+  data.tar.gz: 70709147b865e2c929c7b16726b8b18ce2cfaca3a57b80c4646c4cf9b37ef8c78a07433a1b9cff55bcf675667084338c092c0ecbf869d2a4ef43e3f1f977a210

data/lib/sinatra/router.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Sinatra
+  # A Sinatra router that allows multiple Sinatra applications to be composed
+  # together.
   class Router
-    def initialize(app=nil, *args, &block)
+    def initialize(app = nil, *_args, &block)
       @app        = app
       @apps       = []
       @conditions = []
@@ -11,11 +15,13 @@ module Sinatra
     end
 
     def call(env)
-      if ret = try_route(env["REQUEST_METHOD"], env["PATH_INFO"], env)
+      if (ret = try_route(env['REQUEST_METHOD'], env['PATH_INFO'], env))
         ret
       else
-        raise "router needs to be (1) mounted as middleware or (b) contain " +
-          "a default run statement" if !@app && !@run
+        if !@app && !@run
+          raise 'router needs to be (1) mounted as middleware or (b) contain ' \
+                'a default run statement'
+        end
 
         # if set as middlware, prefer that, otherwise try default run module
         (@app || @run).call(env)
@@ -24,7 +30,8 @@ module Sinatra
 
     # specify the default app to run if no other app routes matched
     def run(app)
-      raise "@run already set" if @run
+      raise '@run already set' if @run
+
       @run = app
     end
 
@@ -45,7 +52,7 @@ module Sinatra
 
     def with_conditions(*args, &block)
       old = @conditions
-      @conditions = @conditions + args
+      @conditions += args
       instance_eval(&block) if block
       @conditions = old
     end
@@ -56,6 +63,7 @@ module Sinatra
       all_routes = {}
       @apps.each do |app, conditions|
         next unless app.respond_to?(:routes)
+
         app.routes.each do |verb, routes|
           all_routes[verb] ||= []
           all_routes[verb] += routes.map do |pattern, _, _, _|
@@ -75,16 +83,16 @@ module Sinatra
 
     def try_route(verb, path, env)
       # see Sinatra's `route!`
-      if verb_routes = @routes[verb]
+      if (verb_routes = @routes[verb])
         verb_routes.each do |pattern, conditions, app|
-          if pattern.match(path) && conditions_match?(conditions, env)
-            status, headers, response = app.call(env)
+          next if !pattern.match(path) || !conditions_match?(conditions, env)
 
-            # if we got a pass, keep trying routes
-            next if headers["X-Cascade"] == "pass"
+          status, headers, response = app.call(env)
 
-            return status, headers, response
-          end
+          # if we got a pass, keep trying routes
+          next if headers['X-Cascade'] == 'pass'
+
+          return status, headers, response
         end
       end
       nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-router
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Brandur
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -19,7 +19,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: brandur@mutelight.org
 executables: []
 extensions: []
@@ -82,8 +82,9 @@ files:
 homepage: https://github.com/brandur/sinatra-router
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,9 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A tiny vendorable router that makes it easy to try routes from a number of
   different modular Sinatra applications.