roda-cj 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0381614904fadaf43af33f351a4edfc17d054c4d
-  data.tar.gz: a1f3866849f764552a2de2f987c636d20cf33099
+  metadata.gz: 4b2651937ad6d2d3c5d87389b03fd9e0f1e3cef2
+  data.tar.gz: e231917660219dd780e2adaacd5fd8fbbd42afd3
 SHA512:
-  metadata.gz: d2930467e112ec168fd41c4f9005e21984b028ff45aa8fb58d843e4343bb098f888774c94b989b70ce0aea4f6f69e8eae2b2a62fc5c6626816f78eea9257fd58
-  data.tar.gz: 1f506448329172d622492c22167f39b8690ca812c50f734c3dec306fd537855b0d4767a8507c555471963a4f053e4b65874d277cc9d53e44fabe2471c3e9374e
+  metadata.gz: 8ebb628c78058e1e9c61acf148a1e791f3036cf01290461c9ebf01b220b997ab62b78bb2f2429b87b378d1ea0d64134d4a0101ee8dcef5a8794cfe2b6d4effb5
+  data.tar.gz: db3d4837c8af107e4f3ee6224a15ebadeb5afd0d4122a77f359aa1b9ccb9a263153e5e1628ce77456738f9b76c68fb7cc59a3e5e228dd3c3ba7dd1a84dcc90d6

data/CHANGELOG

@@ -1,5 +1,9 @@
 = HEAD
 
+* Add r.multi_route method to multi_route plugin, for dispatching to named route based on first segment in path (jeremyevans)
+
+* Allow non-GET requests to use r.redirect with no argument, redirecting to current path (jeremyevans)
+
 * Add head plugin, for handling HEAD requests like GET requests with an empty body (jeremyevans)
 
 * Optimize consuming patterns by using a positive lookahead assertion (jeremyevans)

data/lib/roda.rb

@@ -429,7 +429,7 @@ class Roda
         end
 
         # Immediately redirect to the given path.
-        def redirect(path, status=302)
+        def redirect(path=default_redirect_path, status=302)
           response.redirect(path, status)
           throw :halt, response.finish
         end
@@ -535,6 +535,19 @@ class Roda
           captures.concat(vars)
         end
 
+        # The default path to use for redirects when a path is not given.
+        # For non-GET requests, redirects to the current path, which will
+        # trigger a GET request.  This is to make the common case where
+        # a POST request will redirect to a GET request at the same location
+        # will work fine.
+        #
+        # If the current request is a GET request, raise an error, as otherwise
+        # it is easy to create an infinite redirect.
+        def default_redirect_path
+          raise RodaError, "must provide path argument to redirect for get requests" if is_get?
+          full_path_info
+        end
+
         # If all of the arguments match, yields to the match block and
         # returns the rack response when the block returns.  If any of
         # the match arguments doesn't match, does nothing.

data/lib/roda/plugins/multi_route.rb

@@ -1,39 +1,56 @@
 class Roda
   module RodaPlugins
     # The multi_route plugin allows for multiple named routes, which the
-    # main route block can dispatch to by name at any point.  If the named
-    # route doesn't handle the request, execution will continue, and if the
-    # named route does handle the request, the response by the named route
-    # will be returned.
+    # main route block can dispatch to by name at any point by calling +route+.
+    # If the named route doesn't handle the request, execution will continue,
+    # and if the named route does handle the request, the response returned by
+    # the named route will be returned.
+    #
+    # In addition, this also adds the +r.multi_route+ method, which will assume
+    # check if the first segment in the path matches a named route, and dispatch
+    # to that named route.
     #
     # Example:
     #
     #   plugin :multi_route
     #
-    #   route(:foo) do |r|
+    #   route('foo') do |r|
     #     r.is 'bar' do
     #       '/foo/bar'
     #     end
     #   end
     #
-    #   route(:bar) do |r|
+    #   route('bar') do |r|
     #     r.is 'foo' do
     #       '/bar/foo'
     #     end
     #   end
     #
     #   route do |r|
+    #     r.multi_route
+    #
+    #     # or
+    #
     #     r.on "foo" do
-    #       route :foo
+    #       route 'foo'
     #     end
     #
     #     r.on "bar" do
-    #       route :bar
+    #       route 'bar'
     #     end
     #   end
     #
     # Note that in multi-threaded code, you should not attempt to add a
     # named route after accepting requests.
+    #
+    # If you want to use the +r.multi_route+ method, use string names for the
+    # named routes.  Also, you can provide a block to +r.multi_route+ that is
+    # called if the route matches but the named route did not handle the
+    # request:
+    #
+    #   r.multi_route do
+    #     "default body"
+    #   end
     module MultiRoute
       # Initialize storage for the named routes.
       def self.configure(app)
@@ -47,6 +64,11 @@ class Roda
           subclass.instance_variable_set(:@named_routes, @named_routes.dup)
         end
 
+        # An names for the currently stored named routes
+        def named_routes
+          @named_routes.keys
+        end
+
         # Return the named route with the given name.
         def named_route(name)
           @named_routes[name]
@@ -70,6 +92,26 @@ class Roda
           instance_exec(request, &self.class.named_route(name))
         end
       end
+
+      module RequestClassMethods
+        # A regexp matching any of the current named routes.
+        def named_route_regexp
+          @named_route_regexp ||= /(#{Regexp.union(roda_class.named_routes)})/
+        end
+      end
+
+      module RequestMethods
+        # Check if the first segment in the path matches any of the current
+        # named routes.  If so, call that named route.  If not, do nothing.
+        # If the named route does not handle the request, and a block
+        # is given, yield to the block.
+        def multi_route
+          on self.class.named_route_regexp do |section|
+            scope.route(section)
+            yield if block_given?
+          end
+        end
+      end
     end
 
     register_plugin(:multi_route, MultiRoute)

data/lib/roda/version.rb

@@ -1,3 +1,3 @@
 class Roda
-  RodaVersion = '0.9.4'.freeze
+  RodaVersion = '0.9.5'.freeze
 end

data/spec/plugin/multi_route_spec.rb

@@ -5,7 +5,7 @@ describe "multi_route plugin" do
     app(:bare) do
       plugin :multi_route
 
-      route(:get) do |r|
+      route("get") do |r|
         r.is "" do
           "get"
         end
@@ -15,7 +15,7 @@ describe "multi_route plugin" do
         end
       end
 
-      route(:post) do |r|
+      route("post") do |r|
         r.is "" do
           "post"
         end
@@ -26,15 +26,22 @@ describe "multi_route plugin" do
       end
 
       route do |r|
+        r.on 'foo' do
+          r.multi_route do
+            "foo"
+          end
+        end
+
         r.get do
-          route(:get)
+          route("get")
 
           r.is "b" do
             "getb"
           end
         end
+
         r.post do
-          route(:post)
+          route("post")
 
           r.is "b" do
             "postb"
@@ -55,6 +62,15 @@ describe "multi_route plugin" do
     status('/c', 'REQUEST_METHOD'=>'POST').should == 404
   end
 
+  it "uses multi_route to dispatch to any named route" do
+    status('/foo').should == 404
+    body('/foo/get/').should == 'get'
+    body('/foo/get/a').should == 'geta'
+    body('/foo/post/').should == 'post'
+    body('/foo/post/a').should == 'posta'
+    body('/foo/post/b').should == 'foo'
+  end
+
   it "handles loading the plugin multiple times correctly" do
     app.plugin :multi_route
     body.should == 'get'
@@ -71,14 +87,14 @@ describe "multi_route plugin" do
     @app = Class.new(@app)
     @app.route do |r|
       r.get do
-        route(:post)
+        route("post")
 
         r.is "b" do
           "1b"
         end
       end
       r.post do
-        route(:get)
+        route("get")
 
         r.is "b" do
           "2b"

data/spec/redirect_spec.rb

@@ -3,14 +3,25 @@ require File.expand_path("spec_helper", File.dirname(__FILE__))
 describe "redirects" do
   it "should be immediately processed" do
     app do |r|
-      r.on "about" do
-        r.redirect "/hello", 301
+      r.root do
+        r.redirect "/hello"
         "Foo"
       end
-      r.on do
-        r.redirect "/hello"
+
+      r.is "about" do
+        r.redirect "/hello", 301
         "Foo"
       end
+
+      r.is 'foo' do
+        r.get do
+          r.redirect
+        end
+
+        r.post do
+          r.redirect
+        end
+      end
     end
 
     status.should == 302
@@ -20,5 +31,11 @@ describe "redirects" do
     status("/about").should == 301
     header('Location', "/about").should == '/hello'
     body("/about").should == ''
+
+    status("/foo", 'REQUEST_METHOD'=>'POST').should == 302
+    header('Location', "/foo", 'REQUEST_METHOD'=>'POST').should == '/foo'
+    body("/foo", 'REQUEST_METHOD'=>'POST').should == ''
+
+    proc{req('/foo')}.should raise_error(Roda::RodaError)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-cj
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack