roda 2.28.0 → 2.29.0

data/spec/plugin/_erubis_escaping_spec.rb

@@ -20,7 +20,7 @@ describe "_erubis_escaping plugin" do
     end
   end
 
-  it "should escape inside <%= %> and not inside <%== %>, and handle postfix conditionals" do
+  deprecated "should escape inside <%= %> and not inside <%== %>, and handle postfix conditionals" do
     app(:bare) do
       plugin :render, :escape=>true
 
@@ -32,7 +32,7 @@ describe "_erubis_escaping plugin" do
     body.must_equal '&lt;&gt; <>'
   end
 
-  it "should consider classes in :escape_safe_classes as safe" do
+  deprecated "should consider classes in :escape_safe_classes as safe" do
     c = Class.new(String)
     c2 = Class.new(String)
     app(:bare) do
@@ -47,7 +47,7 @@ describe "_erubis_escaping plugin" do
     body.must_equal '&lt;&gt; <>'
   end
 
-  it "should covnert arguments to strings when escaping with safe classes" do
+  deprecated "should covnert arguments to strings when escaping with safe classes" do
     app(:bare) do
       plugin :render, :escape=>true, :escape_safe_classes=>[]
 
@@ -59,7 +59,7 @@ describe "_erubis_escaping plugin" do
     body.must_equal '&lt;&gt; <>'
   end
 
-  it "should allow use of custom :escaper" do
+  deprecated "should allow use of custom :escaper" do
     escaper = Object.new
     def escaper.escape_xml(s)
       s.gsub("'", "''")
@@ -75,7 +75,7 @@ describe "_erubis_escaping plugin" do
     body.must_equal "ab''1 ab'1"
   end
 
-  it "should allow for per-branch escaping via set_view options" do
+  deprecated "should allow for per-branch escaping via set_view options" do
     app(:bare) do
       plugin :render, :escape=>true
       plugin :view_options

data/spec/plugin/backtracking_array_spec.rb

@@ -38,7 +38,5 @@ describe "backtracking_array plugin" do
     end
 
     tests.call
-    app.plugin(:static_path_info)
-    tests.call
   end
 end

data/spec/plugin/branch_locals_spec.rb

@@ -0,0 +1,88 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping branch_locals plugin test"  
+else
+
+describe "branch_locals plugin" do
+  it "should set view and layout locals to use" do
+    app(:branch_locals) do
+      set_view_locals :title=>'About Roda'
+      set_layout_locals :title=>'Home'
+      view(:inline=>'<h1><%= title %></h1>', :layout=>{:inline=>"<title>Alternative Layout: <%= title %></title>\n<%= yield %>"})
+    end
+
+    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>About Roda</h1>"
+  end
+
+  it "should merge multiple calls to set view and layout locals" do
+    app(:branch_locals) do
+      set_layout_locals :title=>'About Roda'
+      set_view_locals :title=>'Home'
+
+      set_layout_locals :a=>'A'
+      set_view_locals :b=>'B'
+
+      view(:inline=>'<%= title %>:<%= b %>', :layout=>{:inline=>"<%= title %>:<%= a %>::<%= yield %>"})
+    end
+
+    body.strip.must_equal "About Roda:A::Home:B"
+  end
+
+  it "should merge multiple calls in the correct order" do
+    app(:branch_locals) do
+      set_layout_locals :title=>'Roda'
+      set_view_locals :title=>'H'
+
+      set_layout_locals :a=>'A', :title=>'About Roda'
+      set_view_locals :b=>'B', :title=>'Home'
+
+      view(:inline=>'<%= title %>:<%= b %>', :layout=>{:inline=>"<%= title %>:<%= a %>::<%= yield %>"})
+    end
+
+    body.strip.must_equal "About Roda:A::Home:B"
+  end
+
+  it "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 :branch_locals
+
+      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

data/spec/plugin/content_for_spec.rb

@@ -52,11 +52,17 @@ describe "content_for plugin with multiple calls to the same key" do
     end
   end
 
-  it "should replace with multiple calls to the same key by default" do
+  deprecated "should replace with multiple calls to the same key by default" do
     body.strip.must_equal "bar baz"
   end
 
-  it "should append with multiple calls to the same key if :append plugin option is used" do
+  it "should replace with multiple calls to the same key if :append=>false plugin option is used" do
+    app.plugin :content_for, :append => false
+    body.strip.must_equal "bar baz"
+  end
+
+  # RODA3: Make default behavior
+  it "should append with multiple calls to the same key if :append=>true plugin option is used" do
     app.plugin :content_for, :append => true
     body.strip.must_equal "bar foobaz"
   end

data/spec/plugin/halt_spec.rb

@@ -102,6 +102,14 @@ describe "halt plugin" do
   end
 
   it "should raise an error for single argument not integer, String, or Array" do
+    app(:halt) do |r|
+      r.halt nil
+    end
+
+    proc{req}.must_raise(Roda::RodaError)
+  end
+
+  deprecated "should raise an error for single argument not integer, String, or Array" do
     app(:halt) do |r|
       r.halt('a'=>'b')
     end

data/spec/plugin/header_matchers_spec.rb

@@ -14,7 +14,8 @@ describe "accept matcher" do
 end
 
 describe "header matcher" do
-  it "should match if header present" do
+  # RODA3: undeprecate, and switch http-accept to accept
+  deprecated "should match if header present" do
     app(:header_matchers) do |r|
       r.on :header=>"http-accept" do
         "bar"
@@ -28,15 +29,17 @@ describe "header matcher" do
 
   it "should yield the header value" do
     app(:header_matchers) do |r|
-      r.on :header=>"http-accept" do |v|
+      r.on :header=>"accept" do |v|
         "bar-#{v}"
       end
     end
 
+    app.opts[:header_matcher_prefix] = true
     body("HTTP_ACCEPT" => "application/xml").must_equal  "bar-application/xml"
     status.must_equal 404
   end
 
+  # RODA3: Remove
   it "should automatically use HTTP prefix for headers if :header_matcher_prefix is set" do
     app(:bare) do
       plugin :header_matchers
@@ -65,7 +68,8 @@ describe "host matcher" do
     status("HTTP_HOST" => "foo.com").must_equal 404
   end
 
-  it "should match a host with a regexp" do
+  # RODA3: switch deprecated to it
+  deprecated "should match a host with a regexp" do
     app(:header_matchers) do |r|
       r.on :host=>/example/ do
         "worked"
@@ -76,7 +80,7 @@ describe "host matcher" do
     status("HTTP_HOST" => "foo.com").must_equal 404
   end
 
-  it "doesn't yield host" do
+  it "doesn't yield host if given a string" do
     app(:header_matchers) do |r|
       r.on :host=>"example.com" do |*args|
         args.size.to_s
@@ -86,7 +90,7 @@ describe "host matcher" do
     body("HTTP_HOST" => "example.com").must_equal '0'
   end
 
-  it "yields host if passed a regexp and opts[:host_matcher_captures] is set" do
+  deprecated "doesn't yield host if passed a regexp" do
     app(:header_matchers) do |r|
       r.on :host=>/\A(.*)\.example\.com\z/ do |*m|
         m.empty? ? '0' : m[0]
@@ -94,10 +98,21 @@ describe "host matcher" do
     end
 
     body("HTTP_HOST" => "foo.example.com").must_equal '0'
+  end
+
+  # RODA3: Remove :host_matcher_captures setting
+  it "yields host if passed a regexp and opts[:host_matcher_captures] is set" do
+    app(:header_matchers) do |r|
+      r.on :host=>/\A(.*)\.example\.com\z/ do |*m|
+        m.empty? ? '0' : m[0]
+      end
+    end
+
     app.opts[:host_matcher_captures] = true
     body("HTTP_HOST" => "foo.example.com").must_equal 'foo'
   end
 
+  # RODA3: Remove
   it "doesn't yields host if passed a string and opts[:host_matcher_captures] is set" do
     app(:header_matchers) do |r|
       r.on :host=>'example.com' do |*m|

data/spec/plugin/multi_route_spec.rb

@@ -171,7 +171,7 @@ describe "multi_route plugin" do
 end
 
 describe "multi_route plugin" do
-  it "r.multi_route works even without routes defined" do
+  deprecated "r.multi_route works even without routes defined" do
     app(:multi_route) do |r|
       r.multi_route
       'a'

data/spec/plugin/named_templates_spec.rb

@@ -55,10 +55,10 @@ describe "named_templates plugin" do
     proc{app.template(:b){"a"}}.must_raise
   end
 
-  it "works with the view_subdirs plugin" do
+  it "works with the view_options plugin" do
     app(:bare) do
       plugin :render
-      plugin :view_subdirs
+      plugin :view_options
       plugin :named_templates
 
       template "foo/bar" do

data/spec/plugin/params_capturing_spec.rb

@@ -31,7 +31,7 @@ describe "params_capturing plugin" do
     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
+  deprecated "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}"

data/spec/plugin/per_thread_caching_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 describe "per_thread_caching plugin" do 
-  it "should use a per thread cache instead of a shared cache" do
+  deprecated "should use a per thread cache instead of a shared cache" do
     app(:bare) do
       plugin :per_thread_caching
       @c = thread_safe_cache

data/spec/plugin/placeholder_string_matchers_spec.rb

@@ -0,0 +1,159 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "placeholder_string_matchers plugin" do
+  it "should handle string with embedded param" do
+    app(:placeholder_string_matchers) do |r|
+      r.on "posts/:id" do |id|
+        id
+      end
+
+      r.on "responses-:id" do |id|
+        id
+      end
+    end
+
+    body('/posts/123').must_equal '123'
+    status('/post/123').must_equal 404
+    body('/responses-123').must_equal '123'
+  end
+
+  it "should handle multiple params in single string" do
+    app(:placeholder_string_matchers) do |r|
+      r.on "u/:uid/posts/:id" do |uid, id|
+        uid + id
+      end
+    end
+
+    body("/u/jdoe/posts/123").must_equal 'jdoe123'
+    status("/u/jdoe/pots/123").must_equal 404
+  end
+
+  it "should escape regexp metacharaters in string" do
+    app(:placeholder_string_matchers) do |r|
+      r.on "u/:uid/posts?/:id" do |uid, id|
+        uid + id
+      end
+    end
+
+    body("/u/jdoe/posts?/123").must_equal 'jdoe123'
+    status("/u/jdoe/post/123").must_equal 404
+  end
+
+  it "should handle colons by themselves" do
+    app(:placeholder_string_matchers) do |r|
+      r.on "u/:/:uid/posts/::id" do |uid, id|
+        uid + id
+      end
+    end
+
+    body("/u/:/jdoe/posts/:123").must_equal 'jdoe123'
+    status("/u/a/jdoe/post/b123").must_equal 404
+  end
+
+  it "should work with params_capturing plugin to add captures to r.params for string matchers" do
+    app(:bare) do
+      plugin :placeholder_string_matchers
+      plugin :params_capturing
+
+      route 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
+    end
+
+    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
+
+  it "works with symbol_matchers plugin" do
+    app(:bare) do
+      plugin :placeholder_string_matchers
+      plugin :symbol_matchers
+      symbol_matcher(:f, /(f+)/)
+
+      route do |r|
+        r.is ":d" do |d|
+          "d#{d}"
+        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("/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
+
+  deprecated "works with symbol_matchers plugin and deprecated matchers" do
+    app(:bare) do
+      plugin :placeholder_string_matchers
+      plugin :symbol_matchers
+      symbol_matcher(:f, /(f+)/)
+
+      route do |r|
+        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
+      end
+    end
+
+    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
+  end
+end