roda 2.21.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6b3cac6d9da3a5df41af141588ad921d4708d8
-  data.tar.gz: 345a82534b2994081e0fde6e7e9552d1d28af295
+  metadata.gz: 6bf01ef06d46bc9ee153b2b737b44a19b6dc8e3f
+  data.tar.gz: 32979a928ec7cc15994b5c1a937b8601946f6451
 SHA512:
-  metadata.gz: 44fa6264003e578c1d694737d9658d9b78a7d26274542ddc1fe8057e42684cd2f6dae884cccda81ddcebf0e76310f3ee9b5f283fe48cafd4c5256bb529b0a0b7
-  data.tar.gz: d3b536a7846bd36832d58968192f2bc031215dae669eb09b8351d135aa3ccaffa195032dd429315d40b564c5b61f1e9540678637c6ef57db351e9a8b1c5cfc3c
+  metadata.gz: d730f1511a4c437b8f5bc8e3df705a2286703277ab22a985e9d331de934c8c30810f657fe06510b928f731086d824fdbd2b1996833751085fef898ecd540507d
+  data.tar.gz: 39d8d2b3c9b26f610d212b00ce087973030d17a1aadc0867baf0a613a1dfb9d1f54a8bc1792dad30802dcc305b1850cfab8a67052591c5699926389ab90ca591

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 2.22.0 (2017-01-20)
+
+* Add support for :verbatim_string_matcher option, for making all string matchers match verbatim (jeremyevans)
+
+* Add support for :unsupported_matcher => :raise option, for raising on unsupported matcher values (jeremyevans)
+
+* Add support for :unsupported_block_result => :raise option, for raising on unsupported route/match block return values (jeremyevans)
+
 = 2.21.0 (2016-12-16)
 
 * Add handle_stream_error method to streaming plugin, for handling errors when using stream(:loop=>true) (jeremyevans)

data/README.rdoc

@@ -56,8 +56,6 @@ Here's a simple application, showing how the routing tree works:
   require "roda"
 
   class App < Roda
-    use Rack::Session::Cookie, :secret => ENV['SECRET']
-
     route do |r|
       # GET / request
       r.root do
@@ -95,9 +93,6 @@ Here's a simple application, showing how the routing tree works:
 
 Here's a breakdown of what is going on in the block above:
 
-After requiring the library and subclassing Roda, the +use+ method is called.
-This loads a Rack middleware into the current application.
-
 The +route+ block is called whenever a new request comes in. 
 It is yielded an instance of a subclass of <tt>Rack::Request</tt>
 with some additional methods for matching routes.
@@ -232,12 +227,12 @@ Here's an example showcasing how different matchers work:
       end
 
       # GET /post/2011/02/16/hello
-      r.get "post/:y/:m/:d/:slug" do |y, m, d, slug|
+      r.get "post", :y, :m, :d, :slug do |y, m, d, slug|
         "#{y}-#{m}-#{d} #{slug}" #=> "2011-02-16 hello"
       end
 
       # GET /username/foobar branch
-      r.on "username/:username", :method=>:get do |username|
+      r.on "username", :username, :method=>:get do |username|
         user = User.find_by_username(username)
 
         # GET /username/foobar/posts
@@ -290,9 +285,9 @@ If a string contains any slashes, it matches one additional segment for each sla
   "foo/bar" # matches "/foo/bar"
   "foo/bar" # does not match "/foo/bard"
 
-If a string contains a colon followed by any <tt>\\w</tt> characters,
-the colon and remaining <tt>\\w</tt> characters match any nonempty segment
-that contains at least one character:
+For backwards compatibility, if a string contains a colon followed by any
+<tt>\\w</tt> characters, the colon and remaining <tt>\\w</tt> characters match any
+nonempty segment that contains at least one character:
 
   "foo/:id" # matches "/foo/bar", "/foo/baz", etc.
   "foo/:id" # does not match "/fo/bar"
@@ -302,22 +297,17 @@ You can use multiple colons in a string:
   ":x/:y" # matches "/foo/bar", "/bar/foo" etc.
   ":x/:y" # does not match "/foo", "/bar/"
 
-You can prefix colons:
-
-  "foo:x/bar:y" # matches "/food/bard", "/fool/bart", etc.
-  "foo:x/bar:y" # does not match "/foo/bart", "/fool/bar", etc.
-
-If any colons are used, the block will yield one argument
-for each segment matched containing the matched text, so:
-
-  "foo:x/:y" # matching "/fool/bar" yields "l", "bar"
+Note that instead of using colons in strings, it is recommended to use separate
+symbol arguments, as it is faster and simpler:
 
-Colons that are not followed by a <tt>\\w</tt> character are matched literally:
+  "foo", :id # instead of "foo/:id"
+  :x, :y     # instead of ":x/:y"
 
-  ":/a" # matches "/:/a"
+It is possible in future versions of Roda, colons will not be treated specially
+in strings, and will just match a literal colon character.
 
-Note that other than colons, strings do no handle regular expression syntax, the
-string is matched verbatim:
+Note that other than colons followed by a <tt>\\w</tt> character, strings do no
+handle regular expression syntax, they are matched verbatim:
 
   "\\d+(/\\w+)?" # matches "/\d+(/\w+)?"
   "\\d+(/\\w+)?" # does not match "/123/abc"
@@ -641,12 +631,28 @@ The plugins that ship with Roda freeze their settings and only allow modificatio
 to their settings by reloading the plugin, and external plugins are encouraged
 to follow this approach.
 
-The following options are respected by multiple plugins:
+The following options are respected by the default library or multiple plugins:
 
 :add_script_name :: Prepend the SCRIPT_NAME for the request to paths.  This is
                     useful if you mount the app as a path under another app.
 :root :: Set the root path for the app.  This defaults to the current working
          directory of the process.
+:unsupported_block_result :: If set to :raise, raises an error if a match or
+                             route block returns an object that is not handled.
+                             By default, String, nil, and false are handled,
+                             and other types can be handled via plugins. Setting
+                             this option can alert you to possible issues in your
+                             application.
+:unsupported_matcher :: If set to :raise, raises an error if a matcher is used that
+                        is not handled.  By default, String, Symbol, Regexp, Hash,
+                        Array, Proc, true, false, and nil are handled.  Setting
+                        this option can alert you to possible issues in your
+                        application.
+:verbatim_string_matcher :: If set to true, makes all string matchers match
+                            verbatim strings, disallowing the use of colons
+                            for placeholders.  In general, it is recommended
+                            to use separate symbol matchers instead of
+                            embedding placeholders in string matchers.
 
 There may be other options supported by individual plugins, if so it will be
 mentioned in the documentation for the plugin.

data/doc/release_notes/2.22.0.txt

@@ -0,0 +1,41 @@
+= New Features
+
+* An :unsupported_block_result => :raise option is now supported
+  for Roda applications.  This will raise a RodaError if an
+  unsupported value is returned from a match block or the
+  route block.  This can make it easier to discover potential
+  problems in the routing tree.  This option may become the
+  default behavior in Roda 3.
+
+* An :unsupported_matcher => :raise option is now supported for
+  Roda applications.  This will raise a RodaError if you use an
+  unsupported value as a matcher.  This can make it easier to
+  discover potential problems in the routing tree. This option
+  may become the default behavior in Roda 3.
+
+* A :verbatim_string_matcher option is now supported for Roda
+  applications.  This will make all string matchers only match
+  the path verbatim, disallowing the use of a colon for
+  placeholders in the string.  It's recommended that users
+  switch to using separate symbol arguments for placeholders.
+
+  If you enable this option, you need to change code such as:
+
+    r.is "foo/:bar" do |bar|
+    end
+
+  to:
+
+    r.is "foo", :bar do |bar|
+    end
+
+  If you are looking to convert an existing routing tree
+  from using placeholders in strings to separate symbol
+  arguments, you can scan your routing tree for potential
+  usage of placeholders in strings:
+
+    grep ' r\..*['\''"].*:.*['\''"]' app.rb
+
+  This option may become the default behavior in Roda 3, with
+  a plugin added to support the current default behavior of
+  allowing placeholders in string matchers.

data/lib/roda.rb

@@ -683,7 +683,7 @@ class Roda
         # string so that regexp metacharacters are not matched, and recognizes
         # colon tokens for placeholders.
         def _match_string(str)
-          if str.index(COLON)
+          if str.index(COLON) && placeholder_string_matcher?
             consume(self.class.cached_matcher(str){Regexp.escape(str).gsub(/:(\w+)/){|m| _match_symbol_regexp($1)}})
           else
             rp = @remaining_path
@@ -750,12 +750,19 @@ class Roda
           throw :halt, response.finish
         end
 
-        # The body to use for the response if the response does not return
+        # The body to use for the response if the response does not already have
         # a body.  By default, a String is returned directly, and nil is
         # returned otherwise.
         def block_result_body(result)
-          if result.is_a?(String)
+          case result
+          when String
             result
+          when nil, false
+            # nothing
+          else
+            if roda_class.opts[:unsupported_block_result] == :raise
+              raise RodaError, "unsupported block result: #{result.inspect}"
+            end
           end
         end
 
@@ -830,7 +837,12 @@ class Roda
             _match_array(matcher)
           when Proc
             matcher.call
+          when true, false, nil
+            matcher
           else
+            if roda_class.opts[:unsupported_matcher] == :raise
+              raise RodaError, "unsupported matcher: #{matcher.inspect}"
+            end
             matcher
           end
         end
@@ -849,6 +861,12 @@ class Roda
             type.to_s.upcase == @env[REQUEST_METHOD]
           end
         end
+
+        # Whether string matchers are used verbatim, without handling
+        # placeholders via colons.
+        def placeholder_string_matcher?
+          !roda_class.opts[:verbatim_string_matcher]
+        end
       end
 
       # Class methods for RodaResponse
@@ -976,6 +994,7 @@ class Roda
         def redirect(path, status = 302)
           @headers[LOCATION] = path
           @status  = status
+          nil
         end
 
         # Return the Roda class related to this response.

data/lib/roda/plugins/caching.rb

@@ -8,7 +8,7 @@ class Roda
     # For proper caching, you should use either the +last_modified+ or
     # +etag+ request methods.  
     #
-    #   r.get 'albums/:d' do |album_id|
+    #   r.get 'albums', :d do |album_id|
     #     @album = Album[album_id]
     #     r.last_modified @album.updated_at
     #     view('album')
@@ -16,7 +16,7 @@ class Roda
     #
     #   # or
     #
-    #   r.get 'albums/:d' do |album_id|
+    #   r.get 'albums', :d do |album_id|
     #     @album = Album[album_id]
     #     r.etag @album.sha1
     #     view('album')

data/lib/roda/plugins/chunked.rb

@@ -44,7 +44,7 @@ class Roda
     # block will be delayed until rendering the content template.  This is
     # useful if you want to delay execution for all routes under a branch:
     #
-    #   r.on 'albums/:d' do |album_id|
+    #   r.on 'albums', :d do |album_id|
     #     delay do
     #       @album = Album[album_id]
     #     end

data/lib/roda/plugins/class_level_routing.rb

@@ -94,6 +94,7 @@ class Roda
                   instance_exec(*a, &blk)
                 end
               end
+              nil
             end
           else
             result

data/lib/roda/plugins/mailer.rb

@@ -60,7 +60,7 @@ class Roda
     # email bodies, you can use all of Roda's usual routing tree features
     # to DRY up your code:
     #
-    #   r.on "albums/:d" do |album_id|
+    #   r.on "albums", :d do |album_id|
     #     @album = Album[album_id.to_i]
     #     from 'from@example.com'
     #     to 'to@example.com'
@@ -92,7 +92,7 @@ class Roda
     # If while preparing the email you figure out you don't want to send an
     # email, call +no_mail!+:
     #
-    #  r.mail '/welcome/:d' do |id| 
+    #  r.mail 'welcome', :d do |id| 
     #    no_mail! unless user = User[id]
     #    # ...
     #  end

data/lib/roda/plugins/params_capturing.rb

@@ -3,7 +3,7 @@
 #
 class Roda
   module RodaPlugins
-    # The params_capturing plugin makes string and symbol matchers
+    # The params_capturing plugin makes symbol matchers
     # update the request params with the value of the captured segments,
     # using the matcher as the key:
     #
@@ -11,7 +11,7 @@ class Roda
     #
     #   route do |r|
     #     # GET /foo/123/abc/67
-    #     r.on("foo/:bar/:baz", :quux) do
+    #     r.on("foo", :bar, :baz, :quux) do
     #       r[:bar] #=> '123'
     #       r[:baz] #=> 'abc'
     #       r[:quux] #=> '67'
@@ -23,10 +23,9 @@ class Roda
     # or strings.
     #
     # All matchers will update the request params by adding all
-    # captured segments to the +captures+ key, including
-    # symbol and string matchers:
+    # captured segments to the +captures+ key:
     #
-    #   r.on(:x, /(\d+)\/(\w+)/, ':y') do
+    #   r.on(:x, /(\d+)\/(\w+)/, :y) do
     #     r[:x] #=> nil
     #     r[:y] #=> nil
     #     r[:captures] #=> ["foo", "123", "abc", "67"]
@@ -53,6 +52,9 @@ class Roda
     # strings and not symbols (<tt>r[]</tt> converts the argument
     # to a string before looking it up in +r.params+).
     #
+    # This plugin will also handle string matchers if placeholders in
+    # string matchers are supported.
+    #
     # Also note that this plugin will not work correctly if you are using
     # the symbol_matchers plugin with custom symbol matching and are using
     # symbols that capture multiple values or no values.
@@ -73,7 +75,7 @@ class Roda
           # Add the capture names from this string to list of param
           # capture names if param capturing.
           def _match_string(str)
-            if pc = @_params_captures
+            if (pc = @_params_captures) && placeholder_string_matcher?
               pc.concat(str.scan(STRING_PARAM_CAPTURE_REGEXP))
             end
             super
@@ -86,7 +88,7 @@ class Roda
           STRING_PARAM_CAPTURE_RANGE = 1..-1
 
           def _match_string(str)
-            if pc = @_params_captures
+            if (pc = @_params_captures) && placeholder_string_matcher?
               pc.concat(str.scan(/:\w+/).map{|s| s[STRING_PARAM_CAPTURE_RANGE]})
             end
             super

data/lib/roda/plugins/pass.rb

@@ -9,7 +9,7 @@ class Roda
     #   plugin :pass
     #
     #   route do |r|
-    #     r.on "foo/:bar" do |bar|
+    #     r.on "foo", :bar do |bar|
     #       r.pass if bar == 'baz'
     #       "/foo/#{bar} (not baz)"
     #     end

data/lib/roda/plugins/symbol_matchers.rb

@@ -19,7 +19,13 @@ class Roda
     # Then the route will only if the path is +/foobar123+, but not if it is
     # +/foo+, +/FooBar123+, or +/foobar_123+.
     #
-    # Note that this feature does not apply to just symbols, but also to
+    # By default, this plugin sets up the following symbol matchers:
+    #
+    # :d :: <tt>/(\d+)/</tt>, a decimal segment
+    # :rest :: <tt>/(.*)/</tt>, all remaining characters, if any
+    # :w :: <tt>/(\w+)/</tt>, a alphanumeric segment
+    #
+    # If placeholder string matchers are supported, this feature also applies to
     # embedded colons in strings, so the following:
     #
     #   r.on "users/:username" do
@@ -29,17 +35,16 @@ class Roda
     # Would match +/users/foobar123+, but not +/users/foo+, +/users/FooBar123+,
     # or +/users/foobar_123+.
     #
-    # By default, this plugin sets up the following symbol matchers:
+    # If placeholder string matchers are supported, it also adds the following
+    # symbol matchers:
     #
-    # :d :: <tt>/(\d+)/</tt>, a decimal segment
     # :format :: <tt>/(?:\.(\w+))?/</tt>, an optional format/extension
     # :opt :: <tt>/(?:\/([^\/]+))?</tt>, an optional segment
     # :optd :: <tt>/(?:\/(\d+))?</tt>, an optional decimal segment
-    # :rest :: <tt>/(.*)/</tt>, all remaining characters, if any
-    # :w :: <tt>/(\w+)/</tt>, a alphanumeric segment
     #
-    # Note that because of how segment matching works, :format, :opt, and :optd
-    # are only going to work inside of a string, like this:
+    # These are only added when placeholder string matchers are supported,
+    # because they only make sense when used inside of a string, due to how
+    # segment matching works.  Example:
     #
     #   r.is "album:opt" do |id| end
     #   # matches /album (yielding nil) and /album/foo (yielding "foo")
@@ -50,11 +55,14 @@ class Roda
     module SymbolMatchers
       def self.configure(app)
         app.symbol_matcher(:d, /(\d+)/)
-        app.symbol_matcher(:format, /(?:\.(\w+))?/)
-        app.symbol_matcher(:opt, /(?:\/([^\/]+))?/)
-        app.symbol_matcher(:optd, /(?:\/(\d+))?/)
-        app.symbol_matcher(:rest, /(.*)/)
         app.symbol_matcher(:w, /(\w+)/)
+        app.symbol_matcher(:rest, /(.*)/)
+
+        if !app.opts[:verbatim_string_matcher]
+          app.symbol_matcher(:format, /(?:\.(\w+))?/)
+          app.symbol_matcher(:opt, /(?:\/([^\/]+))?/)
+          app.symbol_matcher(:optd, /(?:\/(\d+))?/)
+        end
       end
 
       module ClassMethods

data/lib/roda/plugins/websockets.rb

@@ -27,7 +27,7 @@ class Roda
     #   end
     #
     #   route do |r|
-    #     r.get "room/:d" do |room_id|
+    #     r.get "room", :d do |room_id|
     #       room = sync{ROOMS[room_id] ||= []}
     #
     #       r.websocket do |ws|

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 2
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 21
+  RodaMinorVersion = 22
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/spec/composition_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("spec_helper", File.dirname(__FILE__))
 describe "r.run" do
   it "should allow composition of apps" do
     a = app do |r|
-      r.on "services/:id" do |id|
+      r.on "services", :id do |id|
         "View #{id}"
       end
     end

data/spec/matchers_spec.rb

@@ -136,18 +136,39 @@ describe "matchers" do
         id
       end
     end
+    app.opts[:verbatim_string_matcher] = false
 
     body('/posts/123').must_equal '123'
     status('/post/123').must_equal 404
     body('/responses-123').must_equal '123'
   end
 
+  it "should not handle string with embedded param if :verbatim_string_matcher option is set" do
+    app do |r|
+      r.on "posts/:id" do
+        '1'
+      end
+
+      r.on "responses-:id" do
+        '2'
+      end
+    end
+    app.opts[:verbatim_string_matcher] = true
+
+    status('/post/123').must_equal 404
+    status('/posts/123').must_equal 404
+    body('/posts/:id').must_equal '1'
+    status('/responses-123').must_equal 404
+    body('/responses-:id').must_equal '2'
+  end
+
   it "should handle multiple params in single string" do
     app do |r|
       r.on "u/:uid/posts/:id" do |uid, id|
         uid + id
       end
     end
+    app.opts[:verbatim_string_matcher] = false
 
     body("/u/jdoe/posts/123").must_equal 'jdoe123'
     status("/u/jdoe/pots/123").must_equal 404
@@ -159,6 +180,7 @@ describe "matchers" do
         uid + id
       end
     end
+    app.opts[:verbatim_string_matcher] = false
 
     body("/u/jdoe/posts?/123").must_equal 'jdoe123'
     status("/u/jdoe/post/123").must_equal 404
@@ -170,6 +192,7 @@ describe "matchers" do
         uid + id
       end
     end
+    app.opts[:verbatim_string_matcher] = false
 
     body("/u/:/jdoe/posts/:123").must_equal 'jdoe123'
     status("/u/a/jdoe/post/b123").must_equal 404
@@ -286,6 +309,49 @@ describe "r.on" do
     body.must_equal '+1'
   end
 
+  it "does not execute on false" do
+    app do |r|
+      r.on false do
+        "+1"
+      end
+    end
+
+    status.must_equal 404
+  end
+
+  it "does not execute on nil" do
+    app do |r|
+      r.on nil do
+        "+1"
+      end
+    end
+
+    status.must_equal 404
+  end
+
+  it "executes on arbitrary object" do
+    app do |r|
+      r.on Object.new do
+        "+1"
+      end
+    end
+
+    body.must_equal '+1'
+  end
+
+  it "raises on arbitrary object if :unsupported_matcher => :raise" do
+    app(:bare) do 
+      opts[:unsupported_matcher] = :raise
+      route do |r|
+        r.on Object.new do
+          "+1"
+        end
+      end
+    end
+
+    proc{body}.must_raise Roda::RodaError
+  end
+
   it "executes on non-false" do
     app do |r|
       r.on "123" do
@@ -700,3 +766,45 @@ describe "route block that returns string" do
     body.must_equal '+1'
   end
 end
+
+describe "app with :unsupported_block_result => :raise option" do
+  def app_value(v)
+    app(:bare) do
+      opts[:unsupported_block_result] = :raise
+      route do |r|
+        r.is 'a' do v end
+        v
+      end
+    end
+  end
+
+  it "should handle String as body" do
+    app_value '1'
+    status.must_equal 200
+    body.must_equal '1'
+    status('/a').must_equal 200
+    body('/a').must_equal '1'
+  end
+
+  it "should handle nil and false as not found" do
+    app_value nil
+    status.must_equal 404
+    body.must_equal ''
+    status('/a').must_equal 404
+    body('/a').must_equal ''
+  end
+
+  it "should handle false as not found" do
+    app_value false
+    status.must_equal 404
+    body.must_equal ''
+    status('/a').must_equal 404
+    body('/a').must_equal ''
+  end
+
+  it "should raise RodaError for other types" do
+    app_value Object.new
+    proc{body}.must_raise Roda::RodaError
+    proc{body('/a')}.must_raise Roda::RodaError
+  end
+end

data/spec/plugin/caching_spec.rb

@@ -38,6 +38,7 @@ describe 'response.finish' do
   it 'removes Content-Type and Content-Length for 304 responses' do
     app(:caching) do |r|
       response.status = 304
+      nil
     end
     header('Content-Type').must_be_nil
     header('Content-Length').must_be_nil
@@ -46,6 +47,7 @@ describe 'response.finish' do
   it 'does not change non-304 responses' do
     app(:caching) do |r|
       response.status = 200
+      nil
     end
     header('Content-Type').must_equal 'text/html'
     header('Content-Length').must_equal '0'

data/spec/plugin/class_level_routing_spec.rb

@@ -18,7 +18,7 @@ describe "class_level_routing plugin" do
         "foo"
       end
 
-      is "d:d" do |x|
+      is "d", :d do |x|
         request.get do
           "bazget#{x}"
         end
@@ -42,8 +42,8 @@ describe "class_level_routing plugin" do
     body.must_equal 'root'
     body('/foo').must_equal 'foo'
     body('/foo/bar').must_equal 'foobar'
-    body('/dgo').must_equal 'bazgetgo'
-    body('/dgo', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
+    body('/d/go').must_equal 'bazgetgo'
+    body('/d/go', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
     body('/bar').must_equal "x-get-bar"
     body('/bar', 'REQUEST_METHOD'=>'POST').must_equal "x-post-bar"
     body('/bar', 'REQUEST_METHOD'=>'DELETE').must_equal "x-delete-bar"
@@ -64,8 +64,8 @@ describe "class_level_routing plugin" do
     body.must_equal 'root'
     body('/foo').must_equal 'foo'
     body('/foo/bar').must_equal 'foobar'
-    body('/dgo').must_equal 'bazgetgo'
-    body('/dgo', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
+    body('/d/go').must_equal 'bazgetgo'
+    body('/d/go', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
     body('/bar').must_equal "x-get-bar"
     body('/bar', 'REQUEST_METHOD'=>'POST').must_equal "x-post-bar"
     body('/bar', 'REQUEST_METHOD'=>'DELETE').must_equal "x-delete-bar"
@@ -100,8 +100,8 @@ describe "class_level_routing plugin" do
     body.must_equal 'iroot'
     body('/foo').must_equal 'ifoo'
     body('/foo/bar').must_equal 'foobar'
-    body('/dgo').must_equal 'bazgetgo'
-    body('/dgo', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
+    body('/d/go').must_equal 'bazgetgo'
+    body('/d/go', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
     body('/bar').must_equal ""
     body('/bar', 'REQUEST_METHOD'=>'POST').must_equal "ibar"
     body('/bar', 'REQUEST_METHOD'=>'DELETE').must_equal "x-delete-bar"
@@ -120,8 +120,8 @@ describe "class_level_routing plugin" do
     body.must_equal 'root'
     body('/foo').must_equal 'foo'
     body('/foo/bar').must_equal 'foobar'
-    body('/dgo').must_equal 'bazgetgo'
-    body('/dgo', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
+    body('/d/go').must_equal 'bazgetgo'
+    body('/d/go', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
     body('/bar').must_equal "x-get-bar"
     body('/bar', 'REQUEST_METHOD'=>'POST').must_equal "x-post-bar"
     body('/bar', 'REQUEST_METHOD'=>'DELETE').must_equal "x-delete-bar"
@@ -141,8 +141,8 @@ describe "class_level_routing plugin" do
     body.must_equal 'root'
     body('/foo').must_equal 'foo'
     body('/foo/bar').must_equal 'foobar'
-    body('/dgo').must_equal 'bazgetgo'
-    body('/dgo', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
+    body('/d/go').must_equal 'bazgetgo'
+    body('/d/go', 'REQUEST_METHOD'=>'POST').must_equal 'bazpostgo'
     body('/bar').must_equal "x-get-bar"
     body('/bar', 'REQUEST_METHOD'=>'POST').must_equal "x-post-bar"
     body('/bar', 'REQUEST_METHOD'=>'DELETE').must_equal "x-delete-bar"

data/spec/plugin/mailer_spec.rb

@@ -145,7 +145,7 @@ describe "mailer plugin" do
 
   it "supports regular web requests in same application" do
     app(:mailer) do |r|
-      r.get "foo/:bar" do |bar|
+      r.get "foo", :bar do |bar|
         "foo#{bar}"
       end
       r.mail "bar" do

data/spec/plugin/optimized_string_matchers_spec.rb

@@ -11,25 +11,28 @@ describe "optimized_string_matchers plugin" do
         "ee"
       end
 
-      r.on_branch "a/:b" do |*b|
-        r.is_exactly ":c" do |*c|
-          "c-#{c.length}"
+      r.on_branch "a" do
+        r.on_branch "b" do
+          r.is_exactly "c" do
+            "c"
+          end
+
+          "b"
         end
 
-        "a-#{b.length}"
+        "a"
       end
 
       "cc"
     end
 
     body.must_equal 'cc'
-    body('/a').must_equal 'cc'
-    body('/a/').must_equal 'cc'
-    body('/a/b/').must_equal 'a-0'
-    body('/a/b/').must_equal 'a-0'
-    body('/a/b/c').must_equal 'c-0'
-    body('/a/b/c/').must_equal 'a-0'
-    body('/a/b/c/d').must_equal 'a-0'
+    body('/a').must_equal 'a'
+    body('/a/').must_equal 'a'
+    body('/a/b/').must_equal 'b'
+    body('/a/b/c').must_equal 'c'
+    body('/a/b/c/').must_equal 'b'
+    body('/a/b/c/d').must_equal 'b'
     body('/e').must_equal 'ee'
     body('/eb').must_equal 'cc'
     body('/e/').must_equal 'ee'

data/spec/plugin/params_capturing_spec.rb

@@ -1,16 +1,12 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 describe "params_capturing plugin" do 
-  it "should add captures to r.params" do
+  it "should add captures to r.params for symbol matchers" do
     app(:params_capturing) do |r|
-      r.on('foo/:y/:z', :w) do |y, z, w|
+      r.on('foo', :y, :z, :w) do |y, z, w|
         (r.params.values_at('y', 'z', 'w') + [y, z, w, r[:captures].length]).join('-')
       end
 
-      r.on("bar/:foo") do |foo|
-        "b-#{foo}-#{r[:foo]}-#{r[:captures].length}"
-      end
-
       r.on(/(quux)/, /(foo)(bar)/) do |q, foo, bar|
         "y-#{r[:captures].join}-#{q}-#{foo}-#{bar}"
       end
@@ -30,9 +26,24 @@ describe "params_capturing plugin" do
 
     body('/blarg', 'rack.input'=>StringIO.new).must_equal 'x-blarg-blarg-1'
     body('/foo/1/2/3', 'rack.input'=>StringIO.new).must_equal '1-2-3-1-2-3-3'
-    body('/bar/banana', 'rack.input'=>StringIO.new).must_equal 'b-banana-banana-1'
     body('/quux/foobar', 'rack.input'=>StringIO.new).must_equal 'y-quuxfoobar-quux-foo-bar'
     body('/quux/asdf', 'rack.input'=>StringIO.new).must_equal 'y--quux-asdf-2'
     body('/quux/asdf/890', 'rack.input'=>StringIO.new).must_equal 'y--890-quux-asdf-890-3'
   end
+
+  it "should add captures to r.params for string matchers" do
+    app(:params_capturing) do |r|
+      r.on("bar/:foo") do |foo|
+        "b-#{foo}-#{r[:foo]}-#{r[:captures].length}"
+      end
+
+      r.on("baz/:bar", :foo) do |bar, foo|
+        "b-#{bar}-#{foo}-#{r[:bar]}-#{r[:foo]}-#{r[:captures].length}"
+      end
+    end
+    app.opts[:verbatim_string_matcher] = false
+
+    body('/bar/banana', 'rack.input'=>StringIO.new).must_equal 'b-banana-banana-1'
+    body('/baz/ban/ana', 'rack.input'=>StringIO.new).must_equal 'b-ban-ana-ban-ana-2'
+  end
 end

data/spec/plugin/pass_spec.rb

@@ -13,7 +13,7 @@ describe "pass plugin" do
         id
       end
 
-      r.on ":x/:y" do |x, y|
+      r.on :x, :y do |x, y|
         x + y
       end
     end

data/spec/plugin/sinatra_helpers_spec.rb

@@ -507,7 +507,7 @@ describe "sinatra_helpers plugin" do
   end
 
   it 'logger logs to rack.logger' do
-    sin_app{logger.info "foo"}
+    sin_app{logger.info "foo"; nil}
     o = Object.new
     def o.method_missing(*a)
       (@a ||= []) << a

data/spec/plugin/symbol_matchers_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 describe "symbol_matchers plugin" do 
-  it "allows symbol specific regexps" do
+  it "allows symbol specific regexps for symbol matchers" do
     app(:bare) do
       plugin :symbol_matchers
       symbol_matcher(:f, /(f+)/)
@@ -11,6 +11,55 @@ describe "symbol_matchers plugin" do
           "d#{d}"
         end
 
+        r.is "thing2", :thing do |d|
+          "thing2#{d}"
+        end
+
+        r.is :f do |f|
+          "f#{f}"
+        end
+
+        r.is 'q', :rest do |rest|
+          "rest#{rest}"
+        end
+
+        r.is :w do |w|
+          "w#{w}"
+        end
+
+        r.is :d, :w, :f do |d, w, f|
+          "dwf#{d}#{w}#{f}"
+        end
+      end
+    end
+
+    status.must_equal 404
+    body("/1").must_equal 'd1'
+    body("/11232135").must_equal 'd11232135'
+    body("/a").must_equal 'wa'
+    body("/1az0").must_equal 'w1az0'
+    body("/f").must_equal 'ff'
+    body("/ffffffffffffffff").must_equal 'fffffffffffffffff'
+    status("/-").must_equal 404
+    body("/1/1a/f").must_equal 'dwf11af'
+    body("/12/1azy/fffff").must_equal 'dwf121azyfffff'
+    status("/1/f/a").must_equal 404
+    body("/q/a/b/c/d//f/g").must_equal 'resta/b/c/d//f/g'
+    body('/q/').must_equal 'rest'
+    body('/thing2/q').must_equal 'thing2q'
+  end
+
+  it "works with placeholder string matchers" do
+    app(:bare) do
+      opts[:verbatim_string_matcher] = false
+      plugin :symbol_matchers
+      symbol_matcher(:f, /(f+)/)
+
+      route do |r|
+        r.is ":d" do |d|
+          "d#{d}"
+        end
+
         r.is "foo:optd" do |o|
           "foo#{o.inspect}"
         end
@@ -27,11 +76,11 @@ describe "symbol_matchers plugin" do
           "thing#{d}"
         end
 
-        r.is "thing2", :thing do |d|
+        r.is "thing2", ":thing" do |d|
           "thing2#{d}"
         end
 
-        r.is :f do |f|
+        r.is ":f" do |f|
           "f#{f}"
         end
 
@@ -39,7 +88,7 @@ describe "symbol_matchers plugin" do
           "rest#{rest}"
         end
 
-        r.is :w do |w|
+        r.is ":w" do |w|
           "w#{w}"
         end
 

data/spec/plugin/symbol_status_spec.rb

@@ -5,6 +5,7 @@ describe "symbol_status plugin" do
     app(:symbol_status) do |r|
       r.on do
         response.status = :unauthorized
+        nil
       end
     end
 
@@ -15,6 +16,7 @@ describe "symbol_status plugin" do
     app(:symbol_status) do |r|
       r.on do
         response.status = 204
+        nil
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -201,6 +201,7 @@ extra_rdoc_files:
 - doc/release_notes/2.19.0.txt
 - doc/release_notes/2.20.0.txt
 - doc/release_notes/2.21.0.txt
+- doc/release_notes/2.22.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -226,6 +227,7 @@ files:
 - doc/release_notes/2.2.0.txt
 - doc/release_notes/2.20.0.txt
 - doc/release_notes/2.21.0.txt
+- doc/release_notes/2.22.0.txt
 - doc/release_notes/2.3.0.txt
 - doc/release_notes/2.4.0.txt
 - doc/release_notes/2.5.0.txt
@@ -440,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Routing tree web toolkit