roda 3.17.0 → 3.18.0

data/spec/plugin/static_routing_spec.rb

@@ -86,6 +86,28 @@ describe "static_routing plugin" do
     a.must_equal [1,3,2]
   end
 
+  it "supports overridding static routes" do
+    app(:static_routing) do |r|
+    end
+    app.static_route('/foo'){'bar'}
+    body('/foo').must_equal 'bar'
+    app.static_route('/foo'){'baz'}
+    body('/foo').must_equal 'baz'
+  end
+
+  it "keeps existing routes when loading the plugin" do
+    app(:bare) do
+      plugin :static_routing
+      static_route "/foo" do |r|
+        "#{r.path}:#{r.remaining_path}"
+      end
+      plugin :static_routing
+
+      route{}
+    end
+    body('/foo').must_equal '/foo:'
+  end
+
   it "does not allow placeholders in static routes" do
     app(:bare) do
       plugin :static_routing
@@ -133,15 +155,15 @@ describe "static_routing plugin" do
   it "freezes static routes when app is frozen" do
     app(:bare) do
       plugin :static_routing
-      static_route "/foo"
+      static_route("/foo"){}
       freeze
 
       proc do
-        static_get "/foo"
+        static_get("/foo"){}
       end.must_raise
 
       proc do
-        static_route "/bar"
+        static_route("/bar"){}
       end.must_raise
     end
   end

data/spec/plugin/status_handler_spec.rb

@@ -22,6 +22,23 @@ describe "status_handler plugin" do
     status("/a").must_equal 200
   end
 
+  it "passes request if block accepts argument" do
+    app(:bare) do
+      plugin :status_handler
+
+      status_handler(404) do |r|
+        r.path + 'foo'
+      end
+
+      route do |r|
+      end
+    end
+
+    body('/').must_equal '/foo'
+    body("/a").must_equal '/afoo'
+    status("/").must_equal 404
+  end
+
   it "allows overriding status inside status_handler" do
     app(:bare) do
       plugin :status_handler

data/spec/route_spec.rb

@@ -0,0 +1,39 @@
+require_relative "spec_helper"
+
+describe "Roda.route" do
+  it "should set the route block" do
+    pr = proc{'123'}
+    app.route(&pr)
+    app.route_block.must_equal pr
+    body.must_equal '123'
+  end
+
+  it "should work if called in subclass and parent class later frozen" do
+    a = app
+    @app = Class.new(a)
+    @app.route{|r| "OK"}
+    body.must_equal "OK"
+    a.freeze
+    body.must_equal "OK"
+    app.freeze
+    body.must_equal "OK"
+  end
+
+  deprecated "should support #call being overridden" do
+    app.class_eval do
+      def call; super end
+    end
+    app.route{'123'}
+    body.must_equal '123'
+  end
+
+  deprecated "should support #_call" do
+    pr = proc{env['PATH_INFO']}
+    app{_call(&pr)}
+    body.must_equal '/'
+  end
+
+  deprecated "should be callable without a block" do
+    app.route.must_be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -77,7 +77,7 @@ class Minitest::Spec
   def app(type=nil, &block)
     case type
     when :new
-      @app = _app{route(&block)}
+      @app = _app{route(&block) if block}
     when :bare
       @app = _app(&block)
     when Symbol
@@ -89,7 +89,7 @@ class Minitest::Spec
       if block
         @app = _app{route(&block)}
       else
-        @app ||= _app{route(&block)}
+        @app ||= _app{}
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.18.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -214,6 +214,7 @@ extra_rdoc_files:
 - 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.18.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -266,6 +267,7 @@ files:
 - 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.18.0.txt
 - doc/release_notes/3.2.0.txt
 - doc/release_notes/3.3.0.txt
 - doc/release_notes/3.4.0.txt
@@ -297,6 +299,7 @@ files:
 - lib/roda/plugins/delay_build.rb
 - lib/roda/plugins/delegate.rb
 - lib/roda/plugins/delete_empty_headers.rb
+- lib/roda/plugins/direct_call.rb
 - lib/roda/plugins/disallow_file_uploads.rb
 - lib/roda/plugins/drop_body.rb
 - lib/roda/plugins/early_hints.rb
@@ -377,6 +380,7 @@ files:
 - spec/assets/css/raw.css
 - spec/assets/js/head/app.js
 - spec/composition_spec.rb
+- spec/define_roda_method_spec.rb
 - spec/env_spec.rb
 - spec/freeze_spec.rb
 - spec/integration_spec.rb
@@ -402,6 +406,7 @@ files:
 - spec/plugin/delay_build_spec.rb
 - spec/plugin/delegate_spec.rb
 - spec/plugin/delete_empty_headers_spec.rb
+- spec/plugin/direct_call_spec.rb
 - spec/plugin/disallow_file_uploads_spec.rb
 - spec/plugin/drop_body_spec.rb
 - spec/plugin/early_hints_spec.rb
@@ -478,6 +483,7 @@ files:
 - spec/redirect_spec.rb
 - spec/request_spec.rb
 - spec/response_spec.rb
+- spec/route_spec.rb
 - spec/session_middleware_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
@@ -525,7 +531,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Routing tree web toolkit