roda 3.16.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64aa07cd8d8fff3df32bb1ddb87089eb0248db3b21d76eb9d851bcebe48276af
-  data.tar.gz: 8865bb77e86f9671c60cd67bfbceb5b38761a9a662719d28dae6f2768ad07827
+  metadata.gz: ea47f91d6b930ef7822fef3781ef11f959ace8f9e6a907f24481c5f797678482
+  data.tar.gz: 13b182e1651d996e1493078301888b6671dd91ea0516f441ad1bc59cba940d6d
 SHA512:
-  metadata.gz: 0c598bccca29ace44a814342f42e58c8fb81b0a445049281c334d00d9036fb2862db19438c61a288f6ec54d1ec65e2775719b81b3a7c42fa97f2e2dc09fe8895
-  data.tar.gz: 7c917b0ef0116b0fba649e3386c97f42e76316ed83601f405835fd46f13c43d5cd135292be236e0c1df75d206608075a150ce9fd3c407b77e129bbd69e379379
+  metadata.gz: 2bc04891739a93f46839abf14fd915b2f470e835e6c200fa1f8fd8a168cda13406c424fa0e1cc1eee5ce0e1e50b0dfbbe6440d27bec2112a2c6cf3dc83951ffc
+  data.tar.gz: 68a1ec7f9ead2ce2fda252d36c7edf0df3c53d1aa02a246669d8d0700afd65d1a010179be92c1973b9c511386df39e2b7d1fd041228add83d2ef344e9d49a475

data/CHANGELOG

@@ -1,3 +1,13 @@
+= 3.17.0 (2019-02-15)
+
+* Improve performance in the common case for RodaResponse#finish (jeremyevans)
+
+* Support before hooks in the hooks plugin in the mailer and mail_processor plugins (jeremyevans)
+
+* Allow set_layout_opts in view_options plugin to override layout if render plugin :layout option is given (jeremyevans)
+
+* Add route_block_args plugin to control which arguments are yielded to the route block (jeremyevans, chrisfrank) (#159)
+
 = 3.16.0 (2019-01-18)
 
 * Add mail_processor plugin for processing mail using a routing tree (jeremyevans)

data/doc/release_notes/3.17.0.txt

@@ -0,0 +1,62 @@
+= New Features
+
+* A route_block_args plugin has been added, allowing you to customize
+  which objects are yielded to the the route block. You call the
+  plugin with a block, which is evaluated in the context of the
+  instance and should return an array of arguments for the instance
+  to yield to the route block.
+  
+  To yield both the request and response objects, you can do:
+
+    plugin :route_block_args do |r|
+      [r, response]
+    end
+
+    route do |r, response|
+      # ...
+    end
+
+  In addition to the main route block, using this plugin also affects
+  the arguments passed to routing blocks in the following plugins:
+
+  * class_level_routing
+  * mailer
+  * mail_processor
+  * multi_route
+  * static_routing
+
+= Other Improvements
+
+* The set_layout_opts method in the view_options plugin can now
+  override the layout template even if the render plugin :layout
+  option is given.
+
+* The mailer and mail_processor plugin now integrate with the hooks
+  plugin to support before/after hooks.
+
+* Dispatching to the route block and RodaResponse#finish are both
+  slightly faster.
+
+* Internal before hook handling has been moved from an internal
+  plugin into the core, and modified so that if you are not using
+  the internal before hook in any plugin, there is no runtime cost.
+
+* The core now recognizes when plugins are using the internal after
+  hook, and automatically loads the internal plugin supporting the
+  after hook.
+
+= Backwards Compatibility
+
+* When using the render plugin with a :layout option, the render_opts
+  :layout option will be set to true if the layout is enabled.
+  Previously, the render_opts :layout option would retain the value
+  given as the plugin option.  Options for the layout (including the
+  template) are still available in the render_opts :layout_opts
+  option.  This change was made to fix the set_layout_opts bug in the
+  view_options plugin.
+
+* RodaResponse#initialize no longer sets the response status to nil
+  if it was already set.
+
+* RodaResponse#finish no longer sets the status on the receiver, it
+  just uses the receiver's status to set the rack response status.

data/lib/roda.rb

@@ -60,7 +60,9 @@ class Roda
   @inherit_middleware = true
   @middleware = []
   @opts = {}
+  @raw_route_block = nil
   @route_block = nil
+  @rack_app_route_block = nil
 
   # Module in which all Roda plugins should be stored. Also contains logic for
   # registering and loading plugins.
@@ -161,6 +163,15 @@ class Roda
           super
         end
 
+        # Rebuild the _roda_before and _roda_after methods whenever a plugin might
+        # have added a _roda_before_* or _roda_after_* method.
+        def include(*a)
+          res = super
+          def_roda_before
+          def_roda_after
+          res
+        end
+
         # When inheriting Roda, copy the shared data into the subclass,
         # and setup the request and response subclasses.
         def inherited(subclass)
@@ -174,8 +185,9 @@ class Roda
               subclass.opts[k] = v.dup
             end
           end
-          subclass.instance_variable_set(:@route_block, @route_block)
-          subclass.send(:build_rack_app)
+          if block = @raw_route_block
+            subclass.route(&block)
+          end
           
           request_class = Class.new(self::RodaRequest)
           request_class.roda_class = subclass
@@ -221,7 +233,9 @@ class Roda
         # This should only be called once per class, and if called multiple
         # times will overwrite the previous routing.
         def route(&block)
-          @route_block = block
+          @raw_route_block = block
+          @route_block = block = convert_route_block(block)
+          @rack_app_route_block = rack_app_route_block(block)
           build_rack_app
         end
 
@@ -238,8 +252,7 @@ class Roda
 
         # Build the rack app to use
         def build_rack_app
-          if block = @route_block
-            block = rack_app_route_block(block)
+          if block = @rack_app_route_block
             app = lambda{|env| new(env).call(&block)}
             @middleware.reverse_each do |args, bl|
               mid, *args = args
@@ -250,11 +263,54 @@ class Roda
           end
         end
 
-        # The route block to use when building the rack app.
+        # Modify the route block to use for any route block provided as input,
+        # which can include route blocks that are delegated to by the main route block.
         # Can be modified by plugins.
-        def rack_app_route_block(block)
+        def convert_route_block(block)
           block
         end
+
+        # Build a _roda_before method that calls each _roda_before_* method
+        # in order, if any _roda_before_* methods are defined. Also, rebuild
+        # the route block if a _roda_before method is defined.
+        def def_roda_before
+          meths = private_instance_methods.grep(/\A_roda_before_\d\d/).sort.join(';')
+          unless meths.empty?
+            class_eval("def _roda_before; #{meths} end", __FILE__, __LINE__)
+            private :_roda_before
+            if @raw_route_block
+              route(&@raw_route_block)
+            end
+          end
+        end
+
+        # Build a _roda_after method that calls each _roda_after_* method
+        # in order, if any _roda_after_* methods are defined. Also, use
+        # the internal after hook plugin if the _roda_after method is defined.
+        def def_roda_after
+          meths = private_instance_methods.grep(/\A_roda_after_\d\d/).sort.map{|s| "#{s}(res)"}.join(';')
+          unless meths.empty?
+            plugin :_after_hook unless private_method_defined?(:_roda_after)
+            class_eval("def _roda_after(res); #{meths} end", __FILE__, __LINE__)
+            private :_roda_after
+          end
+        end
+
+        # The route block to use when building the rack app (or other initial
+        # entry point to the route block).
+        # By default, modifies the rack app route block to support before hooks
+        # if any before hooks are defined.
+        # Can be modified by plugins.
+        def rack_app_route_block(block)
+          if private_method_defined?(:_roda_before)
+            lambda do |r|
+              _roda_before
+              instance_exec(r, &block)
+            end
+          else
+            block
+          end
+        end
       end
 
       # Instance methods for the Roda class.
@@ -936,7 +992,6 @@ class Roda
 
         # Set the default headers when creating a response.
         def initialize
-          @status  = nil
           @headers = {}
           @body    = []
           @length  = 0
@@ -986,14 +1041,18 @@ class Roda
         #   #      []]
         def finish
           b = @body
-          empty = b.empty?
-          s = (@status ||= empty ? 404 : default_status)
           set_default_headers
           h = @headers
 
-          if empty && (s == 304 || s == 204 || s == 205 || (s >= 100 && s <= 199))
-            h.delete("Content-Type")
+          if b.empty?
+            s = @status || 404
+            if (s == 304 || s == 204 || s == 205 || (s >= 100 && s <= 199))
+              h.delete("Content-Type")
+            else
+              h["Content-Length"] ||= '0'
+            end
           else
+            s = @status || default_status
             h["Content-Length"] ||= @length.to_s
           end
 

data/lib/roda/plugins/_after_hook.rb

@@ -7,19 +7,10 @@ class Roda
     # Allows for plugins to configure the order in which
     # after processing is done by using _roda_after_*
     # private instance methods that are called in sorted order.
+    # Loaded automatically by the base library if any _roda_after_*
+    # methods are defined.
     module AfterHook # :nodoc:
-      module ClassMethods
-        # Rebuild the _roda_after method whenever a plugin might
-        # have added a _roda_after_* method.
-        def include(*)
-          res = super
-          meths = private_instance_methods.grep(/\A_roda_after_\d\d/).sort.map{|s| "#{s}(res)"}.join(';')
-          class_eval("def _roda_after(res); #{meths} end", __FILE__, __LINE__)
-          private :_roda_after
-          res
-        end
-      end
-
+      # Module for internal after hook support.
       module InstanceMethods
         # Run internal after hooks with the response
         def call
@@ -27,6 +18,13 @@ class Roda
         ensure
           _roda_after(res)
         end
+
+        private
+
+        # Empty roda_after method, so nothing breaks if the module is included.
+        # This method will be overridden in most classes using this module.
+        def _roda_after(res)
+        end
       end
     end
 

data/lib/roda/plugins/_before_hook.rb

@@ -3,47 +3,9 @@
 #
 class Roda
   module RodaPlugins
-    # Internal before hook module, not for external use.
-    # Allows for plugins to configure the order in which
-    # before processing is done by using _roda_before_*
-    # private instance methods that are called in sorted order.
+    # Deprecated plugin, only exists for backwards compatibility.
+    # Features are now part of base library.
     module BeforeHook # :nodoc:
-      # Rebuild the rack app if the rack app already exists,
-      # so the before hooks are setup inside the rack app
-      # route block.
-      def self.configure(app)
-        app.instance_exec do
-          build_rack_app if @app
-        end
-      end
-
-      module ClassMethods
-        # Rebuild the _roda_before method whenever a plugin might
-        # have added a _roda_before_* method.
-        def include(*a)
-          res = super
-          def_roda_before
-          res
-        end
-
-        private
-
-        # Build a _roda_before method that calls each _roda_before_* method
-        # in order.
-        def def_roda_before
-          meths = private_instance_methods.grep(/\A_roda_before_\d\d/).sort.join(';')
-          class_eval("def _roda_before; #{meths} end", __FILE__, __LINE__)
-          private :_roda_before
-        end
-
-        # Modify rack app route block to use before hook.
-        def rack_app_route_block(block)
-          lambda do |r|
-            _roda_before
-            instance_exec(r, &block)
-          end
-        end
-      end
     end
 
     register_plugin(:_before_hook, BeforeHook)

data/lib/roda/plugins/class_level_routing.rb

@@ -52,10 +52,6 @@ class Roda
     # the normal +route+ class method to define your routing tree.  This plugin does make it simpler to
     # add additional routes after the routing tree has already been defined, though.
     module ClassLevelRouting
-      def self.load_dependencies(app)
-        app.plugin :_after_hook
-      end
-
       # Initialize the class_routes array when the plugin is loaded.  Also, if the application doesn't
       # currently have a routing block, setup an empty routing block so that things will still work if
       # a routing block isn't added.
@@ -68,7 +64,7 @@ class Roda
         # Define routing methods that will store class level routes.
         [:root, :on, :is, :get, :post, :delete, :head, :options, :link, :patch, :put, :trace, :unlink].each do |meth|
           define_method(meth) do |*args, &block|
-            opts[:class_level_routes] << [meth, args, block].freeze
+            opts[:class_level_routes] << [meth, args, convert_route_block(block)].freeze
           end
         end
 
@@ -94,6 +90,7 @@ class Roda
             # Reset the response so it doesn't inherit the status or any headers from
             # the original response.
             @_response.send(:initialize)
+            @_response.status = nil
             result.replace(_call do |r|
               opts[:class_level_routes].each do |meth, args, blk|
                 r.instance_variable_set(:@remaining_path, @_original_remaining_path)

data/lib/roda/plugins/common_logger.rb

@@ -19,11 +19,6 @@ class Roda
     #   plugin :common_logger, $stdout
     #   plugin :common_logger, Logger.new('filename')
     module CommonLogger
-      def self.load_dependencies(app, _=nil)
-        app.plugin :_after_hook
-        app.plugin :_before_hook
-      end
-
       def self.configure(app, logger=nil)
         app.opts[:common_logger] = logger || app.opts[:common_logger] || $stderr
         app.opts[:common_logger_meth] = app.opts[:common_logger].method(logger.respond_to?(:write) ? :write : :<<)

data/lib/roda/plugins/flash.rb

@@ -36,10 +36,6 @@ class Roda
     #     flash['a'] # = >'b'
     #   end
     module Flash
-      def self.load_dependencies(app)
-        app.plugin :_after_hook
-      end
-
       # Simple flash hash, where assiging to the hash updates the flash
       # used in the following request.
       class FlashHash < DelegateClass(Hash)

data/lib/roda/plugins/head.rb

@@ -37,10 +37,6 @@ class Roda
     # this plugin those HEAD requests will return a 404 status, which
     # may prevent search engines from crawling your website.
     module Head
-      def self.load_dependencies(app)
-        app.plugin :_after_hook
-      end
-
       # used to ensure proper resource release on HEAD requests
       # we do not respond to a to_path method, here.
       class CloseLater

data/lib/roda/plugins/heartbeat.rb

@@ -16,10 +16,6 @@ class Roda
     module Heartbeat
       HEARTBEAT_RESPONSE = [200, {'Content-Type'=>'text/plain'}.freeze, ['OK'.freeze].freeze].freeze
 
-      def self.load_dependencies(app, opts=OPTS)
-        app.plugin :_before_hook
-      end
-
       # Set the heartbeat path to the given path.
       def self.configure(app, opts=OPTS)
         app.opts[:heartbeat_path] = (opts[:path] || app.opts[:heartbeat_path] || "/heartbeat").dup.freeze

data/lib/roda/plugins/hooks.rb

@@ -33,11 +33,6 @@ class Roda
     # an after block will not affect the returned status. Note that after
     # hooks can be called with nil if an exception is raised during routing.
     module Hooks
-      def self.load_dependencies(app)
-        app.plugin :_before_hook
-        app.plugin :_after_hook
-      end
-
       def self.configure(app)
         app.opts[:before_hook] ||= nil
         app.opts[:after_hook] ||= nil

data/lib/roda/plugins/mail_processor.rb

@@ -301,7 +301,7 @@ class Roda
 
           begin
             begin
-              scope.process_mail(&route_block)
+              scope.process_mail(&@rack_app_route_block)
             rescue UnhandledMail
               scope.unhandled_mail_hook
             else

data/lib/roda/plugins/mailer.rb

@@ -140,7 +140,7 @@ class Roda
         def mail(path, *args)
           mail = ::Mail.new
           catch(:no_mail) do
-            unless mail.equal?(new("PATH_INFO"=>path, 'SCRIPT_NAME'=>'', "REQUEST_METHOD"=>"MAIL", 'rack.input'=>StringIO.new, 'roda.mail'=>mail, 'roda.mail_args'=>args).call(&route_block))
+            unless mail.equal?(new("PATH_INFO"=>path, 'SCRIPT_NAME'=>'', "REQUEST_METHOD"=>"MAIL", 'rack.input'=>StringIO.new, 'roda.mail'=>mail, 'roda.mail_args'=>args).call(&@rack_app_route_block))
               raise Error, "route did not return mail instance for #{path.inspect}, #{args.inspect}"
             end
             mail

data/lib/roda/plugins/multi_route.rb

@@ -170,7 +170,7 @@ class Roda
         def route(name=nil, namespace=nil, &block)
           if name
             opts[:namespaced_routes][namespace] ||= {}
-            opts[:namespaced_routes][namespace][name] = block
+            opts[:namespaced_routes][namespace][name] = convert_route_block(block)
             self::RodaRequest.clear_named_route_regexp!(namespace)
           else
             super(&block)

data/lib/roda/plugins/render.rb

@@ -169,7 +169,7 @@ class Roda
         end
 
         if layout = opts.fetch(:layout, true)
-          opts[:layout] = true unless opts.has_key?(:layout)
+          opts[:layout] = true
 
           case layout
           when Hash

data/lib/roda/plugins/route_block_args.rb

@@ -0,0 +1,49 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The route_block_args plugin lets you customize what arguments are passed to
+    # the +route+ block.  So if you have an application that always needs access
+    # to the +response+, the +params+, the +env+, or the +session+, you can use
+    # this plugin so that any of those can be arguments to the route block.
+    # Example:
+    #
+    #   class App < Roda
+    #     plugin :route_block_args do
+    #       [request, request.params, response]
+    #     end
+    #
+    #     route do |r, params, res|
+    #       r.post do
+    #         artist = Artist.create(name: params['name'].to_s)
+    #         res.status = 201
+    #         artist.id.to_s
+    #       end
+    #     end
+    #   end
+    module RouteBlockArgs
+      def self.configure(app, &block)
+        app.instance_exec do 
+          opts[:route_block_args] = block
+          route(&@raw_route_block) if @raw_route_block
+        end
+      end
+
+      # Override the route block input so that the block
+      # given is passed the arguments specified by the
+      # block given to the route_block_args plugin.
+      module ClassMethods
+        private
+
+        def convert_route_block(block)
+          proc do |r|
+            instance_exec(*instance_exec(&opts[:route_block_args]), &block)
+          end
+        end
+      end
+    end
+
+    register_plugin :route_block_args, RouteBlockArgs
+  end
+end

data/lib/roda/plugins/sessions.rb

@@ -148,10 +148,6 @@ class Roda
       class CookieTooLarge < RodaError
       end
 
-      def self.load_dependencies(app, opts=OPTS)
-        app.plugin :_after_hook
-      end
-
       # Split given secret into a cipher secret and an hmac secret.
       def self.split_secret(name, secret)
         raise RodaError, "sessions plugin :#{name} option must be a String" unless secret.is_a?(String)

data/lib/roda/plugins/static_routing.rb

@@ -49,10 +49,6 @@ class Roda
     # static_route block to have shared behavior for different request methods,
     # while still handling the request methods differently.
     module StaticRouting
-      def self.load_dependencies(app)
-        app.plugin :_before_hook
-      end
-
       def self.configure(app)
         app.opts[:static_routes] = {}
       end
@@ -100,7 +96,7 @@ class Roda
 
         # Add a static route for the given method.
         def add_static_route(method, path, &block)
-          (opts[:static_routes][path] ||= {})[method] = block
+          (opts[:static_routes][path] ||= {})[method] = convert_route_block(block)
         end
       end
 

data/lib/roda/plugins/status_handler.rb

@@ -23,10 +23,6 @@ class Roda
     # cleared.  So if you want to be sure the headers are set even in your block,
     # you need to reset them in the block.
     module StatusHandler
-      def self.load_dependencies(app)
-        app.plugin :_after_hook
-      end
-
       def self.configure(app)
         app.opts[:status_handler] ||= {}
       end
@@ -50,7 +46,9 @@ class Roda
         # If routing returns a response we have a handler for, call that handler.
         def _roda_after_20__status_handler(result)
           if result && (block = opts[:status_handler][result[0]]) && (v = result[2]).is_a?(Array) && v.empty?
-            @_response.headers.clear
+            res = @_response
+            res.headers.clear
+            res.status = result[0]
             result.replace(_call(&block))
           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 = 16
+  RodaMinorVersion = 17
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/spec/plugin/_after_hook_spec.rb

@@ -0,0 +1,19 @@
+require_relative "../spec_helper"
+
+describe "deprecated _after_hook plugin" do 
+  it "shouldn't break things" do
+    x = []
+    app(:_after_hook) do |r|
+      x << 0
+      'a'
+    end
+    @app.send(:include, Module.new do
+      define_method(:_roda_after_00_test){|_| x << 1}
+      private :_roda_after_00_test
+    end)
+
+    body.must_equal 'a'
+    x.must_equal [0, 1]
+  end
+end
+

data/spec/plugin/class_level_routing_spec.rb

@@ -161,4 +161,31 @@ describe "class_level_routing plugin" do
 
     proc{app.on{}}.must_raise
   end
+
+  it 'works with route_block_args plugin' do
+    app(:bare) do 
+      plugin :class_level_routing
+      plugin :route_block_args do
+        [request.path]
+      end
+
+      root do |path|
+        "root-#{path}"
+      end
+
+      get do |path|
+        "GET-#{path}"
+      end
+
+      route do |path|
+        request.get('foo') do
+          path
+        end
+      end
+    end
+
+    body.must_equal 'root-/'
+    body('/a').must_equal 'GET-/a'
+    body('/foo').must_equal '/foo'
+  end
 end

data/spec/plugin/mail_processor_spec.rb

@@ -398,5 +398,54 @@ describe "mail_processor plugin" do
     check{app.process_mail(new_mail{|m| m.body "Found bar\n--\nFound foo"})}.must_equal [:f, 'foo']
     check{app.process_mail(new_mail{|m| m.body "> Found baz\nFound quux"})}.must_equal [:f2, 'quux', "Found quux"]
   end
+
+  it "works with route_block_args plugin" do
+    @processed = processed = []
+    app(:bare) do
+      plugin :mail_processor
+      plugin :route_block_args do
+        [to, from]
+      end
+      route do |t, f|
+        request.handle do
+          processed << t << f
+        end
+      end
+      handled_mail do
+#      processed << :h << mail.to.first
+      end
+    end
+    check{app.process_mail(new_mail)}.must_equal [["a@example.com"], ["b@example.com"]]
+  end
+
+  it "works with hooks plugin, calling after hook before *_mail hooks" do
+    @processed = processed = []
+    app(:bare) do
+      plugin :mail_processor
+      plugin :hooks
+      before do 
+        processed << 1
+      end
+      after do
+        processed << 2
+      end
+      route do |r|
+        processed << 3
+        r.handle_to('a@example.com') do
+        end
+      end
+      handled_mail do
+        processed << 4
+      end
+      unhandled_mail do
+        processed << 5
+      end
+      after_mail do
+        processed << 6
+      end
+    end
+    check{app.process_mail(new_mail)}.must_equal [1, 3, 2, 4, 6]
+    check{app.process_mail(new_mail{|m| m.to 'x@example.com'})}.must_equal [1, 3, 2, 5, 6]
+  end
 end
 end

data/spec/plugin/mailer_spec.rb

@@ -244,5 +244,39 @@ describe "mailer plugin" do
     m.parts.last.content_type.must_match(/\Atext\/css/)
     m.parts.last.body.decoded.gsub("\r\n", "\n").must_equal File.read('spec/assets/css/raw.css')
   end
+
+  it "works with route_block_args plugin" do
+    app(:bare) do
+      plugin :mailer
+      plugin :route_block_args do
+        [request.path]
+      end
+      route do |path|
+        path
+      end
+    end
+    app.mail('/').body.decoded.must_equal '/'
+    app.mail('/foo').body.decoded.must_equal '/foo'
+  end
+
+  it "works with hooks plugin" do
+    x = []
+    app(:bare) do
+      plugin :mailer
+      plugin :hooks
+      before do 
+        x << 1
+      end
+      after do
+        x << 2
+      end
+      route do
+        x << 3
+        ''
+      end
+    end
+    app.mail('/').body.decoded.must_equal ''
+    x.must_equal [1, 3, 2]
+  end
 end
 end

data/spec/plugin/multi_route_spec.rb

@@ -234,27 +234,23 @@ describe "multi_route plugin" do
   end
 
   it "handles namespaces in r.multi_route" do
-    app.route("foo") do |r|
-      @p = 'f'
-      r.multi_route("foo")
-      @p
+    app(:multi_route) do |path|
+      request.multi_route
+      path
     end
-
-    app.route("bar") do |r|
-      @p = 'b'
-      r.multi_route("bar")
-      @p
+    app.plugin :route_block_args do
+      [request.path, request]
     end
-
-    app.route do |r|
-      r.multi_route
+    app.route("foo") do |path, r|
+      r.multi_route("foo")
+      "f-#{path}" 
+    end
+    app.route("bar", "foo") do |path|
+      "b-#{path}" 
     end
 
-    body('/foo').must_equal 'f'
-    body('/foo/foo').must_equal 'fff'
-    body('/foo/bar').must_equal 'ffb'
-    body('/bar').must_equal 'b'
-    body('/bar/foo').must_equal 'bbf'
-    body('/bar/bar').must_equal 'bbb'
+    body.must_equal '/'
+    body('/foo').must_equal 'f-/foo'
+    body('/foo/bar').must_equal 'b-/foo/bar'
   end
 end

data/spec/plugin/render_spec.rb

@@ -515,9 +515,9 @@ describe "render plugin" do
 
   it "render plugin call should not override existing options" do
     c = Class.new(Roda)
-    c.plugin :render, :layout=>:foo
+    c.plugin :render, :layout_opts=>{:template=>'foo'}
     c.plugin :render
-    c.render_opts[:layout].must_equal :foo
+    c.render_opts[:layout_opts][:template].must_equal 'foo'
   end
 
   it "should not use cache by default in subclass if not caching by default in superclass" do

data/spec/plugin/route_block_args_spec.rb

@@ -0,0 +1,86 @@
+require_relative "../spec_helper"
+
+describe "route_block_args plugin" do
+  it "works with hooks when loaded last" do
+    a = []
+    app(:bare) do
+      plugin :hooks
+      before { a << 1 }
+      after { a << 2 }
+      plugin :route_block_args do
+        [request, response]
+      end
+      route do |req, res|
+        response.status = 401
+        a << req.path << res.status
+        "1"
+      end
+    end
+    body.must_equal "1"
+    a.must_equal [1, '/', 401, 2]
+  end
+
+  it "works with hooks when loaded first" do
+    a = []
+    app(:bare) do
+      plugin :route_block_args do
+        [request, response]
+      end
+      plugin :hooks
+      before { a << 1 }
+      after { a << 2 }
+      route do |req, res|
+        response.status = 401
+        a << req.path << res.status
+        "1"
+      end
+    end
+    body.must_equal "1"
+    a.must_equal [1, '/', 401, 2]
+  end
+
+  it "still supports a single route block argument" do
+    app(:bare) do
+      plugin :route_block_args do
+        request
+      end
+      route { |r| "OK" }
+    end
+
+    status('/').must_equal(200)
+  end
+
+  it "supports many route block arguments" do
+    app(:bare) do
+      plugin :route_block_args do
+        [request.params, request.env, response.headers, response.body]
+      end
+      route do |p, e, h, b|
+        h['Foo'] = 'Bar'
+        b << "#{p['a']}-#{e['B']}"
+        "x"
+      end
+    end
+
+    header('Foo', 'rack.input'=>StringIO.new).must_equal('Bar')
+    body('rack.input'=>StringIO.new).must_equal('-')
+    body('QUERY_STRING'=>'a=c', 'B'=>'D', 'rack.input'=>StringIO.new).must_equal('c-D')
+  end
+
+  it "works if given after the route block" do
+    app(:bare) do
+      route do |p, e, h, b|
+        h['Foo'] = 'Bar'
+        b << "#{p['a']}-#{e['B']}"
+        "x"
+      end
+      plugin :route_block_args do
+        [request.params, request.env, response.headers, response.body]
+      end
+    end
+
+    header('Foo', 'rack.input'=>StringIO.new).must_equal('Bar')
+    body('rack.input'=>StringIO.new).must_equal('-')
+    body('QUERY_STRING'=>'a=c', 'B'=>'D', 'rack.input'=>StringIO.new).must_equal('c-D')
+  end
+end

data/spec/plugin/static_routing_spec.rb

@@ -145,4 +145,26 @@ describe "static_routing plugin" do
       end.must_raise
     end
   end
+
+  it 'works with route_block_args plugin' do
+    app(:bare) do 
+      plugin :static_routing
+      plugin :route_block_args do
+        [request.request_method, request.path]
+      end
+      
+      static_route "/foo" do |meth, path|
+        "#{path}-#{meth}"
+      end
+
+      static_get "/bar" do |meth, path|
+        "#{path}-#{meth}-bar"
+      end
+
+      route{'a'}
+    end
+
+    body('/foo').must_equal '/foo-GET'
+    body('/bar').must_equal '/bar-GET-bar'
+  end
 end

data/spec/plugin/view_options_spec.rb

@@ -60,6 +60,50 @@ describe "view_options plugin" do
     body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Subdir: About Roda</h1>"
   end
 
+  it "should allow overriding :layout plugin option with set_layout_options :template" do
+    app(:bare) do
+      plugin :render, :views=>'spec/views', :allowed_paths=>['spec/views']
+      plugin :view_options
+
+      route do
+        set_view_options :views=>'spec/views/about'
+        set_layout_options :template=>'layout-alternative'
+        view('_test', :locals=>{:title=>'About Roda'}, :layout_opts=>{:locals=>{:title=>'Home'}})
+      end
+    end
+
+    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Subdir: About Roda</h1>"
+  end
+
+  it "should allow overriding :layout_opts :template plugin option with set_layout_options :template" do
+    app(:bare) do
+      plugin :render, :views=>'spec/views', :allowed_paths=>['spec/views'], :layout_opts=>{:template=>'layout'}
+      plugin :view_options
+
+      route do
+        set_view_options :views=>'spec/views/about', :layout=>'layout-alternative'
+        set_layout_options :template=>'layout-alternative'
+        view('_test', :locals=>{:title=>'About Roda'}, :layout_opts=>{:locals=>{:title=>'Home'}})
+      end
+    end
+
+    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Subdir: About Roda</h1>"
+  end
+
+  it "should allow overriding :layout plugin option with set_view_options :layout" do
+    app(:bare) do
+      plugin :render, :views=>'spec/views', :allowed_paths=>['spec/views'], :layout=>'layout'
+      plugin :view_options
+
+      route do
+        set_view_options :views=>'spec/views/about', :layout=>'layout-alternative'
+        view('_test', :locals=>{:title=>'About Roda'}, :layout_opts=>{:locals=>{:title=>'Home'}})
+      end
+    end
+
+    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Subdir: About Roda</h1>"
+  end
+
   it "should set view and layout options to use" do
     app(:bare) do
       plugin :render, :allowed_paths=>['spec/views']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -213,6 +213,7 @@ extra_rdoc_files:
 - doc/release_notes/3.14.1.txt
 - doc/release_notes/3.15.0.txt
 - doc/release_notes/3.16.0.txt
+- doc/release_notes/3.17.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -264,6 +265,7 @@ files:
 - doc/release_notes/3.14.1.txt
 - doc/release_notes/3.15.0.txt
 - doc/release_notes/3.16.0.txt
+- doc/release_notes/3.17.0.txt
 - doc/release_notes/3.2.0.txt
 - doc/release_notes/3.3.0.txt
 - doc/release_notes/3.4.0.txt
@@ -345,6 +347,7 @@ files:
 - lib/roda/plugins/request_aref.rb
 - lib/roda/plugins/request_headers.rb
 - lib/roda/plugins/response_request.rb
+- lib/roda/plugins/route_block_args.rb
 - lib/roda/plugins/route_csrf.rb
 - lib/roda/plugins/run_append_slash.rb
 - lib/roda/plugins/run_handler.rb
@@ -379,6 +382,7 @@ files:
 - spec/integration_spec.rb
 - spec/matchers_spec.rb
 - spec/opts_spec.rb
+- spec/plugin/_after_hook_spec.rb
 - spec/plugin/all_verbs_spec.rb
 - spec/plugin/assets_preloading_spec.rb
 - spec/plugin/assets_spec.rb
@@ -448,6 +452,7 @@ files:
 - spec/plugin/request_aref_spec.rb
 - spec/plugin/request_headers_spec.rb
 - spec/plugin/response_request_spec.rb
+- spec/plugin/route_block_args_spec.rb
 - spec/plugin/route_csrf_spec.rb
 - spec/plugin/run_append_slash_spec.rb
 - spec/plugin/run_handler_spec.rb