roda 3.40.0 → 3.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e87645db18482f3ad97d106e268d76b2567d074490f37d7e99d52d06e4e5483
-  data.tar.gz: b84b082c2f27fcbd31254cb80de5e6610b7417e722eaf3dc3d8753a4604a0701
+  metadata.gz: f09e850b5f4ee0406c5686317145571fa0bc5e8158b0b39c5161bb9a3cbb3878
+  data.tar.gz: d839bbfa3ff4e7ef4a37501a46ce65c12425dc620ccbdf9aae174a059898aa84
 SHA512:
-  metadata.gz: 3b21d6fa4b33c029a8b23a8ec437e70e2799e3f2bec27239d3cbfc5a1a4bb8cd82fc95309ad27d22243695298535b02687b0948218df1f7a1a0812242079e3b7
-  data.tar.gz: 3dc9629b16a4d9f496cee61bc40396f6893bfe114666ba7554327cd052946719410e2f4e89a27388cea291fd7b5ba1bcd37c669aa1dfc7b64c48a6622bafb013
+  metadata.gz: dee1ec11e6ca9ca18f74fedf260f10e25e9c49efa3297ca2df02aab02efa6282464dd88f0f1f79e3529c8c56239749c72779d8bfb7fbf8508b40047470e4f6f6
+  data.tar.gz: c7b4d4e1d4cdf7f60707621a57cfdd6a622ef91f6d6724abd1b344fc18b59ab4271ee7536513417023c20c3f470cac73c94ff50675661162d6ec1e62df02cd70

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.41.0 (2021-02-17)
+
+* Improve view performance with :content option up to 3x by calling compiled template methods directly (jeremyevans)
+
 = 3.40.0 (2021-01-14)
 
 * Add freeze_template_caches! to the precompile_templates plugin, which ensures all templates are precompiled, and speeds up template access (jeremyevans)

data/doc/release_notes/3.41.0.txt

@@ -0,0 +1,9 @@
+= Improvements
+
+* The performance of the render plugin's view method when passed the
+  :content option and no other options or arguments has been improved
+  by about 3x, by calling compiled template methods directly.
+
+* The compiled template method for the layout is cleared when the
+  render plugin is loaded again, which can fix issues when it is
+  loaded with different options that affect the layout.

data/lib/roda/plugins/render.rb

@@ -183,6 +183,7 @@ class Roda
           app.const_set(:RodaCompiledTemplates, compiled_templates_module)
         end
         opts[:template_method_cache] = orig_method_cache || (opts[:cache_class] || RodaCache).new
+        opts[:template_method_cache][:_roda_layout] = nil if opts[:template_method_cache][:_roda_layout]
         opts[:cache] = orig_cache || (opts[:cache_class] || RodaCache).new
 
         opts[:layout_opts] = (opts[:layout_opts] || {}).dup
@@ -415,10 +416,8 @@ class Roda
         # Render the given template.  If there is a default layout
         # for the class, take the result of the template rendering
         # and render it inside the layout.  See Render for details.
-        def view(template, opts = (optimized_template = _cached_template_method(template); OPTS))
-          if optimized_template
-            content = send(optimized_template, OPTS)
-
+        def view(template, opts = (content = _optimized_view_content(template); OPTS))
+          if content
             # First, check if the optimized layout method has already been created,
             # and use it if so.  This way avoids the extra conditional and local variable
             # assignments in the next section.
@@ -518,6 +517,16 @@ class Roda
               end
             end
           end
+
+          # Get the content for #view, or return nil to use the unoptimized approach. Only called if
+          # a single argument is passed to view.
+          def _optimized_view_content(template)
+            if optimized_template = _cached_template_method(template)
+              send(optimized_template, OPTS)
+            elsif template.is_a?(Hash) && template.length == 1
+              template[:content]
+            end
+          end
         else
           # :nocov:
           def _cached_template_method(_)
@@ -535,6 +544,10 @@ class Roda
           def _optimized_render_method_for_locals(_, _)
             nil
           end
+
+          def _optimized_view_content(template)
+            nil
+          end
           # :nocov:
         end
 

data/lib/roda/plugins/render_locals.rb

@@ -51,6 +51,10 @@ class Roda
           def _cached_template_method(template)
             nil
           end
+
+          def _optimized_view_content(template)
+            nil
+          end
         end
 
         def render_locals

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 = 40
+  RodaMinorVersion = 41
 
   # 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.40.0
+  version: 3.41.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -211,6 +211,7 @@ extra_rdoc_files:
 - doc/release_notes/3.39.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.40.0.txt
+- doc/release_notes/3.41.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
@@ -258,6 +259,7 @@ files:
 - doc/release_notes/3.39.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.40.0.txt
+- doc/release_notes/3.41.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt