roda 2.29.0 → 3.0.0

data/spec/plugin/request_headers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "request_headers plugin" do
   def header_app(header_name)

data/spec/plugin/response_request_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "response_request plugin" do
   it "gives the response access to the request" do

data/spec/plugin/run_append_slash_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "run_append_slash plugin" do
   before do

data/spec/plugin/run_handler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "run_handler plugin" do 
   it "makes r.run :not_found=>:pass keep going on 404" do

data/spec/plugin/shared_vars_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "shared_vars plugin" do 
   it "adds shared method for sharing variables across multiple apps" do

data/spec/plugin/sinatra_helpers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 require 'uri'
 

data/spec/plugin/slash_path_empty_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "slash_path_empty" do 
   it "considers a / path as empty" do

data/spec/plugin/static_routing_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "static_routing plugin" do 
   it "adds support for static routes that are taken before normal routes" do

data/spec/plugin/static_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "static plugin" do 
   it "adds support for serving static files" do

data/spec/plugin/status_303_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "status_303 plugin" do
   it 'uses a 302 for get requests' do

data/spec/plugin/status_handler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "status_handler plugin" do
   it "executes on no arguments" do

data/spec/plugin/streaming_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "streaming plugin" do 
   it "adds stream method for streaming responses" do
@@ -113,109 +113,4 @@ describe "streaming plugin" do
     b.each{|v| a << v}
     a.must_equal %w'a 1 b 1 c 1 e'
   end
-
-  deprecated "should handle errors when streaming, and run callbacks" do
-    a = []
-    app(:streaming) do |r|
-      stream(:callback=>proc{a << 'e'}) do |out|
-        %w'a b'.each{|v| out << v}
-        raise Roda::RodaError, 'foo'
-        out << 'c'
-      end
-    end
-
-    s, h, b = req
-    s.must_equal 200
-    h.must_equal('Content-Type'=>'text/html')
-    b.callback{a << 'd'}
-    proc{b.each{|v| a << v}}.must_raise(Roda::RodaError)
-    a.must_equal %w'a b e d'
-  end
-
-  deprecated "should handle :loop option to loop" do
-    a = []
-    app(:streaming) do |r|
-      b = %w'a b c'
-      stream(:loop=>true, :callback=>proc{a << 'e'}) do |out|
-        out << b.shift
-        raise Roda::RodaError, 'foo' if b.length == 1
-      end
-    end
-
-    s, h, b = req
-    s.must_equal 200
-    h.must_equal('Content-Type'=>'text/html')
-    b.callback{a << 'd'}
-    proc{b.each{|v| a << v}}.must_raise(Roda::RodaError)
-    a.must_equal %w'a b e d'
-  end
-
-  deprecated "uses handle_stream_error for handling errors when streaming" do
-    a = []
-    app(:streaming) do |r|
-      b = %w'a b c'
-      stream(:loop=>true, :callback=>proc{a << 'e'}) do |out|
-        out << b.shift
-        raise Roda::RodaError, 'foo' if b.length == 1
-      end
-    end
-
-    app.send(:define_method, :handle_stream_error) do |error, out|
-      out << '1'
-      raise error
-    end
-
-    s, h, b = req
-    s.must_equal 200
-    h.must_equal('Content-Type'=>'text/html')
-    b.callback{a << 'd'}
-    proc{b.each{|v| a << v}}.must_raise(Roda::RodaError)
-    a.must_equal %w'a b 1 e d'
-  end
-
-  deprecated "should allow closing the stream when handling an error" do
-    a = []
-    app(:streaming) do |r|
-      b = %w'a b c'
-      stream(:loop=>true, :callback=>proc{a << 'e'}) do |out|
-        out << b.shift
-        raise Roda::RodaError, 'foo' if b.length == 1
-      end
-    end
-
-    app.send(:define_method, :handle_stream_error) do |error, out|
-      out.close
-    end
-
-    s, h, b = req
-    s.must_equal 200
-    h.must_equal('Content-Type'=>'text/html')
-    b.callback{a << 'd'}
-    b.each{|v| a << v}
-    a.must_equal %w'a b e d'
-  end
-
-  deprecated "should allow ignoring errors when streaming" do
-    a = []
-    b2 = %w'a b c'
-
-    app(:streaming) do |r|
-      stream(:loop=>true, :callback=>proc{a << 'e'}) do |out|
-        out << b2.shift
-        raise Roda::RodaError
-      end
-    end
-
-    app.send(:define_method, :handle_stream_error) do |error, out|
-      out << '1'
-      out.close if b2.empty?
-    end
-
-    s, h, b = req
-    s.must_equal 200
-    h.must_equal('Content-Type'=>'text/html')
-    b.callback{a << 'd'}
-    b.each{|v| a << v}
-    a.must_equal %w'a 1 b 1 c 1 e d'
-  end
 end

data/spec/plugin/strip_path_prefix_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "strip_path_prefix plugin" do 
   it "strips path prefix when expanding paths" do

data/spec/plugin/symbol_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "symbol_matchers plugin" do 
   it "allows symbol specific regexps for symbol matchers" do
@@ -48,80 +48,4 @@ describe "symbol_matchers plugin" do
     body('/q/').must_equal 'rest'
     body('/thing2/q').must_equal 'thing2q'
   end
-
-  deprecated "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
-
-        r.is "bar:opt" do |o|
-          "bar#{o.inspect}"
-        end
-
-        r.is "format:format" do |f|
-          "format#{f.inspect}"
-        end
-
-        r.is "thing/:thing" do |d|
-          "thing#{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("/foo").must_equal 'foonil'
-    body("/foo/123").must_equal 'foo"123"'
-    status("/foo/bar").must_equal 404
-    status("/foo/123/a").must_equal 404
-    body("/bar").must_equal 'barnil'
-    body("/bar/foo").must_equal 'bar"foo"'
-    status("/bar/foo/baz").must_equal 404
-    body("/format").must_equal 'formatnil'
-    body("/format.json").must_equal 'format"json"'
-    status("/format.").must_equal 404
-    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("/qa/b/c/d//f/g").must_equal 'resta/b/c/d//f/g'
-    body('/q').must_equal 'rest'
-    body('/thing/q').must_equal 'thingq'
-    body('/thing2/q').must_equal 'thing2q'
-  end
 end

data/spec/plugin/symbol_status_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "symbol_status plugin" do
   it "accepts a symbol" do

data/spec/plugin/symbol_views_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "symbol_views plugin" do
   before do

data/spec/plugin/type_routing_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "type_routing plugin" do
   before do

data/spec/plugin/unescape_path_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "unescape_path_path plugin" do 
   it "decodes URL-encoded routing path" do

data/spec/plugin/view_options_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'
@@ -45,6 +45,21 @@ describe "view_options plugin view subdirs" do
 end
 
 describe "view_options plugin" do
+  it "should not use :views view option for layout" 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 set view and layout options to use" do
     app(:bare) do
       plugin :render, :allowed_paths=>['spec/views']
@@ -80,114 +95,5 @@ describe "view_options plugin" do
 
     body.strip.must_equal "About Roda:A::Home:B"
   end
-
-  deprecated "should set view and layout options and locals to use" do
-    app(:view_options) do
-      set_view_options :views=>'spec/views'
-      set_view_locals :title=>'About Roda'
-      set_layout_options :views=>'spec/views', :template=>'layout-alternative'
-      set_layout_locals :title=>'Home'
-      view('about')
-    end
-
-    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>About Roda</h1>"
-  end
-
-  deprecated "should merge multiple calls to set view and layout options and locals" do
-    app(:view_options) do
-      set_layout_options :views=>'spec/views', :template=>'multiple-layout', :engine=>'str'
-      set_view_options :views=>'spec/views', :engine=>'str'
-      set_layout_locals :title=>'About Roda'
-      set_view_locals :title=>'Home'
-
-      set_layout_options :engine=>'erb'
-      set_view_options :engine=>'erb'
-      set_layout_locals :a=>'A'
-      set_view_locals :b=>'B'
-
-      view('multiple')
-    end
-
-    body.strip.must_equal "About Roda:A::Home:B"
-  end
-
-  deprecated "should have set_view_locals have more precedence than plugin options, but less than view/render method options" do
-    app(:bare) do 
-      plugin :render, :views=>"./spec/views", :locals=>{:title=>'Home', :b=>'B'}, :layout_opts=>{:template=>'multiple-layout', :locals=>{:title=>'About Roda', :a=>'A'}}
-      plugin :view_options
-
-      route do |r|
-        r.is 'c' do
-          view(:multiple)
-        end
-
-        set_view_locals :b=>'BB'
-        set_layout_locals :a=>'AA'
-
-        r.on 'b' do
-          set_view_locals :title=>'About'
-          set_layout_locals :title=>'Roda'
-
-          r.is 'a' do
-            view(:multiple)
-          end
-
-          view("multiple", :locals=>{:b => "BBB"}, :layout_opts=>{:locals=>{:a=>'AAA'}})
-        end
-
-        r.is 'a' do
-          view(:multiple)
-        end
-
-        view("multiple", :locals=>{:b => "BBB"}, :layout_opts=>{:locals=>{:a=>'AAA'}})
-      end
-    end
-
-    body('/c').strip.must_equal "About Roda:A::Home:B"
-    body('/b/a').strip.must_equal "Roda:AA::About:BB"
-    body('/b').strip.must_equal "Roda:AAA::About:BBB"
-    body('/a').strip.must_equal "About Roda:AA::Home:BB"
-    body.strip.must_equal "About Roda:AAA::Home:BBB"
-  end
-
-  deprecated "should have set_view_locals have more precedence than plugin options, but less than view/render method options" do
-    app(:bare) do 
-      plugin :render, :views=>"./spec/views", :layout_opts=>{:template=>'multiple-layout'}
-      plugin :render_locals, :render=>{:title=>'Home', :b=>'B'}, :layout=>{:title=>'About Roda', :a=>'A'}
-      plugin :view_options
-
-      route do |r|
-        r.is 'c' do
-          view(:multiple)
-        end
-
-        set_view_locals :b=>'BB'
-        set_layout_locals :a=>'AA'
-
-        r.on 'b' do
-          set_view_locals :title=>'About'
-          set_layout_locals :title=>'Roda'
-
-          r.is 'a' do
-            view(:multiple)
-          end
-
-          view("multiple", :locals=>{:b => "BBB"}, :layout_opts=>{:locals=>{:a=>'AAA'}})
-        end
-
-        r.is 'a' do
-          view(:multiple)
-        end
-
-        view("multiple", :locals=>{:b => "BBB"}, :layout_opts=>{:locals=>{:a=>'AAA'}})
-      end
-    end
-
-    body('/c').strip.must_equal "About Roda:A::Home:B"
-    body('/b/a').strip.must_equal "Roda:AA::About:BB"
-    body('/b').strip.must_equal "Roda:AAA::About:BBB"
-    body('/a').strip.must_equal "About Roda:AA::Home:BB"
-    body.strip.must_equal "About Roda:AAA::Home:BBB"
-  end
 end
 end