roda 1.3.0 → 2.0.0

data/spec/plugin/middleware_spec.rb

@@ -49,4 +49,11 @@ describe "middleware plugin" do
     body('/a', 'REQUEST_METHOD'=>'PATCH').should == 'a2'
     body('/b', 'REQUEST_METHOD'=>'PATCH').should == 'b1'
   end
+
+  it "makes it still possible to use the Roda app normally" do
+    app(:middleware) do
+      "a"
+    end
+    body.should == 'a'
+  end
 end

data/spec/plugin/padrino_render_spec.rb

@@ -0,0 +1,57 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping padrino_render plugin test"  
+else
+describe "padrino_render plugin" do
+  before do
+    app(:bare) do
+      plugin :padrino_render, :views=>"./spec/views"
+
+      route do |r|
+        r.is "partial" do
+          partial("test", :locals=>{:title => "About Roda"})
+        end
+
+        r.is "partial/subdir" do
+          partial("about/test", :locals=>{:title => "About Roda"})
+        end
+
+        r.is "partial/inline" do
+          partial(:inline=>"Hello <%= name %>", :locals=>{:name => "Agent Smith"})
+        end
+
+        r.is "render" do
+          render(:content=>'bar', :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
+
+        r.is "render/nolayout" do
+          render("about", :locals=>{:title => "No Layout"}, :layout=>nil)
+        end
+      end
+    end
+  end
+
+  it "partial renders without layout, and prepends _ to template" do
+    body("/partial").strip.should == "<h1>About Roda</h1>"
+  end
+
+  it "partial renders without layout, and prepends _ to template" do
+    body("/partial/subdir").strip.should == "<h1>Subdir: About Roda</h1>"
+  end
+
+  it "partial handles inline partials" do
+    body("/partial/inline").strip.should == "Hello Agent Smith"
+  end
+
+  it "render uses layout by default" do
+    body("/render").strip.should == "<title>Roda: Home</title>\nbar"
+  end
+
+  it "render doesn't use layout if layout is nil" do
+    body("/render/nolayout").strip.should == "<h1>No Layout</h1>"
+  end
+end
+end

data/spec/plugin/render_each_spec.rb

@@ -4,7 +4,7 @@ describe "render_each plugin" do
   it "calls render with each argument, returning joined string with all results" do
     app(:bare) do
       plugin :render_each
-      def render(t, opts)
+      def render_template(t, opts)
         "r#{t}#{opts[:locals][:foo] if opts[:locals]}#{opts[:bar]}#{opts[:locals][:bar] if opts[:locals]} "
       end 
 

data/spec/plugin/render_spec.rb

@@ -107,6 +107,62 @@ describe "render plugin" do
     body.strip.should == "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
+  it ":layout=>true/false/string/hash/not-present respects plugin layout switch and template" do
+    app(:bare) do
+      plugin :render, :views=>"./spec/views", :layout_opts=>{:template=>'layout-yield', :locals=>{:title=>'a'}}
+      
+      route do |r|
+        opts = {:content=>'bar'}
+        opts[:layout] = true if r.path == '/'
+        opts[:layout] = false if r.path == '/f'
+        opts[:layout] = 'layout' if r.path == '/s'
+        opts[:layout] = {:template=>'layout'} if r.path == '/h'
+        view(opts)
+      end
+    end
+
+    body.gsub("\n", '').should == "HeaderbarFooter"
+    body('/a').gsub("\n", '').should == "HeaderbarFooter"
+    body('/f').gsub("\n", '').should == "bar"
+    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+
+    app.plugin :render
+    body.gsub("\n", '').should == "HeaderbarFooter"
+    body('/a').gsub("\n", '').should == "HeaderbarFooter"
+    body('/f').gsub("\n", '').should == "bar"
+    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+
+    app.plugin :render, :layout=>true
+    body.gsub("\n", '').should == "HeaderbarFooter"
+    body('/a').gsub("\n", '').should == "HeaderbarFooter"
+    body('/f').gsub("\n", '').should == "bar"
+    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+
+    app.plugin :render, :layout=>'layout-alternative'
+    body.gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
+    body('/a').gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
+    body('/f').gsub("\n", '').should == "bar"
+    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+
+    app.plugin :render, :layout=>nil
+    body.gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
+    body('/a').gsub("\n", '').should == "bar"
+    body('/f').gsub("\n", '').should == "bar"
+    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+
+    app.plugin :render, :layout=>false
+    body.gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
+    body('/a').gsub("\n", '').should == "bar"
+    body('/f').gsub("\n", '').should == "bar"
+    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+  end
+
   it "inline layouts and inline views" do
     app(:render) do
       view({:inline=>'bar'}, :layout=>{:inline=>'Foo: <%= yield %>'})
@@ -141,7 +197,7 @@ describe "render plugin" do
     body.should == "i1"
   end
 
-  it "template cache respects :opts" do
+  it "template cache respects :template_opts" do
     c = Class.new do 
       def initialize(path, _, opts)
         @path = path
@@ -154,10 +210,10 @@ describe "render plugin" do
 
     app(:render) do |r|
       r.is "a" do
-        render(:inline=>"i", :template_class=>c, :opts=>{:foo=>'a'})
+        render(:inline=>"i", :template_class=>c, :template_opts=>{:foo=>'a'})
       end
       r.is "b" do
-        render(:inline=>"i", :template_class=>c, :opts=>{:foo=>'b'})
+        render(:inline=>"i", :template_class=>c, :template_opts=>{:foo=>'b'})
       end
     end
 
@@ -195,8 +251,6 @@ describe "render plugin" do
     sc = Class.new(c)
 
     c.render_opts.should_not equal(sc.render_opts)
-    c.render_opts[:layout_opts].should_not equal(sc.render_opts[:layout_opts])
-    c.render_opts[:template_opts].should_not equal(sc.render_opts[:template_opts])
     c.render_opts[:cache].should_not equal(sc.render_opts[:cache])
   end
 

data/spec/request_spec.rb

@@ -1,17 +1,5 @@
 require File.expand_path("spec_helper", File.dirname(__FILE__))
 
-describe "request.full_path_info" do
-  it "should return the script name and path_info as a string" do
-    app do |r|
-      r.on "foo" do
-        "#{r.full_path_info}:#{r.script_name}:#{r.path_info}"
-      end
-    end
-
-    body("/foo/bar").should ==  "/foo/bar:/foo:/bar"
-  end
-end
-
 describe "request.path, .remaining_path, and .matched_path" do
   it "should return the script name and path_info as a string" do
     app do |r|

data/spec/response_spec.rb

@@ -1,29 +1,5 @@
 require File.expand_path("spec_helper", File.dirname(__FILE__))
 
-describe "cookie handling" do
-  it "should set cookies on response" do
-    app do |r|
-      response.set_cookie("foo", "bar")
-      response.set_cookie("bar", "baz")
-      "Hello"
-    end
-
-    header('Set-Cookie').should == "foo=bar\nbar=baz"
-    body.should == 'Hello'
-  end
-
-  it "should delete cookies on response" do
-    app do |r|
-      response.set_cookie("foo", "bar")
-      response.delete_cookie("foo")
-      "Hello"
-    end
-
-    header('Set-Cookie').should =~ /foo=; (max-age=0; )?expires=Thu, 01[ -]Jan[ -]1970 00:00:00 (-0000|GMT)/
-    body.should == 'Hello'
-  end
-end
-
 describe "response #[] and #[]=" do
   it "should get/set headers" do
     app do |r|

data/spec/views/_test.erb

@@ -0,0 +1 @@
+<h1><%= title %></h1>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -136,6 +136,7 @@ extra_rdoc_files:
 - doc/release_notes/1.1.0.txt
 - doc/release_notes/1.2.0.txt
 - doc/release_notes/1.3.0.txt
+- doc/release_notes/2.0.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -146,6 +147,7 @@ files:
 - doc/release_notes/1.1.0.txt
 - doc/release_notes/1.2.0.txt
 - doc/release_notes/1.3.0.txt
+- doc/release_notes/2.0.0.txt
 - lib/roda.rb
 - lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/all_verbs.rb
@@ -161,7 +163,6 @@ files:
 - lib/roda/plugins/delay_build.rb
 - lib/roda/plugins/delegate.rb
 - lib/roda/plugins/delete_empty_headers.rb
-- lib/roda/plugins/delete_nil_headers.rb
 - lib/roda/plugins/drop_body.rb
 - lib/roda/plugins/empty_root.rb
 - lib/roda/plugins/environments.rb
@@ -185,6 +186,7 @@ files:
 - lib/roda/plugins/named_templates.rb
 - lib/roda/plugins/not_allowed.rb
 - lib/roda/plugins/not_found.rb
+- lib/roda/plugins/padrino_render.rb
 - lib/roda/plugins/param_matchers.rb
 - lib/roda/plugins/pass.rb
 - lib/roda/plugins/path.rb
@@ -209,7 +211,6 @@ files:
 - spec/freeze_spec.rb
 - spec/integration_spec.rb
 - spec/matchers_spec.rb
-- spec/module_spec.rb
 - spec/opts_spec.rb
 - spec/plugin/_erubis_escaping_spec.rb
 - spec/plugin/all_verbs_spec.rb
@@ -248,6 +249,7 @@ files:
 - spec/plugin/named_templates_spec.rb
 - spec/plugin/not_allowed_spec.rb
 - spec/plugin/not_found_spec.rb
+- spec/plugin/padrino_render_spec.rb
 - spec/plugin/param_matchers_spec.rb
 - spec/plugin/pass_spec.rb
 - spec/plugin/path_matchers_spec.rb
@@ -269,6 +271,7 @@ files:
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
+- spec/views/_test.erb
 - spec/views/about.erb
 - spec/views/about.str
 - spec/views/content-yield.erb

data/lib/roda/plugins/delete_nil_headers.rb

@@ -1,34 +0,0 @@
-class Roda
-  module RodaPlugins
-    # The delete_nil_headers plugin deletes any headers whose
-    # value is set to nil.  Because of how default headers are
-    # set in Roda, if you have a default header but don't want
-    # to set it for a specific request, you need to use this plugin
-    # and set the value to nil so that 
-    #
-    # The following example will return "<foo>" as the body.
-    #
-    #   plugin :h
-    #
-    #   route do |r|
-    #     h('<foo>')
-    #   end
-    module DeleteHeaders
-      module ResponseMethods
-        def finish
-          res = super
-          res[1].delete_if{|_, v| v.nil?}
-          res
-        end
-
-        def finish_with_body(_)
-          res = super
-          res[1].delete_if{|_, v| v.nil?}
-          res
-        end
-      end
-    end
-
-    register_plugin(:delete_headers, DeleteHeaders)
-  end
-end

data/spec/module_spec.rb

@@ -1,29 +0,0 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
-
-describe "Roda.request_module and .response_module" do
-  it "should include given module in request or response class" do
-    app(:bare) do
-      request_module(Module.new{def h; halt response.finish end})
-      response_module(Module.new{def finish; [1, {}, []] end})
-
-      route do |r|
-        r.h
-      end
-    end
-
-    req.should == [1, {}, []]
-  end
-
-  it "should accept blocks and turn them into modules" do
-    app(:bare) do
-      request_module{def h; halt response.finish end}
-      response_module{def finish; [1, {}, []] end}
-
-      route do |r|
-        r.h
-      end
-    end
-
-    req.should == [1, {}, []]
-  end
-end