roda 3.54.0 → 3.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083b83c9271643842b60c7027b16a3ed2068fef54423b3a80dae73ffa991b0cf'
-  data.tar.gz: c2b9efd6155dd597f13e7167ce6ad6044f8692fb5dafa7994c1527c3a94f1641
+  metadata.gz: 1b862c4eb1dcca9fbbf0ccacc130779fdecf610a5a064ef94c17384d073e29dd
+  data.tar.gz: 1e9a991190a6572283350bf1941fca8b83f8496bc519156d5ec3cc5d613d2407
 SHA512:
-  metadata.gz: e33b2bc1b476bb103d380ac0b310e09640a0bdbce160c7307c92fba93b2dbb2f2a149b2ea3e1db65701354ab274d4d5cea03a7d813f9c81b271bb43d31915503
-  data.tar.gz: 9c3f7d67ed534f769ba453974b2dca02318a3330064d5f350ed6f8e0d25314513d884cddbaa6a0e0b9fae36b962fec659db050ced37e543201d4271099813eda
+  metadata.gz: 55fdc91ab21dbb1cf6884ee6b0384ef15db41f830d704ec6c445435ec76e302cb166f18c6f032390193c6d43d6922c7762d03768fd5c22188c3c7f937dc21d4a
+  data.tar.gz: d1272f1fc0e2707d2daf590ea71a4970ae2b133f0b4ba669e60296d6900422d3746bff8722d44eb636df5aefab0bd6b51382b88de1265924c4243322646335e7

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.55.0 (2022-04-12)
+
+* Allow passing blocks to the view method in the render plugin (jeremyevans) (#262)
+
+* Add :forward_response_headers middleware plugin option to use app headers as default for response (janko) (#259)
+
 = 3.54.0 (2022-03-14)
 
 * Make chunked plugin not use Transfer-Encoding: chunked by default (jeremyevans)

data/doc/release_notes/3.55.0.txt

@@ -0,0 +1,12 @@
+= New Features
+
+* A :forward_response_headers option has been added to the middleware
+  plugin, which uses the response headers added by the middleware
+  as default response headers even if the middleware does not handle
+  the response. Response headers set by the underlying application
+  take precedence over response headers set by the middleware.
+
+* The render plugin view method now accepts a block and will pass the
+  block to the underlying render method call.  This is useful for
+  rendering a template that yields inside of an existing layout.
+  Previously, you had to nest render calls to do that.

data/lib/roda/plugins/chunked.rb

@@ -215,7 +215,7 @@ class Roda
         # If chunking by default, call chunked if it hasn't yet been
         # called and chunking is not specifically disabled.
         def view(*a)
-          if opts[:chunk_by_default] && !defined?(@_chunked)
+          if opts[:chunk_by_default] && !defined?(@_chunked) && !defined?(yield)
             chunked(*a)
           else
             super

data/lib/roda/plugins/middleware.rb

@@ -73,11 +73,16 @@ class Roda
       #                   and rack response for all requests passing through the middleware,
       #                   after either the middleware or next app handles the request
       #                   and returns a response.
+      # :forward_response_headers :: Whether changes to the response headers made inside
+      #                              the middleware's route block should be applied to the
+      #                              final response when the request is forwarded to the app.
+      #                              Defaults to false.
       def self.configure(app, opts={}, &block)
         app.opts[:middleware_env_var] = opts[:env_var] if opts.has_key?(:env_var)
         app.opts[:middleware_env_var] ||= 'roda.forward_next'
         app.opts[:middleware_configure] = block if block
         app.opts[:middleware_handle_result] = opts[:handle_result]
+        app.opts[:middleware_forward_response_headers] = opts[:forward_response_headers]
       end
 
       # Forwarder instances are what is actually used as middleware.
@@ -108,6 +113,10 @@ class Roda
 
           if call_next
             res = @app.call(env)
+
+            if modified_headers = env.delete('roda.response_headers')
+              res[1] = modified_headers.merge(res[1])
+            end
           end
 
           if handle_result = @mid.opts[:middleware_handle_result]
@@ -135,7 +144,10 @@ class Roda
         def call(&block)
           super do |r|
             res = instance_exec(r, &block) # call Fallback
-            throw :next, true if r.forward_next
+            if r.forward_next
+              r.env['roda.response_headers'] = response.headers if opts[:middleware_forward_response_headers]
+              throw :next, true
+            end
             res
           end
         end
@@ -144,7 +156,10 @@ class Roda
         # that the next middleware is called.
         def _roda_run_main_route(r)
           res = super
-          throw :next, true if r.forward_next
+          if r.forward_next
+            r.env['roda.response_headers'] = response.headers if opts[:middleware_forward_response_headers]
+            throw :next, true
+          end
           res
         end
       end

data/lib/roda/plugins/render.rb

@@ -495,8 +495,10 @@ 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 = (content = _optimized_view_content(template); OPTS))
+        # and render it inside the layout.  Blocks passed to view
+        # are passed to render when rendering the template.
+        # See Render for details.
+        def view(template, opts = (content = _optimized_view_content(template) unless defined?(yield); OPTS), &block)
           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
@@ -516,7 +518,7 @@ class Roda
             end
           else
             opts = parse_template_opts(template, opts)
-            content = opts[:content] || render_template(opts)
+            content = opts[:content] || render_template(opts, &block)
           end
 
           if layout_opts  = view_layout_opts(opts)

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 = 54
+  RodaMinorVersion = 55
 
   # 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.54.0
+  version: 3.55.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -212,6 +212,7 @@ extra_rdoc_files:
 - doc/release_notes/3.52.0.txt
 - doc/release_notes/3.53.0.txt
 - doc/release_notes/3.54.0.txt
+- doc/release_notes/3.55.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 - doc/release_notes/3.8.0.txt
@@ -273,6 +274,7 @@ files:
 - doc/release_notes/3.52.0.txt
 - doc/release_notes/3.53.0.txt
 - doc/release_notes/3.54.0.txt
+- doc/release_notes/3.55.0.txt
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.7.0.txt
 - doc/release_notes/3.8.0.txt