roda 3.58.0 → 3.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01acdb87d6bf21ec4137dd2b6c7e3210c5923c43f188a510135c30a66945160a
-  data.tar.gz: e84ddddfbfe23a4be3951c2611f38916cb6dfb60b15c1a6bfd18155869ad4985
+  metadata.gz: 963e2d9ac538dbe97835ef65e2e2ba4184838664696bb084ce423a85ef23c205
+  data.tar.gz: d47a7f9c86357e99b0c9f470b6c33a32962df55189303020982af55d70907c7b
 SHA512:
-  metadata.gz: 1681a1b8b8eb950be113d1a533c545ed0a71c24dc6d027a41d2cddb1ae99e4a2c2d23fc0e4c84d1f2960fd141021684d37d75e8509b247d732203100eae6ab2f
-  data.tar.gz: a21456321d0ab6f3c32d4ba97dabd31635751caee7889a2b556dd17cc74fb019d974cc06500081a859402cbf8002a26144d4885dbd8c47589852395d1e398ed2
+  metadata.gz: c84cb0ae8c66b537c0a7d32d83d9c5a639439b15fbc650d3569efab5e134e0883ba06183c7f17bfb379f4018060c7d276a5016431ae3e21d05c2db3801a85762
+  data.tar.gz: 0c9495ec5fe24b774512f6495f97f5bb4cf8189b964f21a04c5e880d4a536ade2e045c7131f0a54a7c1cd203fe142d53c6d7cde4cf223a8e8be4cb5c5475fede

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.59.0 (2022-08-12)
+
+* Add additional_render_engines plugin, for considering multiple render engines for templates (jeremyevans)
+
+* Fix typo in private method name in delete_empty_headers plugin (mculpt) (#279)
+
 = 3.58.0 (2022-07-13)
 
 * Add filter_common_logger plugin for skipping the logging of certain requests when using the common_logger plugin (jeremyevans)

data/doc/release_notes/3.59.0.txt

@@ -0,0 +1,17 @@
+= New Features
+
+* An additional_render_engines plugin has been added, for considering
+  multiple render engines for templates. If the template path does not
+  exist for the default render engine, then each additional render
+  engine will be checked, returning the first path that exists:
+
+    plugin :additional_render_engines, ['haml', 'str']
+
+  This is similar to the additional_view_directories plugin added in
+  3.53.0.  Both plugins can be used if you want to consider multiple
+  view directories and multiple render engines.
+
+= Other Improvements
+
+* A typo in a private method name in the delete_empty_headers plugin
+  has been fixed.

data/lib/roda/plugins/additional_render_engines.rb

@@ -0,0 +1,61 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The additional_render_engines plugin allows for specifying additional render
+    # engines to consider for templates.  When rendering a template, it will
+    # first try the default template engine specified in the render plugin.  If the
+    # template file to be rendered does not exist, it will try each additional render
+    # engine 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 # default engine is 'erb'
+    #   plugin :additional_render_engines, ['haml', 'str']
+    #
+    #   route do |r|
+    #     # Will check the following in order, using path for first
+    #     # template file that exists:
+    #     # * views/t.erb
+    #     # * views/t.haml
+    #     # * views/t.str
+    #     render :t
+    #   end
+    module AdditionalRenderEngines
+      def self.load_dependencies(app, render_engines)
+        app.plugin :render
+      end
+
+      # Set the additional render engines to consider.
+      def self.configure(app, render_engines)
+        app.opts[:additional_render_engines] = render_engines.dup.freeze
+      end
+
+      module InstanceMethods
+        private
+
+        # If the template path does not exist, try looking for the template
+        # using each of the render engines, in order, returning
+        # the first path that exists. If no template path exists for the
+        # default any or any additional engines, return the original path.
+        def template_path(opts)
+          orig_path = super
+
+          unless File.file?(orig_path)
+            self.opts[:additional_render_engines].each do |engine|
+              path = super(opts.merge(:engine=>engine))
+              return path if File.file?(path)
+            end
+          end
+
+          orig_path
+        end
+      end
+    end
+
+    register_plugin(:additional_render_engines, AdditionalRenderEngines)
+  end
+end

data/lib/roda/plugins/assets.rb

@@ -147,7 +147,7 @@ class Roda
     # If you have the yuicompressor gem installed and working, it will be used
     # automatically to compress your javascript and css assets.  For javascript
     # assets, if yuicompressor is not available, the plugin will check for
-    # closure_compiler, uglifier, and minjs and use the first one that works.
+    # closure-compiler, uglifier, and minjs and use the first one that works.
     # If no compressors are available, the assets will just be concatenated
     # together and not compressed during compilation.  You can use the
     # :css_compressor and :js_compressor options to specify the compressor to use.

data/lib/roda/plugins/delete_empty_headers.rb

@@ -13,18 +13,18 @@ class Roda
       module ResponseMethods
         # Delete any empty headers when calling finish
         def finish
-          delelete_empty_headers(super)
+          delete_empty_headers(super)
         end
 
         # Delete any empty headers when calling finish_with_body
         def finish_with_body(_)
-          delelete_empty_headers(super)
+          delete_empty_headers(super)
         end
 
         private
 
         # Delete any empty headers from response
-        def delelete_empty_headers(res)
+        def delete_empty_headers(res)
           res[1].delete_if{|_, v| v.is_a?(String) && v.empty?}
           res
         end

data/lib/roda/plugins/mail_processor.rb

@@ -465,7 +465,11 @@ class Roda
             def #{field}(address, &block)
               on(:#{field}=>address, &block)
             end
+          END
+
+          next if [:rcpt, :text, :body, :subject].include?(field)
 
+          class_eval(<<-END, __FILE__, __LINE__+1)
             private
 
             def match_#{field}(address)
@@ -474,11 +478,6 @@ class Roda
           END
         end
 
-        undef_method :match_rcpt
-        undef_method :match_text
-        undef_method :match_body
-        undef_method :match_subject
-
         # Same as +header+, but also mark the message as being handled.
         def handle_header(key, value=nil)
           header(key, value) do |*args|

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 = 58
+  RodaMinorVersion = 59
 
   # 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.58.0
+  version: 3.59.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -230,6 +230,7 @@ extra_rdoc_files:
 - doc/release_notes/3.56.0.txt
 - doc/release_notes/3.57.0.txt
 - doc/release_notes/3.58.0.txt
+- doc/release_notes/3.59.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 - doc/release_notes/3.8.0.txt
@@ -295,6 +296,7 @@ files:
 - doc/release_notes/3.56.0.txt
 - doc/release_notes/3.57.0.txt
 - doc/release_notes/3.58.0.txt
+- doc/release_notes/3.59.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 - doc/release_notes/3.8.0.txt
@@ -306,6 +308,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_render_engines.rb
 - lib/roda/plugins/additional_view_directories.rb
 - lib/roda/plugins/all_verbs.rb
 - lib/roda/plugins/assets.rb