roda 2.0.0 → 2.1.0

data/lib/roda/plugins/view_subdirs.rb

@@ -1,63 +1,6 @@
-class Roda
-  module RodaPlugins
-    # The view_subdirs plugin is designed for sites that have
-    # outgrown a flat view directory and use subdirectories
-    # for views.  It allows you to set the view directory to
-    # use, and template names that do not contain a slash will
-    # automatically use that view subdirectory.  Example:
-    #
-    #   plugin :render, :layout=>'./layout'
-    #   plugin :view_subdirs
-    #
-    #   route do |r|
-    #     r.on "users" do
-    #       set_view_subdir 'users'
-    #       
-    #       r.get :id do
-    #         view 'profile' # uses ./views/users/profile.erb
-    #       end
-    #
-    #       r.get 'list' do
-    #         view 'lists/users' # uses ./views/lists/users.erb
-    #       end
-    #     end
-    #   end
-    #
-    # Note that when a view subdirectory is set, the layout will
-    # also be looked up in the subdirectory unless it contains
-    # a slash.  So if you want to use a view subdirectory for
-    # templates but have a shared layout, you should make sure your
-    # layout contains a slash, similar to the example above.
-    module ViewSubdirs
-      # Load the render plugin before this plugin, since this plugin
-      # works by overriding a method in the render plugin.
-      def self.load_dependencies(app)
-        app.plugin :render
-      end
-
-      module InstanceMethods
-        # Set the view subdirectory to use.  This can be set to nil
-        # to not use a view subdirectory.
-        def set_view_subdir(v)
-          @_view_subdir = v
-        end
-
-        private
-
-        # Override the template name to use the view subdirectory if the
-        # there is a view subdirectory and the template name does not
-        # contain a slash.
-        def template_name(opts)
-          name = super
-          if (v = @_view_subdir) && name !~ /\//
-            "#{v}/#{name}"
-          else
-            name
-          end
-        end
-      end
-    end
-
-    register_plugin(:view_subdirs, ViewSubdirs)
-  end
-end
+# View options is a superset of the view_subdirs plugin,
+# which no longer exists.  For backwards compatibility,
+# make attempts to load the view_subdirs plugin load the
+# view_options plugin instead.
+require 'roda/plugins/view_options'
+Roda::RodaPlugins.register_plugin(:view_subdirs, Roda::RodaPlugins::ViewOptions)

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 2
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 0
+  RodaMinorVersion = 1
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/spec/composition_spec.rb

@@ -16,4 +16,16 @@ describe "r.run" do
 
     body("/provider/services/101").should == 'View 101'
   end
+
+  it "modifies SCRIPT_NAME/PATH_INFO when calling run" do
+    a = app{|r| "#{r.script_name}|#{r.path_info}"}
+    app(:static_path_info){|r| r.on("a"){r.run a}}
+    body("/a/b").should == "/a|/b"
+  end
+
+  it "restores SCRIPT_NAME/PATH_INFO before returning from run" do
+    a = app{|r| "#{r.script_name}|#{r.path_info}"}
+    app(:static_path_info){|r| s = catch(:halt){r.on("a"){r.run a}}; "#{s[2].join}%#{r.script_name}|#{r.path_info}"}
+    body("/a/b").should == "/a|/b%|/a/b"
+  end
 end

data/spec/matchers_spec.rb

@@ -291,6 +291,40 @@ describe "r.on" do
     body("/123").should == '+1'
   end
 
+  it "does not modify SCRIPT_NAME/PATH_INFO during routing" do
+    app(:pass) do |r|
+      r.on "foo" do
+        r.is "bar" do
+          "bar|#{env['SCRIPT_NAME']}|#{env['PATH_INFO']}"
+        end
+        r.is "baz" do
+          r.pass
+        end
+        "foo|#{env['SCRIPT_NAME']}|#{env['PATH_INFO']}"
+      end
+      "#{env['SCRIPT_NAME']}|#{env['PATH_INFO']}"
+    end
+
+    body.should == '|/'
+    body('SCRIPT_NAME'=>'/a').should == '/a|/'
+    body('/foo').should == 'foo||/foo'
+    body('/foo', 'SCRIPT_NAME'=>'/a').should == 'foo|/a|/foo'
+    body('/foo/bar').should == 'bar||/foo/bar'
+    body('/foo/bar', 'SCRIPT_NAME'=>'/a').should == 'bar|/a|/foo/bar'
+    body('/foo/baz').should == 'foo||/foo/baz'
+    body('/foo/baz', 'SCRIPT_NAME'=>'/a').should == 'foo|/a|/foo/baz'
+  end
+
+  it "should have path/matched_path/remaining_path work correctly" do
+    app do |r|
+      r.on "foo" do
+        "#{r.path}:#{r.matched_path}:#{r.remaining_path}"
+      end
+    end
+
+    body("/foo/bar").should ==  "/foo/bar:/foo:/bar"
+  end
+
   it "ensures remaining_path is reverted if modified in failing matcher" do
     app do |r|
       r.on lambda { @remaining_path = "/blah"; false } do

data/spec/plugin/assets_spec.rb

@@ -11,9 +11,9 @@ rescue LoadError
 end
 
 if run_tests
-  metadata_file = 'spec/assets/tmp/precompiled.json'
-  js_file = 'spec/assets/js/head/app.js'
-  css_file = 'spec/assets/css/no_access.css'
+  metadata_file = File.expand_path('spec/assets/tmp/precompiled.json')
+  js_file = File.expand_path('spec/assets/js/head/app.js')
+  css_file = File.expand_path('spec/assets/css/no_access.css')
   js_mtime = File.mtime(js_file)
   js_atime = File.atime(js_file)
   css_mtime = File.mtime(css_file)
@@ -48,44 +48,58 @@ if run_tests
     end
 
     it 'assets_opts should use correct paths given options' do
-      keys = [:js_path, :css_path, :compiled_js_path, :compiled_css_path, :js_prefix, :css_prefix, :compiled_js_prefix, :compiled_css_prefix]
-      app.assets_opts.values_at(*keys).should == %w"spec/assets/js/ spec/assets/css/ spec/assets/app spec/assets/app assets/js/ assets/css/ assets/app assets/app"
+      fpaths = [:js_path, :css_path, :compiled_js_path, :compiled_css_path]
+      rpaths = [:js_prefix, :css_prefix, :compiled_js_prefix, :compiled_css_prefix]
+      app.assets_opts.values_at(*fpaths).should == %w"spec/assets/js/ spec/assets/css/ spec/assets/app spec/assets/app".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"assets/js/ assets/css/ assets/app assets/app"
 
       app.plugin :assets, :path=>'bar/', :public=>'foo/', :prefix=>'as/', :js_dir=>'j/', :css_dir=>'c/', :compiled_name=>'a'
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/as/a foo/as/a as/j/ as/c/ as/a as/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/as/a foo/as/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/j/ as/c/ as/a as/a"
 
       app.plugin :assets, :path=>'bar', :public=>'foo', :prefix=>'as', :js_dir=>'j', :css_dir=>'c', :compiled_name=>'a'
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/as/a foo/as/a as/j/ as/c/ as/a as/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/as/a foo/as/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/j/ as/c/ as/a as/a"
 
       app.plugin :assets, :compiled_js_dir=>'cj', :compiled_css_dir=>'cs', :compiled_path=>'cp'
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a as/j/ as/c/ as/cj/a as/cs/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/j/ as/c/ as/cj/a as/cs/a"
 
       app.plugin :assets, :compiled_js_route=>'cjr', :compiled_css_route=>'ccr', :js_route=>'jr', :css_route=>'cr'
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a as/jr/ as/cr/ as/cjr/a as/ccr/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/jr/ as/cr/ as/cjr/a as/ccr/a"
 
       app.plugin :assets, :compiled_js_route=>'cj', :compiled_css_route=>'cs', :js_route=>'j', :css_route=>'c'
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a as/j/ as/c/ as/cj/a as/cs/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/j/ as/c/ as/cj/a as/cs/a"
 
       app.plugin :assets
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a as/j/ as/c/ as/cj/a as/cs/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/cp/cj/a foo/cp/cs/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/j/ as/c/ as/cj/a as/cs/a"
 
       app.plugin :assets, :compiled_js_dir=>'', :compiled_css_dir=>nil, :compiled_js_route=>nil, :compiled_css_route=>nil
-      app.assets_opts.values_at(*keys).should == %w"bar/j/ bar/c/ foo/cp/a foo/cp/a as/j/ as/c/ as/a as/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/j/ bar/c/ foo/cp/a foo/cp/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/j/ as/c/ as/a as/a"
 
       app.plugin :assets, :js_dir=>'', :css_dir=>nil, :js_route=>nil, :css_route=>nil
-      app.assets_opts.values_at(*keys).should == %w"bar/ bar/ foo/cp/a foo/cp/a as/ as/ as/a as/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/ bar/ foo/cp/a foo/cp/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/ as/ as/a as/a"
 
       app.plugin :assets, :public=>''
-      app.assets_opts.values_at(*keys).should == %w"bar/ bar/ cp/a cp/a as/ as/ as/a as/a"
+      app.assets_opts.values_at(*fpaths).should == %w"bar/ bar/ cp/a cp/a".map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == %w"as/ as/ as/a as/a"
 
       app.plugin :assets, :path=>'', :compiled_path=>nil
-      app.assets_opts.values_at(*keys).should == ['', '', 'a', 'a', 'as/', 'as/', 'as/a', 'as/a']
+      app.assets_opts.values_at(*fpaths).should == ['', '', 'a', 'a'].map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == ['as/', 'as/', 'as/a', 'as/a']
 
       app.plugin :assets, :prefix=>''
-      app.assets_opts.values_at(*keys).should == ['', '', 'a', 'a', '', '', 'a', 'a']
+      app.assets_opts.values_at(*fpaths).should == ['', '', 'a', 'a'].map{|s| File.join(Dir.pwd, s)}
+      app.assets_opts.values_at(*rpaths).should == ['', '', 'a', 'a']
 
       app.plugin :assets, :compiled_name=>nil
-      app.assets_opts.values_at(*keys).should == ['', '', '', '', '', '', '', '']
+      app.assets_opts.values_at(*fpaths).should == ['', ''].map{|s| File.join(Dir.pwd, s)} + ['', ''].map{|s| File.join(Dir.pwd, s).chop}
+      app.assets_opts.values_at(*rpaths).should == ['', '', '', '']
     end
 
     it 'assets_opts should use headers and dependencies given options' do
@@ -126,6 +140,22 @@ if run_tests
       js.should include('console.log')
     end
 
+    it 'should handle rendering assets, linking to them, and accepting requests for them  when :add_script_name app option is used' do
+      app.opts[:add_script_name] = true
+      app.plugin :assets
+      html = body('/test', 'SCRIPT_NAME'=>'/foo')
+      html.scan(/<link/).length.should == 2
+      html =~ %r{href="/foo(/assets/css/app\.scss)"}
+      css = body($1)
+      html =~ %r{href="/foo(/assets/css/raw\.css)"}
+      css2 = body($1)
+      html.scan(/<script/).length.should == 1
+      html =~ %r{src="/foo(/assets/js/head/app\.js)"}
+      js = body($1)
+      css.should =~ /color: red;/
+      css2.should =~ /color: blue;/
+    end
+
     it 'should handle rendering assets, linking to them, and accepting requests for them when not compiling, with different options' do
       app.plugin :assets, :path=>'spec/', :js_dir=>'assets/js', :css_dir=>'assets/css', :prefix=>'a',
         :js_route=>'foo', :css_route=>'bar', :add_suffix=>true, :css_opts=>{:style=>:compressed}
@@ -203,6 +233,21 @@ if run_tests
       js.should include('console.log')
     end
 
+    it 'should handle compiling assets, linking to them, and accepting requests for them when :add_script_name app option is used' do
+      app.opts[:add_script_name] = true
+      app.plugin :assets
+      app.compile_assets
+      html = body('/test', 'SCRIPT_NAME'=>'/foo')
+      html =~ %r{href="/foo(/assets/app\.[a-f0-9]{40}\.css)"}
+      css = body($1)
+      html.scan(/<script/).length.should == 1
+      html =~ %r{src="/foo(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      js = body($1)
+      css.should =~ /color: ?red/
+      css.should =~ /color: ?blue/
+      js.should include('console.log')
+    end
+
     it 'should handle compiling assets, linking to them, and accepting requests for them, with different options' do
       app.plugin :assets, :compiled_path=>nil, :js_dir=>'assets/js', :css_dir=>'assets/css', :prefix=>'a',
         :public=>'spec/assets', :path=>'spec', :compiled_js_route=>'foo', :compiled_css_route=>'bar'
@@ -241,6 +286,29 @@ if run_tests
       js.should include('console.log')
     end
 
+    it 'should handle rendering assets, linking to them, and accepting requests for them when not compiling with a multi-level hash when :add_script_name app option is used' do
+      app.opts[:add_script_name] = true
+      app.plugin :assets, :path=>'spec', :js_dir=>nil, :css_dir=>nil, :compiled_js_dir=>nil, :compiled_css_dir=>nil,
+        :css=>{:assets=>{:css=>%w'app.scss raw.css'}}, :js=>{:assets=>{:js=>{:head=>'app.js'}}}
+      app.compile_assets
+      app.route do |r|
+        r.assets
+        r.is 'test' do
+          "#{assets([:css, :assets, :css])}\n#{assets([:js, :assets, :js, :head])}"
+        end
+      end
+      html = body('/test', 'SCRIPT_NAME'=>'/foo')
+      html.scan(/<link/).length.should == 1
+      html =~ %r{href="/foo(/assets/app\.assets\.css\.[a-f0-9]{40}\.css)"}
+      css = body($1)
+      html.scan(/<script/).length.should == 1
+      html =~ %r{src="/foo(/assets/app\.assets\.js\.head\.[a-f0-9]{40}\.js)"}
+      js = body($1)
+      css.should =~ /color: ?red/
+      css.should =~ /color: ?blue/
+      js.should include('console.log')
+    end
+
     it 'should handle :group_subdirs => false when compiling' do
       app.plugin :assets, :path=>'spec', :js_dir=>nil, :css_dir=>nil, :compiled_js_dir=>nil, :compiled_css_dir=>nil, :group_subdirs=>false,
         :css=>{:assets=>{:css=>%w'assets/css/app.scss assets/css/raw.css'}}, :js=>{:assets=>{:js=>{:head=>'assets/js/head/app.js'}}}
@@ -410,4 +478,31 @@ if run_tests
       app.allocate.assets([:js, :head]).should =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
     end
   end
+
+  describe 'assets plugin' do
+    it "app :root option affects :views default" do
+      app.plugin :assets
+      app.assets_opts[:path].should == File.join(Dir.pwd, 'assets')
+      app.assets_opts[:js_path].should == File.join(Dir.pwd, 'assets/js/')
+      app.assets_opts[:css_path].should == File.join(Dir.pwd, 'assets/css/')
+
+      app.opts[:root] = '/foo'
+      app.plugin :assets
+      app.assets_opts[:path].should == '/foo/assets'
+      app.assets_opts[:js_path].should == '/foo/assets/js/'
+      app.assets_opts[:css_path].should == '/foo/assets/css/'
+
+      app.opts[:root] = '/foo/bar'
+      app.plugin :assets
+      app.assets_opts[:path].should == '/foo/bar/assets'
+      app.assets_opts[:js_path].should == '/foo/bar/assets/js/'
+      app.assets_opts[:css_path].should == '/foo/bar/assets/css/'
+
+      app.opts[:root] = nil
+      app.plugin :assets
+      app.assets_opts[:path].should == File.join(Dir.pwd, 'assets')
+      app.assets_opts[:js_path].should == File.join(Dir.pwd, 'assets/js/')
+      app.assets_opts[:css_path].should == File.join(Dir.pwd, 'assets/css/')
+    end
+  end
 end

data/spec/plugin/delete_empty_headers_spec.rb

@@ -12,4 +12,16 @@ describe "delete_empty_headers plugin" do
 
     req[1].should == {'Bar'=>'1'}
   end
+
+  it "is called when finishing with a body" do
+    app(:delete_empty_headers) do |r|
+      response['Foo'] = ''
+      response['Content-Type'] = ''
+      response['Content-Length'] = ''
+      response['Bar'] = '1'
+      r.halt response.finish_with_body(['a'])
+    end
+
+    req[1].should == {'Bar'=>'1'}
+  end
 end

data/spec/plugin/mailer_spec.rb

@@ -87,6 +87,46 @@ describe "mailer plugin" do
     m.attachments.length.should == 1
     m.attachments.first.content_type.should =~ /mailer_spec\.rb/
     m.content_type.should =~ /\Amultipart\/mixed/
+    m.parts.length.should == 1
+    m.parts.first.body.should == File.read(__FILE__)
+  end
+
+  it "supports attachments with blocks" do
+    app(:mailer) do |r|
+      r.mail do
+        instance_exec(&setup_email)
+        add_file __FILE__ do
+          response.mail.attachments.last.content_type = 'text/foo'
+        end
+      end
+    end
+
+    m = app.mail('foo')
+    m.attachments.length.should == 1
+    m.attachments.first.content_type.should == 'text/foo'
+    m.content_type.should =~ /\Amultipart\/mixed/
+    m.parts.length.should == 1
+    m.parts.first.body.should == File.read(__FILE__)
+  end
+
+  it "supports plain-text attachments with an email body" do
+    app(:mailer) do |r|
+      r.mail do
+        instance_exec(&setup_email)
+        add_file :filename=>'a.txt', :content=>'b'
+        'c'
+      end
+    end
+
+    m = app.mail('foo')
+    m.parts.length.should == 2
+    m.parts.first.content_type.should =~ /text\/plain/
+    m.parts.first.body.should == 'c'
+    m.parts.last.content_type.should =~ /text\/plain/
+    m.parts.last.body.should == 'b'
+    m.attachments.length.should == 1
+    m.attachments.first.content_type.should =~ /a\.txt/
+    m.content_type.should =~ /\Amultipart\/mixed/
   end
 
   it "supports regular web requests in same application" do
@@ -174,7 +214,7 @@ describe "mailer plugin" do
     app.mail('/').content_type.should =~ /\Atext\/foo/
   end
 
-  it "supports handle setting the default content type when attachments are used" do
+  it "supports setting the default content type when attachments are used" do
     app(:bare) do
       plugin :mailer, :content_type=>'text/html'
       route do
@@ -184,8 +224,11 @@ describe "mailer plugin" do
     end
     m = app.mail('/')
     m.content_type.should =~ /\Amultipart\/mixed/
-    m.parts.first.content_type.should =~ /\Atext\/css/
-    m.parts.last.content_type.should =~ /\Atext\/html/
+    m.parts.length.should == 2
+    m.parts.first.content_type.should =~ /\Atext\/html/
+    m.parts.first.body.should == "a"
+    m.parts.last.content_type.should =~ /\Atext\/css/
+    m.parts.last.body.should == File.read('spec/assets/css/raw.css')
   end
 end
 end

data/spec/plugin/module_include_spec.rb

@@ -28,4 +28,21 @@ describe "module_include plugin" do
 
     req.should == [1, {}, []]
   end
+
+  it "should work if called multiple times with a block" do
+    app(:bare) do
+      plugin :module_include
+      request_module{def h; halt response.f end}
+      request_module{def i; h end}
+      response_module{def f; finish end}
+      response_module{def finish; [1, {}, []] end}
+
+      route do |r|
+        r.i
+      end
+    end
+
+    req.should == [1, {}, []]
+  end
+
 end

data/spec/plugin/multi_route_spec.rb

@@ -170,6 +170,16 @@ describe "multi_route plugin" do
   end
 end
 
+describe "multi_route plugin" do
+  it "r.multi_route works even without routes defined" do
+    app(:multi_route) do |r|
+      r.multi_route
+      'a'
+    end
+    body.should == 'a'
+  end
+end
+
 describe "multi_route plugin" do 
   before do
     app(:bare) do