roda 3.97.0 → 3.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dfe0f7c2161415227cf683ae6c01eaec3b4c24356a0d30a432a22496de10419
-  data.tar.gz: dd942c7df38f70c0c92198382a96416e50b58bca364c40245cd0db9fc189b4ef
+  metadata.gz: 26619fe3a0b256c2615c6be17f215919c73a804609f536a3ff9f8329f14e7f9b
+  data.tar.gz: 550f978b06bf82356bcbefedc9d00929073549c02cb118362212527f52a6336d
 SHA512:
-  metadata.gz: 9a2a87e92a736a141ce78251ffa90f1d00ede4630541aca87188a595913f4279083a61465c9a49489c0e3aab9e53981567ba32d3d5d645dfdd6a6d93bcc5df88
-  data.tar.gz: 0faa213105f681e07078b94e3472563b3718a144ac0ad7ba7c39673f3cca2815f9200ce13f27d87f469ab3c132eb09a025058cf589adc9d8fcad62eb943b0c3b
+  metadata.gz: 244665571cdb2b400ced6494ab8210fbf12ab46b2fd799f35fd7373f675606c975b8fc7cc6a279532c8b76d9a981a339528b41567d022d353f763ee8028b4225
+  data.tar.gz: a30c5c61b21ff9c65c0cfdad17a1011039d44b57c498e7e833fec859a7ec6876d593eb53b950c56d6b7a8858f11e6e2edf6d3798db2288ccfa5b965be019bbe5

data/lib/roda/plugins/run_require_slash.rb

@@ -9,7 +9,7 @@ class Roda
     # dispatching to the application with an environment that would violate the
     # Rack SPEC.
     #
-    # You are unlikely to want to use this plugin unless are consuming partial
+    # You are unlikely to want to use this plugin unless you are consuming partial
     # segments of the request path, or using the match_affix plugin to change
     # how routing is done:
     #
@@ -23,10 +23,10 @@ class Roda
     #   end
     #
     #   # with run_require_slash: 
-    #   # GET /a/b/e => App not dispatched to
+    #   # GET /a/b/e => Not dispatched to application
     #   # GET /a/b => App gets "" as PATH_INFO
     #
-    #   # with run_require_slash: 
+    #   # without run_require_slash: 
     #   # GET /a/b/e => App gets "e" as PATH_INFO, violating rack SPEC
     #   # GET /a/b => App gets "" as PATH_INFO
     module RunRequireSlash

data/lib/roda/plugins/sessions.rb

@@ -65,6 +65,8 @@ class Roda
     #                    that.  If the +:secure+ option is not present in the hash, then
     #                    <tt>secure: true</tt> is also set if the request is made over HTTPS.  If this option is
     #                    given, it will be merged into the default cookie options.
+    # :env_key :: The key in `env` where the session should be located. Defaults to <tt>"rack.session"</tt>, the
+    #             default key for sessions in Rack.
     # :gzip_over :: For session data over this many bytes, compress it with the deflate algorithm (default: nil,
     #               so never compress).  Note that compression should not be enabled if you are storing data in
     #               the session derived from user input and also storing sensitive data in the session.
@@ -148,7 +150,7 @@ class Roda
     #                    deflate compression, this contains the deflate compressed data.
     module Sessions
       DEFAULT_COOKIE_OPTIONS = {:httponly=>true, :path=>'/'.freeze, :same_site=>:lax}.freeze
-      DEFAULT_OPTIONS = {:key => 'roda.session'.freeze, :max_seconds=>86400*30, :max_idle_seconds=>86400*7, :pad_size=>32, :gzip_over=>nil, :skip_within=>3600}.freeze
+      DEFAULT_OPTIONS = {:key => 'roda.session'.freeze, :max_seconds=>86400*30, :max_idle_seconds=>86400*7, :pad_size=>32, :gzip_over=>nil, :skip_within=>3600, :env_key=>'rack.session'}.freeze
       DEFLATE_BIT  = 0x1000
       PADDING_MASK = 0x0fff
       SESSION_CREATED_AT = 'roda.session.created_at'.freeze
@@ -226,7 +228,7 @@ class Roda
         # update the rack response headers to set the session cookie in
         # the response.
         def _roda_after_50__sessions(res)
-          if res && (session = env['rack.session'])
+          if res && (session = env[self.class.opts[:sessions][:env_key]])
             @_request.persist_session(res[1], session)
           end
         end
@@ -240,7 +242,7 @@ class Roda
         # this method stores the session in 'rack.session' in the request environment,
         # but that does not happen until this method is called.
         def session
-          @env['rack.session'] ||= _load_session
+          @env[roda_class.opts[:sessions][:env_key]] ||= _load_session
         end
 
         # The time the session was originally created. nil if there is no active session.

data/lib/roda/request.rb

@@ -12,6 +12,7 @@ else
   end
 end
 
+require 'set'
 require_relative "cache"
 
 class Roda
@@ -489,6 +490,21 @@ class Roda
           end
         end
 
+        # Match only if the next segment in the path is one of the
+        # set's elements, and yield the next segment.
+        def _match_set(set)
+          rp = @remaining_path
+          if key = _match_class_String
+            if set.include?(@captures[-1])
+              true
+            else
+              @remaining_path = rp
+              @captures.pop
+              false
+            end
+          end
+        end
+
         # Match the given symbol if any segment matches.
         def _match_symbol(sym=nil)
           rp = @remaining_path
@@ -629,6 +645,8 @@ class Roda
             _match_array(matcher)
           when Hash
             _match_hash(matcher)
+          when Set
+            _match_set(matcher)
           when Symbol
             _match_symbol(matcher)
           when false, nil

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 3
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 97
+  RodaMinorVersion = 99
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.97.0
+  version: 3.99.0
 platform: ruby
 authors:
 - Jeremy Evans