roda 3.52.0 → 3.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df634d0506d88725400ff1b82d04da87928761e9b65937c443e95cd0c084b18f
-  data.tar.gz: fd7e182f69a5f01cc33a654f2a94602aa121562c7b0e46b75c6bfb3e28b320bf
+  metadata.gz: 90bdf6d366ffc4bff40aa51721176291fadb80f56d7904965fe46a1385fe4172
+  data.tar.gz: ab1bea5320b4049e918ebb23d1b081c26d5401000f11b02c5f85a1e1b30899c3
 SHA512:
-  metadata.gz: 9985fce952a85040aca26f103d82ae5762c0fb70d2c31ee9539bd053bbb700fcb97461114ca6c7f17f7be68eaa2a9e79e89826a54c5caad7c0004ea0d3eaefb5
-  data.tar.gz: baf99483bd37a9c74c38c3a28bb78d030e5107fceae437065cd7d7237db3ac106535ded55727b339898c398d6198872fbd6ec8c2be23854c88d7a908502c89a4
+  metadata.gz: 13bc3beb138174dc8cadfc309458bd1821cbe8b6f80f1cb704752979bf085710181d5fd9df71a3cc1fba2be3b258721f36c8758e202961f9389f23b7555ee78b
+  data.tar.gz: 7129008315908bf7ebd6c0115cd8eb531a6357617a5f9ce3a0ffae3703a5cd68793af0d43ac4703752e280a5cc6090234b60640fe25384c4fa8aabe8e04b94af

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.53.0 (2022-02-14)
+
+* Make indifferent_params plugin support rack main branch (jeremyevans)
+
+* Add additional_view_directories plugin, for checking multiple view directories for templates (jeremyevans) (#229)
+
 = 3.52.0 (2022-01-14)
 
 * Fix return value of Roda.freeze when multi_route plugin is used (jeremyevans) (#240)

data/doc/release_notes/3.53.0.txt

@@ -0,0 +1,14 @@
+= New Features
+
+* An additional_view_directories plugin has been added, which allows
+  you to specify additional directories to look in for templates.
+  If the template path does not exist when using the default view
+  directory, then each additional view directory will be checked,
+  returning the first path that exists:
+
+    plugin :additional_view_directories, ['admin_views', 'public_views']
+
+= Other Improvements
+
+* The indifferent_params plugin now avoids a deprecation warning when
+  using the rack main branch, which will become Rack 3.

data/lib/roda/plugins/additional_view_directories.rb

@@ -0,0 +1,68 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The additional_view_directories plugin allows for specifying additional view
+    # directories to look in for templates.  When rendering a template, it will
+    # first try the :views directory specified in the render plugin.  If the template
+    # file to be rendered does not exist in that directory, it will try each additional
+    # view directory specified in this plugin, in order, using the path to the first
+    # template file that exists in the file system.  If no such path is found, it
+    # uses the default path specified by the render plugin.
+    #
+    # Example:
+    #
+    #   plugin :render, :views=>'dir'
+    #   plugin :additional_view_directories, ['dir1', 'dir2', 'dir3']
+    #
+    #   route do |r|
+    #     # Will check the following in order, using path for first
+    #     # template file that exists:
+    #     # * dir/t.erb
+    #     # * dir1/t.erb
+    #     # * dir2/t.erb
+    #     # * dir3/t.erb
+    #     render :t
+    #   end
+    module AdditionalViewDirectories
+      # Depend on the render plugin, since this plugin only makes
+      # sense when the render plugin is used.
+      def self.load_dependencies(app, view_dirs)
+        app.plugin :render
+      end
+
+      # Set the additional view directories to look in. Each additional view directory
+      # is also added as an allowed path.
+      def self.configure(app, view_dirs)
+        view_dirs = app.opts[:additional_view_directories] = view_dirs.map{|f| app.expand_path(f, nil)}.freeze
+        opts = app.opts[:render]
+        app.opts[:render] = opts.merge(:allowed_paths=>(opts[:allowed_paths] + view_dirs).uniq.freeze)
+        opts.freeze
+      end
+
+      module InstanceMethods
+        private
+
+        # If the template path does not exist, try looking for the template
+        # in each of the additional view directories, in order, returning
+        # the first path that exists. If no additional directory includes
+        # the template, return the original path.
+        def template_path(opts)
+          orig_path = super
+
+          unless File.file?(orig_path)
+            self.opts[:additional_view_directories].each do |view_dir|
+              path = super(opts.merge(:views=>view_dir))
+              return path if File.file?(path)
+            end
+          end
+
+          orig_path
+        end
+      end
+    end
+
+    register_plugin(:additional_view_directories, AdditionalViewDirectories)
+  end
+end

data/lib/roda/plugins/indifferent_params.rb

@@ -52,17 +52,29 @@ class Roda
           end
           
           class Params < Rack::QueryParser::Params
-            def initialize(limit = Rack::Utils.key_space_limit)
-              @limit  = limit
-              @size   = 0
-              @params = Hash.new(&INDIFFERENT_PROC)
+            # :nocov:
+            if Rack.release >= '2.3'
+              def initialize
+                @size   = 0
+                @params = Hash.new(&INDIFFERENT_PROC)
+              end
+            else
+            # :nocov:
+              def initialize(limit = Rack::Utils.key_space_limit)
+                @limit  = limit
+                @size   = 0
+                @params = Hash.new(&INDIFFERENT_PROC)
+              end
             end
           end
 
         end
 
         module RequestMethods
-          QUERY_PARSER = Rack::Utils.default_query_parser = QueryParser.new(QueryParser::Params, 65536, 100)
+          # :nocov:
+          query_parser = Rack.release >= '2.3' ? QueryParser.new(QueryParser::Params, 32) : QueryParser.new(QueryParser::Params, 65536, 32)
+          # :nocov:
+          QUERY_PARSER = Rack::Utils.default_query_parser = query_parser
 
           private
 

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 = 52
+  RodaMinorVersion = 53
 
   # 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.52.0
+  version: 3.53.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -210,6 +210,7 @@ extra_rdoc_files:
 - doc/release_notes/3.50.0.txt
 - doc/release_notes/3.51.0.txt
 - doc/release_notes/3.52.0.txt
+- doc/release_notes/3.53.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 - doc/release_notes/3.8.0.txt
@@ -269,6 +270,7 @@ files:
 - doc/release_notes/3.50.0.txt
 - doc/release_notes/3.51.0.txt
 - doc/release_notes/3.52.0.txt
+- doc/release_notes/3.53.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 - doc/release_notes/3.8.0.txt
@@ -280,6 +282,7 @@ files:
 - lib/roda/plugins/_before_hook.rb
 - lib/roda/plugins/_optimized_matching.rb
 - lib/roda/plugins/_symbol_regexp_matchers.rb
+- lib/roda/plugins/additional_view_directories.rb
 - lib/roda/plugins/all_verbs.rb
 - lib/roda/plugins/assets.rb
 - lib/roda/plugins/assets_preloading.rb