roda 2.0.0 → 2.1.0

data/spec/plugin/named_templates_spec.rb

@@ -1,5 +1,10 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping named_templates plugin test"  
+else
 describe "named_templates plugin" do 
   it "adds template method method for naming templates, and have render recognize it" do
     app(:bare) do
@@ -88,3 +93,4 @@ describe "named_templates plugin" do
     body('/bar').should == 'bar43-barfoo42-baz'
   end
 end
+end

data/spec/plugin/not_found_spec.rb

@@ -102,7 +102,7 @@ describe "not_found plugin" do
       end
 
       o = Object.new
-      def o.join() '' end
+      def o.each; end
       route do |r|
         r.halt [404, {}, o]
       end

data/spec/plugin/path_spec.rb

@@ -9,6 +9,15 @@ describe "path plugin" do
     end
   end
 
+  def path_script_name_app(*args, &block)
+    app(:bare) do
+      opts[:add_script_name] = true
+      plugin :path
+      path *args, &block
+      route{|r| send(r.path_info)}
+    end
+  end
+
   def path_block_app(b, *args, &block)
     path_app(*args, &block)
     app.route{|r| send(r.path_info, &b)}
@@ -58,6 +67,16 @@ describe "path plugin" do
     body("foo_path", 'SCRIPT_NAME'=>'/baz').should == "/baz/bar/foo"
   end
 
+  it "respects :add_script_name app option for automatically adding the script name" do
+    path_script_name_app(:foo){"/bar/foo"}
+    body("foo_path", 'SCRIPT_NAME'=>'/baz').should == "/baz/bar/foo"
+  end
+
+  it "supports :add_script_name=>false option for not automatically adding the script name" do
+    path_script_name_app(:foo, :add_script_name=>false){"/bar/foo"}
+    body("foo_path", 'SCRIPT_NAME'=>'/baz').should == "/bar/foo"
+  end
+
   it "supports path method accepting a block when using :add_script_name" do
     path_block_app(lambda{"c"}, :foo, :add_script_name=>true){|&block| "/bar/foo/#{block.call}"}
     body("foo_path", 'SCRIPT_NAME'=>'/baz').should == "/baz/bar/foo/c"
@@ -91,3 +110,60 @@ describe "path plugin" do
     body("foo_url", 'HTTP_HOST'=>'example.org', "rack.url_scheme"=>'http', 'SERVER_PORT'=>81).should == "http://example.org:81/bar/foo"
   end
 end
+
+describe "path plugin" do 
+  before do
+    app(:bare) do
+      plugin :path
+      route{|r| path(*env['path'])}
+    end
+
+
+    c = Class.new{attr_accessor :a}
+    app.path(c){|obj, *args| "/d/#{obj.a}/#{File.join(*args)}"}
+    @obj = c.new
+    @obj.a = 1
+  end
+
+  it "Roda#path respects classes and symbols registered via Roda.path" do
+    # Strings
+    body('path'=>'/foo/bar').should == '/foo/bar'
+
+    # Classes
+    body('path'=>@obj).should == '/d/1/'
+    body('path'=>[@obj, 'foo']).should == '/d/1/foo'
+    body('path'=>[@obj, 'foo', 'bar']).should == '/d/1/foo/bar'
+  end
+
+  it "Roda#path raises an error for an unrecognized class" do
+    # Strings
+    proc{body('path'=>:foo)}.should raise_error(Roda::RodaError)
+  end
+
+  it "Roda#path respects :add_script_name app option" do
+    app.opts[:add_script_name] = true
+
+    # Strings
+    body('path'=>'/foo/bar', 'SCRIPT_NAME'=>'/baz').should == '/baz/foo/bar'
+
+    # Classes
+    body('path'=>@obj, 'SCRIPT_NAME'=>'/baz').should == '/baz/d/1/'
+    body('path'=>[@obj, 'foo'], 'SCRIPT_NAME'=>'/baz').should == '/baz/d/1/foo'
+    body('path'=>[@obj, 'foo', 'bar'], 'SCRIPT_NAME'=>'/baz').should == '/baz/d/1/foo/bar'
+  end
+
+  it "Roda.path doesn't work with classes without blocks" do
+    proc{app.path(Class.new)}.should raise_error(Roda::RodaError)
+  end
+
+  it "Roda.path doesn't work with classes with paths or options" do
+    proc{app.path(Class.new, '/a'){}}.should raise_error(Roda::RodaError)
+    proc{app.path(Class.new, nil, :a=>1){}}.should raise_error(Roda::RodaError)
+  end
+
+  it "Roda.path doesn't work after freezing the app" do
+    app.freeze
+    proc{app.path(Class.new){|obj| ''}}.should raise_error
+  end
+end
+

data/spec/plugin/render_each_spec.rb

@@ -1,5 +1,10 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping render_each plugin test"  
+else
 describe "render_each plugin" do 
   it "calls render with each argument, returning joined string with all results" do
     app(:bare) do
@@ -33,3 +38,4 @@ describe "render_each plugin" do
     body("/c").should == 'rbar41 rbar42 rbar43 '
   end
 end
+end

data/spec/plugin/render_spec.rb

@@ -107,6 +107,18 @@ describe "render plugin" do
     body.strip.should == "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
+  it "locals overrides" do
+    app(:bare) do
+      plugin :render, :views=>"./spec/views", :locals=>{:title=>'Home', :b=>'B'}, :layout_opts=>{:template=>'multiple-layout', :locals=>{:title=>'Roda', :a=>'A'}}
+      
+      route do |r|
+        view("multiple", :locals=>{:b=>"BB"}, :layout_opts=>{:locals=>{:a=>'AA'}})
+      end
+    end
+
+    body.strip.should == "Roda:AA::Home:BB"
+  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'}}
@@ -149,13 +161,20 @@ describe "render plugin" do
     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.gsub("\n", '').should == "HeaderbarFooter"
     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 == "HeaderbarFooter"
+    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_opts=>{:template=>'layout-alternative', :locals=>{:title=>'a'}}
     body.gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
     body('/a').gsub("\n", '').should == "bar"
     body('/f').gsub("\n", '').should == "bar"
@@ -163,6 +182,26 @@ describe "render plugin" do
     body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
   end
 
+  it "app :root option affects :views default" do
+    app
+    app.plugin :render
+    app.render_opts[:views].should == File.join(Dir.pwd, 'views')
+
+    app.opts[:root] = '/foo'
+    app.plugin :render
+    app.render_opts[:views].should == '/foo/views'
+
+    app.opts[:root] = '/foo/bar'
+    app.plugin :render
+    app.render_opts[:views].should == '/foo/bar/views'
+
+    app.opts[:root] = nil
+    app.plugin :render
+    app.render_opts[:views].should == File.join(Dir.pwd, 'views')
+    app.plugin :render, :views=>'bar'
+    app.render_opts[:views].should == File.join(Dir.pwd, 'bar')
+  end
+
   it "inline layouts and inline views" do
     app(:render) do
       view({:inline=>'bar'}, :layout=>{:inline=>'Foo: <%= yield %>'})

data/spec/plugin/sinatra_helpers_spec.rb

@@ -83,6 +83,11 @@ describe "sinatra_helpers plugin" do
       header('Content-Length').should == '11'
     end
 
+    it 'supports #join' do
+      sin_app{body{'Hello World'}; nil}
+      req[2].join.should == 'Hello World'
+    end
+
     it 'takes a String, Array, or other object responding to #each' do
       sin_app{body 'Hello World'; nil}
       body.should == 'Hello World'

data/spec/plugin/static_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "static plugin" do 
+  it "adds support for serving static files" do
+    app(:bare) do
+      plugin :static, ['/about'], :root=>'spec/views'
+
+      route do
+        'a'
+      end
+    end
+
+    body.should == 'a'
+    body('/about/_test.erb').should == File.read('spec/views/about/_test.erb')
+  end
+
+  it "respects the application's :root option" do
+    app(:bare) do
+      opts[:root] = File.expand_path('../../', __FILE__)
+      plugin :static, ['/about'], :root=>'views'
+
+      route do
+        'a'
+      end
+    end
+
+    body.should == 'a'
+    body('/about/_test.erb').should == File.read('spec/views/about/_test.erb')
+  end
+end

data/spec/plugin/view_options_spec.rb

@@ -0,0 +1,117 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping view_options plugin test"  
+else
+describe "view_options plugin view subdirs" do
+  before do
+    app(:bare) do
+      plugin :render, :views=>"."
+      plugin :view_options
+
+      route do |r|
+        append_view_subdir 'spec' 
+
+        r.on "home" do
+          set_view_subdir 'spec/views'
+          view("home", :locals=>{:name => "Agent Smith", :title => "Home"}, :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
+
+        r.on "about" do
+          append_view_subdir 'views'
+          render("about", :locals=>{:title => "About Roda"})
+        end
+
+        r.on "path" do
+          render('spec/views/about', :locals=>{:title => "Path"}, :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
+      end
+    end
+  end
+
+  it "should use set subdir if template name does not contain a slash" do
+    body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
+  end
+
+  it "should not use set subdir if template name contains a slash" do
+    body("/about").strip.should == "<h1>About Roda</h1>"
+  end
+
+  it "should not change behavior when subdir is not set" do
+    body("/path").strip.should == "<h1>Path</h1>"
+  end
+end
+
+describe "view_options plugin" do
+  it "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.should == "<title>Alternative Layout: Home</title>\n<h1>About Roda</h1>"
+  end
+
+  it "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', :ext=>'str'
+      set_view_options :views=>'spec/views', :ext=>'str'
+      set_layout_locals :title=>'About Roda'
+      set_view_locals :title=>'Home'
+
+      set_layout_options :ext=>'erb'
+      set_view_options :ext=>'erb'
+      set_layout_locals :a=>'A'
+      set_view_locals :b=>'B'
+
+      view('multiple')
+    end
+
+    body.strip.should == "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", :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.should == "About Roda:A::Home:B"
+    body('/b/a').strip.should == "Roda:AA::About:BB"
+    body('/b').strip.should == "Roda:AAA::About:BBB"
+    body('/a').strip.should == "About Roda:AA::Home:BB"
+    body.strip.should == "About Roda:AAA::Home:BBB"
+  end
+end
+end

data/spec/spec_helper.rb

@@ -80,7 +80,11 @@ class RSPEC_EXAMPLE_GROUP
   end
 
   def body(path='/', env={})
-    req(path, env)[2].join
+    s = ''
+    b = req(path, env)[2]
+    b.each{|x| s << x}
+    b.close if b.respond_to?(:close)
+    s
   end
 
   def _app(&block)

data/spec/views/multiple-layout.erb

@@ -0,0 +1 @@
+<%= title %>:<%= a %>::<%= yield %>

data/spec/views/multiple.erb

@@ -0,0 +1 @@
+<%= title %>:<%= b %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -137,6 +137,7 @@ extra_rdoc_files:
 - doc/release_notes/1.2.0.txt
 - doc/release_notes/1.3.0.txt
 - doc/release_notes/2.0.0.txt
+- doc/release_notes/2.1.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -148,6 +149,7 @@ files:
 - doc/release_notes/1.2.0.txt
 - doc/release_notes/1.3.0.txt
 - doc/release_notes/2.0.0.txt
+- doc/release_notes/2.1.0.txt
 - lib/roda.rb
 - lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/all_verbs.rb
@@ -196,10 +198,12 @@ files:
 - lib/roda/plugins/render_each.rb
 - lib/roda/plugins/sinatra_helpers.rb
 - lib/roda/plugins/slash_path_empty.rb
+- lib/roda/plugins/static.rb
 - lib/roda/plugins/static_path_info.rb
 - lib/roda/plugins/streaming.rb
 - lib/roda/plugins/symbol_matchers.rb
 - lib/roda/plugins/symbol_views.rb
+- lib/roda/plugins/view_options.rb
 - lib/roda/plugins/view_subdirs.rb
 - lib/roda/version.rb
 - spec/assets/css/app.scss
@@ -259,11 +263,11 @@ files:
 - spec/plugin/render_spec.rb
 - spec/plugin/sinatra_helpers_spec.rb
 - spec/plugin/slash_path_empty_spec.rb
-- spec/plugin/static_path_info_spec.rb
+- spec/plugin/static_spec.rb
 - spec/plugin/streaming_spec.rb
 - spec/plugin/symbol_matchers_spec.rb
 - spec/plugin/symbol_views_spec.rb
-- spec/plugin/view_subdirs_spec.rb
+- spec/plugin/view_options_spec.rb
 - spec/plugin_spec.rb
 - spec/redirect_spec.rb
 - spec/request_spec.rb
@@ -281,6 +285,8 @@ files:
 - spec/views/layout-yield.erb
 - spec/views/layout.erb
 - spec/views/layout.str
+- spec/views/multiple-layout.erb
+- spec/views/multiple.erb
 homepage: http://roda.jeremyevans.net
 licenses:
 - MIT