roda-cj 0.9.6 → 1.0.0

data/lib/roda/plugins/not_allowed.rb

@@ -88,8 +88,11 @@ class Roda
                 always(&block) if #{verb == :get ? :is_get : verb}?
               else
                 args << ::Roda::RodaPlugins::Base::RequestMethods::TERM
-                if_match(args) do
-                  #{verb}(&block)
+                if_match(args) do |*args|
+                  if #{verb == :get ? :is_get : verb}?
+                    block_result(yield(*args))
+                    throw :halt, response.finish
+                  end
                   response.status = 405
                   response['Allow'] = '#{verb.to_s.upcase}'
                   nil
@@ -112,7 +115,11 @@ class Roda
             begin
               @_is_verbs = []
 
-              ret = yield
+              ret = if verbs.empty?
+                yield
+              else
+                yield(*captures)
+              end
 
               unless @_is_verbs.empty?
                 response.status = 405

data/lib/roda/plugins/path.rb

@@ -0,0 +1,38 @@
+class Roda
+  module RodaPlugins
+    # The path plugin adds support for named paths.  Using the +path+ class method, you can
+    # easily create <tt>*_path</tt> instance methods for each named path.  Those instance
+    # methods can then be called if you need to get the path for a form action, link,
+    # redirect, or anything else.  Example:
+    #
+    #   plugin :path
+    #   path :foo, '/foo'
+    #   path :bar do |bar|
+    #     "/bar/#{bar.id}"
+    #   end
+    #
+    #   route do |r|
+    #     r.post 'bar' do
+    #       bar = Bar.create(r.params['bar'])
+    #       r.redirect bar_path(bar)
+    #     end
+    #   end
+    module Path
+      module ClassMethods
+        def path(name, path=nil, &block)
+          raise RodaError,  "cannot provide both path and block to Roda.path" if path && block
+          raise RodaError,  "must provide either path or block to Roda.path" unless path || block
+
+          if path
+            path = path.dup.freeze
+            block = lambda{path}
+          end
+
+          define_method("#{name}_path", &block)
+        end
+      end
+    end
+
+    register_plugin(:path, Path)
+  end
+end

data/lib/roda/plugins/symbol_matchers.rb

@@ -38,7 +38,7 @@ class Roda
     # Note that because of how segment matching works, :format, :opt, and :optd
     # are only going to work inside of a string, like this:
     #
-    #   r.is "album:opt" do |id|
+    #   r.is "album:opt" do |id| end
     #   # matches /album (yielding nil) and /album/foo (yielding "foo")
     #   # does not match /album/ or /album/foo/bar
     module SymbolMatchers

data/lib/roda/plugins/view_subdirs.rb

@@ -6,7 +6,7 @@ class Roda
     # use, and template names that do not contain a slash will
     # automatically use that view subdirectory.  Example:
     #
-    #   plugin :render
+    #   plugin :render, :layout=>'./layout'
     #   plugin :view_subdirs
     #
     #   route do |r|
@@ -25,6 +25,12 @@ class Roda
     #
     # This plugin should be loaded after the render plugin, since
     # it works by overriding parts of the render plugin.
+    # 
+    # 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
       module InstanceMethods
         # Set the view subdirectory to use.  This can be set to nil

data/lib/roda/version.rb

@@ -1,3 +1,3 @@
 class Roda
-  RodaVersion = '0.9.6'.freeze
+  RodaVersion = '1.0.0'.freeze
 end

data/spec/integration_spec.rb

@@ -18,7 +18,7 @@ describe "integration" do
 
   end
 
-  it "should setup middleware using use " do
+  it "should setup middleware using use" do
     c = @c
     app(:bare) do 
       use c, "First", "Second" do
@@ -35,7 +35,24 @@ describe "integration" do
     body('/hello').should == 'D First Second Block'
   end
 
-  it "should inherit middleware in subclass " do
+  it "should support adding middleware using use after route block setup" do
+    c = @c
+    app(:bare) do 
+      route do |r|
+        r.get "hello" do
+          "D #{r.env['m.first']} #{r.env['m.second']} #{r.env['m.block']}"
+        end
+      end
+
+      use c, "First", "Second" do
+        "Block"
+      end
+    end
+
+    body('/hello').should == 'D First Second Block'
+  end
+
+  it "should inherit middleware in subclass" do
     c = @c
     @app = Class.new(app(:bare){use(c, '1', '2'){"3"}})
     @app.route do  |r|
@@ -47,7 +64,55 @@ describe "integration" do
     body('/hello').should == 'D 1 2 3'
   end
 
-  it "should not have future middleware additions to parent class affect subclass " do
+  it "should inherit route in subclass" do
+    c = @c
+    app(:bare) do
+      use(c, '1', '2'){"3"}
+      route do |r|
+        r.get "hello" do
+          "D #{r.env['m.first']} #{r.env['m.second']} #{r.env['m.block']}"
+        end
+      end
+    end
+    @app = Class.new(app)
+
+    body('/hello').should == 'D 1 2 3'
+  end
+
+  it "should use instance of subclass when inheriting routes" do
+    c = @c
+    obj = nil
+    app(:bare) do
+      use(c, '1', '2'){"3"}
+      route do |r|
+        r.get "hello" do
+          obj = self
+          "D #{r.env['m.first']} #{r.env['m.second']} #{r.env['m.block']}"
+        end
+      end
+    end
+    @app = Class.new(app)
+
+    body('/hello').should == 'D 1 2 3'
+    obj.should be_a_kind_of(@app)
+  end
+
+  it "should handle middleware added to subclass using superclass route" do
+    c = @c
+    app(:bare) do
+      route do |r|
+        r.get "hello" do
+          "D #{r.env['m.first']} #{r.env['m.second']} #{r.env['m.block']}"
+        end
+      end
+    end
+    @app = Class.new(app)
+    @app.use(c, '1', '2'){"3"}
+
+    body('/hello').should == 'D 1 2 3'
+  end
+
+  it "should not have future middleware additions to superclass affect subclass" do
     c = @c
     a = app
     @app = Class.new(a)
@@ -60,4 +125,31 @@ describe "integration" do
 
     body('/hello').should == 'D   '
   end
+
+  it "should not have future middleware additions to subclass affect superclass" do
+    c = @c
+    a = app do |r|
+      r.get "hello" do
+        "D #{r.env['m.first']} #{r.env['m.second']} #{r.env['m.block']}"
+      end
+    end
+    @app = Class.new(a)
+    @app.use(c, '1', '2'){"3"}
+    @app = a
+
+    body('/hello').should == 'D   '
+  end
+
+  it "should have app return the rack application to call" do
+    app(:bare){}.app.should == nil
+    app.route{|r|}
+    app.app.should be_a_kind_of(Proc)
+    c = Class.new{def initialize(app) @app = app end; def call(env) @app.call(env) end} 
+    app.use c
+    app.app.should be_a_kind_of(c)
+  end
+
+  it "should have route_block return the route block" do
+    app{|r| 1}.route_block.call(nil).should == 1
+  end
 end

data/spec/plugin/_erubis_escaping_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 begin
+  require 'erubis'
   require 'tilt/erb'
   begin
     require 'tilt/erubis'

data/spec/plugin/assets_spec.rb

@@ -0,0 +1,86 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'tilt'
+  require 'tilt/sass'
+  require 'tilt/coffee'
+rescue LoadError
+  warn 'tilt not installed, skipping assets plugin test'
+else
+  describe 'assets plugin' do
+    before do
+      app(:bare) do
+        plugin(:assets, {
+          path: './spec/dummy/assets',
+          css_engine: 'scss',
+          js_engine: 'coffee',
+          headers: {
+            "Cache-Control"             => 'public, max-age=2592000, no-transform',
+            'Connection'                => 'keep-alive',
+            'Age'                       => '25637',
+            'Strict-Transport-Security' => 'max-age=31536000',
+            'Content-Disposition'       => 'inline'
+          }
+        })
+
+        assets_opts[:css] = ['app', '../raw.css']
+        assets_opts[:js]  = { head: ['app'] }
+
+        route do |r|
+          r.assets
+
+          r.is 'test' do
+            response.write assets :css
+            response.write assets [:js, :head]
+          end
+        end
+      end
+    end
+
+    it 'should contain proper configuration' do
+      app.assets_opts[:path].should == './spec/dummy/assets'
+      app.assets_opts[:css].should include('app')
+    end
+
+    it 'should serve proper assets' do
+      body('/assets/css/app.css').should include('color: red')
+      body('/assets/css/%242E%242E/raw.css').should include('color: blue')
+      body('/assets/js/head/app.js').should include('console.log')
+      body('/assets/css/http://google.com').should include('google.com')
+    end
+
+    it 'should contain proper assets html tags' do
+      html = body '/test'
+      html.scan(/<link/).length.should eq 2
+      html.scan(/<script/).length.should eq 1
+      html.should include('link')
+      html.should include('script')
+    end
+
+    it 'should only show one link when concat/compile is true' do
+      app.assets_opts[:concat] = true
+      html = body '/test'
+      html.scan(/<link/).length.should eq 1
+
+      app.assets_opts[:compiled] = true
+      html = body '/test'
+      html.scan(/<link/).length.should eq 1
+    end
+
+    it 'should join all files when concat is true' do
+      app.assets_opts[:concat] = true
+      path = app.assets_opts[:concat_name] + '/css/123'
+      css = body("/assets/css/#{path}.css")
+      css.should include('color: red')
+      css.should include('color: blue')
+    end
+
+    it 'should grab compiled files' do
+      app.compile_assets
+      app.assets_opts[:compiled] = true
+      path = app.assets_opts[:compiled_name] + '/js-head/123'
+      js = body("/assets/js/#{path}.js")
+      js.should include('console.log')
+    end
+  end
+end

data/spec/plugin/error_email_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "error_email plugin" do 
+  def app(opts={})
+    @emails = emails = [] unless defined?(@emails)
+    @app ||= super(:bare) do
+      plugin :error_email, {:to=>'t', :from=>'f', :emailer=>lambda{|h| emails << h}}.merge(opts)
+
+      route do |r|
+        raise ArgumentError rescue error_email($!)
+        'e'
+      end
+    end
+  end
+
+  def email
+    @emails.last
+  end
+
+  it "adds error_email method for emailing exceptions" do
+    app
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:to].should == 't'
+    email[:from].should == 'f'
+    email[:host].should == 'localhost'
+    email[:message].should =~ /^Subject: ArgumentError/
+    email[:message].should =~ /Backtrace.*ENV/m
+  end
+
+  it "uses :host option" do
+    app(:host=>'foo.bar.com')
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:host].should == 'foo.bar.com'
+  end
+
+  it "adds :prefix option to subject line" do
+    app(:prefix=>'TEST ')
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:message].should =~ /^Subject: TEST ArgumentError/
+  end
+
+  it "uses :headers option for additional headers" do
+    app(:headers=>{'Foo'=>'Bar', 'Baz'=>'Quux'})
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:message].should =~ /^Foo: Bar/
+    email[:message].should =~ /^Baz: Quux/
+  end
+
+  it "requires the :to and :from options" do
+    proc{app :from=>nil}.should raise_error(Roda::RodaError)
+    proc{app :to=>nil}.should raise_error(Roda::RodaError)
+  end
+
+  it "works correctly in subclasses" do
+    @app = Class.new(app)
+    @app.route do |r|
+      raise ArgumentError rescue error_email($!)
+      'e'
+    end
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:to].should == 't'
+    email[:from].should == 'f'
+    email[:host].should == 'localhost'
+    email[:message].should =~ /^Subject: ArgumentError/
+    email[:message].should =~ /Backtrace.*ENV/m
+  end
+
+end

data/spec/plugin/multi_route_spec.rb

@@ -25,11 +25,21 @@ describe "multi_route plugin" do
         end
       end
 
+      route(:p) do |r|
+        r.is do
+          'p'
+        end
+      end
+
       route do |r|
         r.on 'foo' do
           r.multi_route do
             "foo"
           end
+
+          r.on "p" do
+            r.route(:p)
+          end
         end
 
         r.get do
@@ -71,6 +81,18 @@ describe "multi_route plugin" do
     body('/foo/post/b').should == 'foo'
   end
 
+  it "does not have multi_route match non-String named routes" do
+    body('/foo/p').should == 'p'
+    status('/foo/p/2').should == 404
+  end
+
+  it "Can have multi_route pick up routes newly added" do
+    body('/foo/get/').should == 'get'
+    status('/foo/delete').should == 404
+    app.route('delete'){|r| r.on{'delete'}}
+    body('/foo/delete').should == 'delete'
+  end
+
   it "handles loading the plugin multiple times correctly" do
     app.plugin :multi_route
     body.should == 'get'

data/spec/plugin/not_allowed_spec.rb

@@ -23,6 +23,12 @@ describe "not_allowed plugin" do
         r.is 'b' do
           'b'
         end
+        r.is /(d)/ do |s|
+          s
+        end
+        r.get /(e)/ do |s|
+          s
+        end
       end
     end
 
@@ -33,6 +39,13 @@ describe "not_allowed plugin" do
     body('/b').should == 'b'
     status('/b', 'REQUEST_METHOD'=>'POST').should == 404
 
+    body('/d').should == 'd'
+    status('/d', 'REQUEST_METHOD'=>'POST').should == 404
+
+    body('/e').should == 'e'
+    status('/d', 'REQUEST_METHOD'=>'POST').should == 404
+
+    body('/c').should == 'cg'
     body('/c').should == 'cg'
     body('/c', 'REQUEST_METHOD'=>'POST').should == 'cp'
     body('/c', 'REQUEST_METHOD'=>'PATCH').should == 'c'