roda 3.86.0 → 3.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1851a201539b728f1af90ea1b85b2b33a9026f71986cb65c1aabdd079f653ad
-  data.tar.gz: f360e0bfeb3442df2fa1f96e28362eee9850c0f54d160bfbfc2b11d62d33ba39
+  metadata.gz: bee7ae126ad0e6e8081bba94be0ad60e2a5f7523c483b2441571549b1bd29274
+  data.tar.gz: f5441e96617877d1347f4a5b6e54e5d48713ffc91a8ad3b9282781c0c26ca108
 SHA512:
-  metadata.gz: d2bef4abc3d5e08ddb5a1c9c27f8b626b631a5951cec7cee062c497074cb7f68e6c8b36e75261cc913a580a87d5111438e8a21488669812c9a3b227bf9609e0b
-  data.tar.gz: e668a47039e529aa026e21ddfd6346b3e1fa224f432b46085b33242c9551ced88278328f2d2d471b2593f841da0a882d8f85dd2468277484409f679485a219df
+  metadata.gz: 141408b4d85e7467c0b753c05180201b1a63a3096f713241b94d379bad8d65224d96f1d60978ac336a7d8b9fb3093f35c1d2887d422276cf255cd1c64c557719
+  data.tar.gz: a64207e6d0a46d22c59bc0acc9d56ed43f4dbc75a9d22737908097564a2e4e801f3c19fd3bf95a28722dbf4a828d9930146dd088e421847709948d3a8f2cf24b

data/lib/roda/plugins/custom_block_results.rb

@@ -28,7 +28,16 @@ class Roda
     #
     # Note that custom block result handling only occurs if the types
     # are not handled by Roda itself.  You cannot use this to modify
-    # the handling of nil, false, or string results.
+    # the handling of nil, false, or string results.  Additionally,
+    # if the response body has already been written to before the the
+    # route block exits, then the result of the block is ignored,
+    # and the related +handle_block_result+ block will not be called
+    # (this is standard Roda behavior).
+    # 
+    # The return value of the +handle_block_result+ block is written
+    # to the body if the block return value is a String, similar to
+    # standard Roda handling of block results.  Non-String return
+    # values are ignored.
     module CustomBlockResults
       def self.configure(app)
         app.opts[:custom_block_results] ||= {}
@@ -55,7 +64,15 @@ class Roda
         # to get the block result.
         def unsupported_block_result(result)
           roda_class.opts[:custom_block_results].each do |klass, meth|
-            return scope.send(meth, result) if klass === result
+            if klass === result
+              result = scope.send(meth, result)
+
+              if String === result
+                return result
+              else
+                return
+              end
+            end
           end
 
           super

data/lib/roda/plugins/header_matchers.rb

@@ -51,7 +51,8 @@ class Roda
 
         # Match if the given uppercase key is present inside the environment.
         def match_header(key)
-          key = key.upcase.tr("-","_")
+          key = key.upcase
+          key.tr!("-","_")
           unless key == "CONTENT_TYPE" || key == "CONTENT_LENGTH"
             key = "HTTP_#{key}"
           end
@@ -75,8 +76,8 @@ class Roda
         # Match the submitted user agent to the given pattern, capturing any
         # regexp match groups.
         def match_user_agent(pattern)
-          if (user_agent = @env["HTTP_USER_AGENT"]) && user_agent.to_s =~ pattern
-            @captures.concat($~[1..-1])
+          if (user_agent = @env["HTTP_USER_AGENT"]) && (match = pattern.match(user_agent))
+            @captures.concat(match.captures)
           end
         end
       end

data/lib/roda/plugins/host_routing.rb

@@ -0,0 +1,190 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The host_routing plugin adds support for more routing requests based on
+    # the requested host.  It also adds predicate methods for checking
+    # whether a request was requested with the given host.
+    #
+    # When loading the plugin, you pass a block, which is used for configuring
+    # the plugin.  For example, if you want to treat requests to api.example.com
+    # or api2.example.com as api requests, and treat other requests as www
+    # requests, you could use:
+    #
+    #   plugin :host_routing do |hosts|
+    #     hosts.to :api, "api.example.com", "api2.example.com"
+    #     hosts.default :www
+    #   end
+    #
+    # With this configuration, in your routing tree, you can call the +r.api+ and
+    # +r.www+ methods for dispatching to routing blocks only for those types of
+    # requests:
+    #
+    #   route do |r|
+    #     r.api do
+    #       # requests to api.example.com or api2.example.com
+    #     end
+    #
+    #     r.www do
+    #       # requests to other domains
+    #     end
+    #   end
+    #
+    # In addition to the routing methods, predicate methods are also added to the
+    # request object:
+    #
+    #   route do |r|
+    #     "#{r.api?}-#{r.www?}"
+    #   end
+    #   # Requests to api.example.com or api2.example.com return "true-false"
+    #   # Other requests return "false-true"
+    #
+    # If the +:scope_predicates+ plugin option is given, predicate methods are also
+    # created in route block scope:
+    #
+    #   plugin :host_routing, scope_predicates: true do |hosts|
+    #     hosts.to :api, "api.example.com"
+    #     hosts.default :www
+    #   end
+    #
+    #   route do |r|
+    #     "#{api?}-#{www?}"
+    #   end
+    #
+    # To handle hosts that match a certain format (such as all subdomains),
+    # where the specific host names are not known up front, you can provide a block
+    # when calling +hosts.default+. This block is passed the host name, or an empty
+    # string if no host name is provided, and is evaluated in route block scope.
+    # When using this support, you should also call +hosts.register+
+    # to register host types that could be returned by the block.  For example, to
+    # handle api subdomains differently:
+    #
+    #   plugin :host_routing do |hosts|
+    #     hosts.to :api, "api.example.com"
+    #     hosts.register :api_sub
+    #     hosts.default :www do |host|
+    #       :api_sub if host.end_with?(".api.example.com")
+    #     end
+    #   end
+    #
+    # This plugin uses the host method on the request to get the hostname (this method
+    # is defined by Rack).
+    module HostRouting
+      # Setup the host routing support.  The block yields an object used to
+      # configure the plugin.  Options:
+      #
+      # :scope_predicates :: Setup predicate methods in route block scope
+      #                      in addition to request scope.
+      def self.configure(app, opts=OPTS, &block)
+        hosts, host_hash, default_block, default_host = DSL.new.process(&block)
+        app.opts[:host_routing_hash] = host_hash
+        app.opts[:host_routing_default_host] = default_host
+
+        app.send(:define_method, :_host_routing_default, &default_block) if default_block
+
+        app::RodaRequest.class_exec do
+          hosts.each do |host|
+            host_sym = host.to_sym
+            define_method(host_sym){|&blk| always(&blk) if _host_routing_host == host}
+            alias_method host_sym, host_sym
+
+            meth = :"#{host}?"
+            define_method(meth){_host_routing_host == host}
+            alias_method meth, meth
+          end
+        end
+
+        if opts[:scope_predicates]
+          app.class_exec do
+            hosts.each do |host|
+              meth = :"#{host}?"
+              define_method(meth){@_request.send(meth)}
+              alias_method meth, meth
+            end
+          end
+        end
+      end
+
+      class DSL
+        def initialize
+          @hosts = []
+          @host_hash = {}
+        end
+
+        # Run the DSL for the given block.
+        def process(&block)
+          instance_exec(self, &block)
+
+          if !@default_host
+            raise RodaError, "must call default method inside host_routing plugin block to set default host"
+          end
+
+          @hosts.concat(@host_hash.values)
+          @hosts << @default_host
+          @hosts.uniq!
+          [@hosts.freeze, @host_hash.freeze, @default_block, @default_host].freeze
+        end
+        
+        # Register hosts that can be returned.  This is only needed if
+        # calling register with a block, where the block can return
+        # a value that doesn't match a host given to +to+ or +default+.
+        def register(*hosts)
+          @hosts = hosts
+        end
+
+        # Treat all given hostnames as routing to the give host.
+        def to(host, *hostnames)
+          hostnames.each do |hostname|
+            @host_hash[hostname] = host
+          end
+        end
+
+        # Register the default hostname.  If a block is provided, it is
+        # called with the host if there is no match for one of the hostnames
+        # provided to +to+.  If the block returns nil/false, the hostname
+        # given to this method is used.
+        def default(hostname, &block)
+          @default_host = hostname
+          @default_block = block
+        end
+      end
+      private_constant :DSL
+
+      module InstanceMethods
+        # Handle case where plugin is used without providing a block to
+        # +hosts.default+.  This returns nil, ensuring that the hostname
+        # provided to +hosts.default+ will be used.
+        def _host_routing_default(_)
+          nil
+        end
+      end
+
+      module RequestMethods
+        private
+
+        # Cache the host to use in the host routing support, so the processing
+        # is only done once per request.
+        def _host_routing_host
+          @_host_routing_host ||= _get_host_routing_host
+        end
+
+        # Determine the host to use for the host routing support.  Tries the
+        # following, in order:
+        #
+        # * An exact match for a hostname given in +hosts.to+
+        # * The return value of the +hosts.default+ block, if given
+        # * The default value provided in the +hosts.default+ call
+        def _get_host_routing_host
+          host = self.host || ""
+
+          roda_class.opts[:host_routing_hash][host] ||
+            scope._host_routing_default(host) ||
+            roda_class.opts[:host_routing_default_host]
+        end
+      end
+    end
+
+    register_plugin(:host_routing, HostRouting)
+  end
+end

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 = 86
+  RodaMinorVersion = 87
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.86.0
+  version: 3.87.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -225,6 +225,7 @@ files:
 - lib/roda/plugins/hmac_paths.rb
 - lib/roda/plugins/hooks.rb
 - lib/roda/plugins/host_authorization.rb
+- lib/roda/plugins/host_routing.rb
 - lib/roda/plugins/hsts.rb
 - lib/roda/plugins/indifferent_params.rb
 - lib/roda/plugins/inject_erb.rb