roda 3.17.0 → 3.18.0

data/spec/plugin/class_level_routing_spec.rb

@@ -161,31 +161,4 @@ 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/default_headers_spec.rb

@@ -72,4 +72,11 @@ describe "default_headers plugin" do
 
     req[1].must_equal h
   end
+
+  it "should offer default_headers method on class and response instance" do
+    h = {'Content-Type'=>'text/json', 'Foo'=>'bar'}
+    app.plugin :default_headers, h
+    app.default_headers.must_equal h
+    app::RodaResponse.new.default_headers.must_equal h
+  end
 end

data/spec/plugin/default_status_spec.rb

@@ -14,7 +14,7 @@ describe "default_status plugin" do
     status.must_equal 201
   end
 
-  it "should instance_exec the plugin block" do
+  it "should exec the plugin block in the context of the instance" do
     app(:bare) do
       plugin :default_status do
         200 + @body[0].length
@@ -62,4 +62,34 @@ describe "default_status plugin" do
   it "should raise if not given a block" do
     proc{app(:default_status)}.must_raise Roda::RodaError
   end
+
+  [true, false].each do |warn_arity|
+    send(warn_arity ? :deprecated : :it, "works with blocks with invalid arity") do
+      app(:bare) do
+        opts[:check_arity]  = :warn if warn_arity
+        plugin :default_status do |r|
+          201
+        end
+        route do |r|
+          r.halt response.finish_with_body([])
+        end
+      end
+
+      status.must_equal 201
+    end
+  end
+
+  it "does not work with blocks with invalid arity if :check_arity app option is false" do
+    app(:bare) do
+      opts[:check_arity] = false
+      plugin :default_status do |r|
+        201
+      end
+      route do |r|
+        r.halt response.finish_with_body([])
+      end
+    end
+
+    proc{status}.must_raise ArgumentError
+  end
 end

data/spec/plugin/direct_call_spec.rb

@@ -0,0 +1,28 @@
+require_relative "../spec_helper"
+
+describe "direct_call plugin" do
+  it "should have .call skip middleware" do
+    app{'123'}
+    app.use(Class.new do
+      def initialize(_) end
+      def call(env) [200, {}, ['321']] end
+    end)
+    body.must_equal '321'
+    app.plugin :direct_call
+    body.must_equal '123'
+  end
+
+  deprecated "should work when #call is overridden" do
+    app.class_eval do
+      def call; super end
+      route{'123'}
+    end
+    app.use(Class.new do
+      def initialize(_) end
+      def call(env) [200, {}, ['321']] end
+    end)
+    body.must_equal '321'
+    app.plugin :direct_call
+    body.must_equal '123'
+  end
+end

data/spec/plugin/error_handler_spec.rb

@@ -24,6 +24,33 @@ describe "error_handler plugin" do
     status.must_equal 500
   end
 
+  deprecated "works if #call is overridden" do
+    app(:bare) do
+      plugin :error_handler
+
+      def call
+        super
+      end
+
+      error do |e|
+        e.message
+      end
+
+      route do |r|
+        r.on "a" do
+          "found"
+        end
+
+        raise ArgumentError, "bad idea"
+      end
+    end
+
+    body("/a").must_equal 'found'
+    status("/a").must_equal 200
+    body.must_equal 'bad idea'
+    status.must_equal 500
+  end
+
   it "executes on SyntaxError exceptions" do
     app(:bare) do
       plugin :error_handler

data/spec/plugin/hooks_spec.rb

@@ -44,6 +44,15 @@ describe "hooks plugin" do
     @a.must_equal [[200, 'baz', ['bar']]]
   end
 
+  it "works when freezing the app" do
+    app.freeze
+    s, h, b = req
+    s.must_equal 201
+    h['foo'].must_equal 'baz'
+    b.join.must_equal 'bar'
+    @a.must_equal [[200, 'baz', ['bar']]]
+  end
+
   it "after hooks are still called if an exception is raised" do
     a = @a
     @app.before do
@@ -128,4 +137,16 @@ describe "hooks plugin" do
     body('/a').must_equal "error"
     body('/b').must_equal "error"
   end
+
+  deprecated "should work if #call is overridden" do
+    app.class_eval do
+      def call; super end
+    end
+    app.route(&app.route_block)
+    s, h, b = req
+    s.must_equal 201
+    h['foo'].must_equal 'baz'
+    b.join.must_equal 'bar'
+    @a.must_equal [[200, 'baz', ['bar']]]
+  end
 end

data/spec/plugin/middleware_spec.rb

@@ -1,53 +1,62 @@
 require_relative "../spec_helper"
 
 describe "middleware plugin" do 
-  it "turns Roda app into middlware" do
-    a2 = app(:bare) do
-      plugin :middleware
-
-      route do |r|
-        r.is "a" do
-          "a2"
+  [false, true].each do |def_call|
+    meth = def_call ? :deprecated : :it
+    send meth, "turns Roda app into middlware" do
+      a2 = app(:bare) do
+        plugin :middleware
+
+        if def_call
+          def call
+            super
+          end
         end
-        r.post "b" do
-          "b2"
+
+        route do |r|
+          r.is "a" do
+            "a2"
+          end
+          r.post "b" do
+            "b2"
+          end
         end
       end
-    end
 
-    a3 = app(:bare) do
-      plugin :middleware
+      a3 = app(:bare) do
+        plugin :middleware
 
-      route do |r|
-        r.get "a" do
-          "a3"
-        end
-        r.get "b" do
-          "b3"
+        route do |r|
+          r.get "a" do
+            "a3"
+          end
+          r.get "b" do
+            "b3"
+          end
         end
       end
-    end
-
-    app(:bare) do
-      use a3
-      use a2
 
-      route do |r|
-        r.is "a" do
-          "a1"
-        end
-        r.is "b" do
-          "b1"
+      app(:bare) do
+        use a3
+        use a2
+
+        route do |r|
+          r.is "a" do
+            "a1"
+          end
+          r.is "b" do
+            "b1"
+          end
         end
       end
-    end
 
-    body('/a').must_equal 'a3'
-    body('/b').must_equal 'b3'
-    body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'a2'
-    body('/b', 'REQUEST_METHOD'=>'POST').must_equal 'b2'
-    body('/a', 'REQUEST_METHOD'=>'PATCH').must_equal 'a2'
-    body('/b', 'REQUEST_METHOD'=>'PATCH').must_equal 'b1'
+      body('/a').must_equal 'a3'
+      body('/b').must_equal 'b3'
+      body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'a2'
+      body('/b', 'REQUEST_METHOD'=>'POST').must_equal 'b2'
+      body('/a', 'REQUEST_METHOD'=>'PATCH').must_equal 'a2'
+      body('/b', 'REQUEST_METHOD'=>'PATCH').must_equal 'b1'
+    end
   end
 
   it "makes it still possible to use the Roda app normally" do
@@ -57,6 +66,21 @@ describe "middleware plugin" do
     body.must_equal 'a'
   end
 
+  deprecated "makes it still possible to use the Roda app normally when #call is overwritten" do
+    app(:bare) do
+      plugin :middleware
+      def call
+        super
+      end
+
+      route do
+        "a"
+      end
+    end
+    app
+    body.must_equal 'a'
+  end
+
   it "makes middleware always use a subclass of the app" do
     app(:middleware) do |r|
       r.get{opts[:a]}
@@ -161,4 +185,52 @@ describe "middleware plugin" do
     end
     body.must_equal 'bazbar'
   end
+
+  it "works with the route_block_args block when loaded before" do
+    app(:bare) do
+      plugin :middleware
+      plugin :route_block_args do
+        [request.path, response]
+      end
+
+      route do |path, res|
+        request.get 'a' do
+          res.write(path + '2')
+        end
+      end
+    end
+    a = app
+
+    app(:bare) do
+      use a
+      route{|r| 'b'}
+    end
+
+    body('/a').must_equal '/a2'
+    body('/x').must_equal 'b'
+  end
+
+  it "works with the route_block_args block when loaded after" do
+    app(:bare) do
+      plugin :route_block_args do
+        [request.path, response]
+      end
+      plugin :middleware
+
+      route do |path, res|
+        request.get 'a' do
+          res.write(path + '2')
+        end
+      end
+    end
+    a = app
+
+    app(:bare) do
+      use a
+      route{|r| 'b'}
+    end
+
+    body('/a').must_equal '/a2'
+    body('/x').must_equal 'b'
+  end
 end

data/spec/plugin/multi_route_spec.rb

@@ -170,6 +170,18 @@ describe "multi_route plugin" do
   end
 end
 
+describe "multi_route plugin" do
+  it "r.multi_route handles loading the same route more than once" do
+    app(:multi_route) do |r|
+      r.multi_route
+    end
+    app.route('foo'){'bar'}
+    body('/foo').must_equal 'bar'
+    app.route('foo'){'baz'}
+    body('/foo').must_equal 'baz'
+  end
+end
+
 describe "multi_route plugin" do
   it "r.multi_route raises error for invalid namespace" do
     app(:multi_route) do |r|

data/spec/plugin/route_csrf_spec.rb

@@ -109,6 +109,25 @@ describe "route_csrf plugin" do
     body("/foo", "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new).must_equal '/foo2'
   end
 
+  it "allows plugin block to integrate with route_block_args plugin" do
+    app(:bare) do
+      send(*DEFAULT_SESSION_ARGS)
+      plugin :route_block_args do
+        [request, request.path, response]
+      end
+      plugin(:route_csrf){|r, path, res| res.write(path); res.write('2')}
+      route do |r|
+        check_csrf!
+        r.post('foo'){'f'}
+        r.get "token", String do |s|
+          csrf_token("/#{s}")
+        end
+      end
+    end
+    body("/foo", "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new("_csrf=#{Rack::Utils.escape(body("/token/foo"))}")).must_equal 'f'
+    body("/foo", "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new).must_equal '/foo2'
+  end
+
   it "raises Error if configuring plugin with invalid :csrf_failure option" do
     route_csrf_app(:csrf_failure=>:foo)
     proc{body("/foo", "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new)}.must_raise Roda::RodaError
@@ -118,6 +137,14 @@ describe "route_csrf plugin" do
     proc{route_csrf_app(:block=>proc{|r| r.path + '2'}, :csrf_failure=>:raise)}.must_raise Roda::RodaError
   end
 
+  deprecated "supports check_csrf! :csrf_failure option as a Proc" do
+    pr = proc{env['BAD'] == '1' ? 't' : 'f'}
+    route_csrf_app{check_csrf!(:csrf_failure=>pr); ''}
+    token = body("/token/foo")
+    body("SKIP"=>"1", "BAD"=>'1', "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new("_csrf=#{Rack::Utils.escape(token)}")).must_equal 't'
+    body("SKIP"=>"1", "BAD"=>'0', "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new("_csrf=#{Rack::Utils.escape(token)}")).must_equal 'f'
+  end
+
   it "supports valid_csrf? method" do
     route_csrf_app{valid_csrf?.to_s}
     body("/a", "REQUEST_METHOD"=>'POST', 'rack.input'=>StringIO.new("_csrf=#{Rack::Utils.escape(body("/token/a"))}")).must_equal 'true'

data/spec/plugin/sessions_spec.rb

@@ -87,7 +87,32 @@ describe "sessions plugin" do
     body('/g/foo').must_equal 'bar'
 
     _, h, b = req('/sc')
-    h['Set-Cookie'].must_include "roda.session=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00"
+
+    # Parameters can come in any order, and only the final parameter may omit the ;
+    ['roda.session=', 'max-age=0', 'path=/'].each do |param|
+      h['Set-Cookie'].must_match /#{Regexp.escape(param)}(;|\z)/
+    end
+    h['Set-Cookie'].must_match /expires=Thu, 01 Jan 1970 00:00:00 (-0000|GMT)(;|\z)/
+
+    b.must_equal ['c']
+
+    errors.must_equal []
+  end
+
+  it "removes session cookie even when max-age and expires are in cookie options" do
+    app.plugin :sessions, :cookie_options=>{:max_age=>'1000', :expires=>Time.now+1000}
+    body('/s/foo/bar').must_equal 'bar'
+    sct = body('/sct').to_i
+    body('/g/foo').must_equal 'bar'
+
+    _, h, b = req('/sc')
+
+    # Parameters can come in any order, and only the final parameter may omit the ;
+    ['roda.session=', 'max-age=0', 'path=/'].each do |param|
+      h['Set-Cookie'].must_match /#{Regexp.escape(param)}(;|\z)/
+    end
+    h['Set-Cookie'].must_match /expires=Thu, 01 Jan 1970 00:00:00 (-0000|GMT)(;|\z)/
+
     b.must_equal ['c']
 
     errors.must_equal []