roda-cj 0.9.2 → 0.9.3

data/lib/roda/plugins/symbol_views.rb

@@ -0,0 +1,40 @@
+class Roda
+  module RodaPlugins
+    # The symbol_views plugin allows matching blocks to return
+    # symbols, and consider those symbols as views to use for the
+    # response body.  So you can take code like:
+    #
+    #   r.root do
+    #     view :index
+    #   end
+    #   r.is "foo" do
+    #     view :foo
+    #   end
+    #
+    # and DRY it up:
+    #
+    #   r.root do
+    #     :index
+    #   end
+    #   r.is "foo" do
+    #     :foo
+    #   end
+    module SymbolViews
+      module RequestMethods
+        private
+
+        # If the block result is a symbol, consider the symbol a
+        # template name and use the template view as the body.
+        def block_result_body(result)
+          if result.is_a?(Symbol)
+            scope.view(result)
+          else
+            super
+          end
+        end
+      end
+    end
+
+    register_plugin(:symbol_views, SymbolViews)
+  end
+end

data/lib/roda/plugins/view_subdirs.rb

@@ -0,0 +1,53 @@
+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
+    #   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
+    #
+    # This plugin should be loaded after the render plugin, since
+    # it works by overriding parts of the render plugin.
+    module ViewSubdirs
+      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_path(template, opts)
+          t = template.to_s
+          if (v = @_view_subdir) && t !~ /\//
+            template = "#{v}/#{t}"
+          end
+          super
+        end
+      end
+    end
+
+    register_plugin(:view_subdirs, ViewSubdirs)
+  end
+end

data/lib/roda/version.rb

@@ -1,3 +1,3 @@
 class Roda
-  RodaVersion = '0.9.2'.freeze
+  RodaVersion = '0.9.3'.freeze
 end

data/spec/matchers_spec.rb

@@ -639,6 +639,22 @@ describe "request verb methods" do
   end
 end
 
+describe "all matcher" do
+  it "should match only all all arguments match" do
+    app do |r|
+      r.is :all=>['foo', :y] do |file|
+        file
+      end
+    end
+
+    body("/foo/bar").should == 'bar'
+    status.should == 404
+    status("/foo").should == 404
+    status("/foo/").should == 404
+    status("/foo/bar/baz").should == 404
+  end
+end
+
 describe "extension matcher" do
   it "should match given file extensions" do
     app do |r|
@@ -681,3 +697,29 @@ describe "route block that returns string" do
     body.should == '+1'
   end
 end
+
+describe "hash_matcher" do
+  it "should enable the handling of arbitrary hash keys" do
+    app(:bare) do 
+      hash_matcher(:foos){|v| consume(self.class.cached_matcher(:"foos-#{v}"){/((?:foo){#{v}})/})}
+      route do |r|
+        r.is :foos=>1 do |f|
+          "1#{f}"
+        end
+        r.is :foos=>2 do |f|
+          "2#{f}"
+        end
+        r.is :foos=>3 do |f|
+          "3#{f}"
+        end
+      end
+    end
+
+    body("/foo").should == '1foo'
+    body("/foofoo").should == '2foofoo'
+    body("/foofoofoo").should == '3foofoofoo'
+    status("/foofoofoofoo").should == 404
+    status.should == 404
+  end
+end
+

data/spec/plugin/backtracking_array_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "backtracking_array plugin" do 
+  it "backtracks to next entry in array if later matcher fails" do
+    app(:backtracking_array) do |r|
+      r.is %w'a a/b' do |id|
+        id
+      end
+
+      r.is %w'c c/d', %w'd e' do |a, b|
+        "#{a}-#{b}" 
+      end
+
+      r.is [%w'f f/g', %w'g g/h'] do |id|
+        id
+      end
+    end
+
+    status.should == 404
+
+    body("/a").should == 'a'
+    body("/a/b").should == 'a/b'
+    status("/a/b/").should == 404
+
+    body("/c/d").should == 'c-d'
+    body("/c/e").should == 'c-e'
+    body("/c/d/d").should == 'c/d-d'
+    body("/c/d/e").should == 'c/d-e'
+    status("/c/d/").should == 404
+
+    body("/f").should == 'f'
+    body("/f/g").should == 'f/g'
+    body("/g").should == 'g'
+    body("/g/h").should == 'g/h'
+    status("/f/g/").should == 404
+    status("/g/h/").should == 404
+  end
+end

data/spec/plugin/csrf_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'rack/csrf'
+rescue LoadError
+  warn "rack_csrf not installed, skipping csrf plugin test"  
+else
+describe "csrf plugin" do 
+  it "adds csrf protection and csrf helper methods" do
+    app(:bare) do
+      use Rack::Session::Cookie, :secret=>'1'
+      plugin :csrf, :skip=>['POST:/foo']
+
+      route do |r|
+        r.get do
+          response['TAG'] = csrf_tag
+          response['METATAG'] = csrf_metatag
+          response['TOKEN'] = csrf_token
+          response['FIELD'] = csrf_field
+          response['HEADER'] = csrf_header
+          'g'
+        end
+        r.post 'foo' do
+          'bar'
+        end
+        r.post do
+          'p'
+        end
+      end
+    end
+
+    io = StringIO.new
+    status('REQUEST_METHOD'=>'POST', 'rack.input'=>io).should == 403
+    body('/foo', 'REQUEST_METHOD'=>'POST', 'rack.input'=>io).should == 'bar'
+
+    env = proc{|h| h['Set-Cookie'] ? {'HTTP_COOKIE'=>h['Set-Cookie'].sub("; path=/; HttpOnly", '')} : {}}
+    s, h, b = req
+    s.should == 200
+    field = h['FIELD']
+    token = Regexp.escape(h['TOKEN'])
+    h['TAG'].should =~ /\A<input type="hidden" name="#{field}" value="#{token}" \/>\z/
+    h['METATAG'].should =~ /\A<meta name="#{field}" content="#{token}" \/>\z/
+    b.should == ['g']
+    s, _, b = req('/', env[h].merge('REQUEST_METHOD'=>'POST', 'rack.input'=>io, "HTTP_#{h['HEADER']}"=>h['TOKEN']))
+    s.should == 200
+    b.should == ['p']
+  end
+end
+end

data/spec/plugin/json_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "json plugin" do
+  before do
+    c = Class.new do
+      def to_json
+        '[1]'
+      end
+    end
+
+    app(:bare) do
+      plugin :json
+      json_result_classes << c
+
+      route do |r|
+        r.is 'array' do
+          [1, 2, 3]
+        end
+
+        r.is "hash" do
+          {'a'=>'b'}
+        end
+
+        r.is 'c' do
+          c.new
+        end
+      end
+    end
+  end
+
+  it "should use a json content type for a json response" do
+    header('Content-Type', "/array").should == 'application/json'
+    header('Content-Type', "/hash").should == 'application/json'
+    header('Content-Type', "/c").should == 'application/json'
+    header('Content-Type').should == 'text/html'
+  end
+
+  it "should convert objects to json" do
+    body('/array').gsub(/\s/, '').should == '[1,2,3]'
+    body('/hash').gsub(/\s/, '').should == '{"a":"b"}'
+    body('/c').should == '[1]'
+    body.should == ''
+  end
+
+  it "should work when subclassing" do
+    @app = Class.new(app)
+    app.route{[1]}
+    body.should == '[1]'
+  end
+end

data/spec/plugin/pass_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 describe "pass plugin" do 
-  it "executes on no arguments" do
+  it "skips the current block if pass is called" do
     app(:pass) do |r|
       r.on :id do |id|
         r.pass if id == 'foo'

data/spec/plugin/per_thread_caching_spec.rb

@@ -0,0 +1,28 @@
+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
+    app(:bare) do
+      plugin :per_thread_caching
+      @c = thread_safe_cache
+      def self.c; @c end
+      route do |r|
+        r.on :id do |i|
+          ((self.class.c[i] ||= []) << 2).join
+        end
+      end
+    end
+
+    (0..10).map do |n|
+      Thread.new do
+        Thread.current[:n] = n
+        body('/a').should == '2'
+        body('/a').should == '22'
+        body('/a').should == '222'
+        body('/b').should == '2'
+        body('/b').should == '22'
+        body('/b').should == '222'
+      end
+    end.map{|t| t.join}
+  end
+end

data/spec/plugin/render_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 begin
-  require 'tilt'
+  require 'tilt/erb'
+  require 'tilt/string'
 rescue LoadError
   warn "tilt not installed, skipping render plugin test"  
 else

data/spec/plugin/symbol_matchers_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "symbol_matchers plugin" do 
+  it "allows symbol specific regexps" do
+    app(:bare) do
+      plugin :symbol_matchers
+      symbol_matcher(:f, /(f+)/)
+
+      route do |r|
+        r.is :d do |d|
+          "d#{d}"
+        end
+
+        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
+
+        r.is :f do |f|
+          "f#{f}"
+        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.should == 404
+    body("/1").should == 'd1'
+    body("/11232135").should == 'd11232135'
+    body("/a").should == 'wa'
+    body("/1az0").should == 'w1az0'
+    body("/f").should == 'ff'
+    body("/foo").should == 'foonil'
+    body("/foo/123").should == 'foo"123"'
+    status("/foo/bar").should == 404
+    status("/foo/123/a").should == 404
+    body("/bar").should == 'barnil'
+    body("/bar/foo").should == 'bar"foo"'
+    status("/bar/foo/baz").should == 404
+    body("/format").should == 'formatnil'
+    body("/format.json").should == 'format"json"'
+    status("/format.").should == 404
+    body("/ffffffffffffffff").should == 'fffffffffffffffff'
+    status("/-").should == 404
+    body("/1/1a/f").should == 'dwf11af'
+    body("/12/1azy/fffff").should == 'dwf121azyfffff'
+    status("/1/f/a").should == 404
+  end
+end

data/spec/plugin/symbol_views_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "symbol_views plugin" do
+  before do
+    app(:bare) do
+      plugin :symbol_views
+
+      def view(s)
+        "v#{s}"
+      end
+
+      route do |r|
+        r.root do
+          :sym
+        end
+
+        r.is "string" do
+          'string'
+        end
+      end
+    end
+  end
+
+  it "should call view with the symbol" do
+    body.should == "vsym"
+  end
+
+  it "should not affect other return types" do
+    body("/string").should == 'string'
+    body("/foo").should == ''
+  end
+end

data/spec/plugin/view_subdirs_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+begin
+  require 'tilt/erb'
+rescue LoadError
+  warn "tilt not installed, skipping view_subdirs plugin test"  
+else
+describe "view_subdirs plugin" do
+  before do
+    app(:bare) do
+      plugin :render
+      render_opts[:views] = "./spec"
+      plugin :view_subdirs
+
+      route do |r|
+        r.on "home" do
+          set_view_subdir 'views'
+          view("home", :locals=>{:name => "Agent Smith", :title => "Home"}, :layout_opts=>{:locals=>{:title=>"Home"}})
+        end
+
+        r.on "about" do
+          set_view_subdir 'views'
+          render("views/about", :locals=>{:title => "About Roda"})
+        end
+
+        r.on "path" do
+          render('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
+end